fanotify_mark (was: [PATCH] [SH] ABI baseline update)

[Thomas Schwinge <thomas at codesourcery dot com>]

Hi!

On Wed, 30 May 2012 16:49:48 +0000, "Joseph S. Myers" <joseph@codesourcery.com> wrote:
> On Wed, 30 May 2012, Thomas Schwinge wrote:
> > fanotify_mark can be found in several syscalls.list files, but not in one
> > that SH uses (which might be wrong or might be correct).
> 
> Sounds like a bug in the SH file (if fixing it you'll need to put the 
> function in the SH Versions file at 2.16, of course).  This is listed 
> separately in each syscalls.list for a 32-bit architecture.

Our testing systems are in maintenance at the moment, so I can't test it,
but this appears to me to be the correct fix -- that is, distribute the
Versions entry next to each syscalls.list, and add it anew for SH.

	* sysdeps/unix/sysv/linux/Versions (GLIBC_2.13): Remove fanotify_mark...
	* sysdeps/unix/sysv/linux/i386/Versions (GLIBC_2.13): ... and instead
	add it here.
	* sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions (GLIBC_2.13):
	Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-32/Versions (GLIBC_2.13): Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc32/Versions (GLIBC_2.13):
	Likewise.
	* sysdeps/unix/sysv/linux/wordsize-64/Versions (GLIBC_2.13): Likewise.
	* sysdeps/unix/sysv/linux/sh/syscalls.list: Add fanotify_mark.
	* sysdeps/unix/sysv/linux/sh/Versions (GLIBC_2.16): Add fanotify_mark.

diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions
index 16bb281..cd4dba1 100644
--- a/sysdeps/unix/sysv/linux/Versions
+++ b/sysdeps/unix/sysv/linux/Versions
@@ -152,7 +152,7 @@ libc {
   GLIBC_2.13 {
     prlimit; prlimit64;
 
-    fanotify_init; fanotify_mark;
+    fanotify_init;
   }
   GLIBC_2.14 {
     clock_adjtime;
diff --git a/sysdeps/unix/sysv/linux/i386/Versions b/sysdeps/unix/sysv/linux/i386/Versions
index f3544ac..574d45a 100644
--- a/sysdeps/unix/sysv/linux/i386/Versions
+++ b/sysdeps/unix/sysv/linux/i386/Versions
@@ -45,6 +45,9 @@ libc {
     # f*
     fallocate64;
   }
+  GLIBC_2.13 {
+    fanotify_mark;
+  }
   GLIBC_PRIVATE {
     __modify_ldt;
   }
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions
index 6fa0119..83d6fc8 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions
@@ -30,4 +30,7 @@ libc {
   GLIBC_2.11 {
     fallocate64;
   }
+  GLIBC_2.13 {
+    fanotify_mark;
+  }
 }
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/Versions b/sysdeps/unix/sysv/linux/s390/s390-32/Versions
index 24e0b1d..1965c6f 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/Versions
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/Versions
@@ -46,6 +46,9 @@ libc {
   GLIBC_2.11 {
     fallocate64;
   }
+  GLIBC_2.13 {
+    fanotify_mark;
+  }
 }
 
 libutil {
diff --git a/sysdeps/unix/sysv/linux/sh/Versions b/sysdeps/unix/sysv/linux/sh/Versions
index bd30f92..e0938c4 100644
--- a/sysdeps/unix/sysv/linux/sh/Versions
+++ b/sysdeps/unix/sysv/linux/sh/Versions
@@ -27,4 +27,7 @@ libc {
   GLIBC_2.11 {
     fallocate64;
   }
+  GLIBC_2.16 {
+    fanotify_mark;
+  }
 }
diff --git a/sysdeps/unix/sysv/linux/sh/syscalls.list b/sysdeps/unix/sysv/linux/sh/syscalls.list
index be9ffed..69fbd8f 100644
--- a/sysdeps/unix/sysv/linux/sh/syscalls.list
+++ b/sysdeps/unix/sysv/linux/sh/syscalls.list
@@ -3,3 +3,5 @@
 waitpid		-	waitpid		Ci:ipi	__waitpid	waitpid	__libc_waitpid
 
 prlimit64	EXTRA	prlimit64	i:iipp	prlimit64
+
+fanotify_mark	EXTRA	fanotify_mark	i:iiiiis	fanotify_mark
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/Versions b/sysdeps/unix/sysv/linux/sparc/sparc32/Versions
index c9a5b3e..d548300 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/Versions
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/Versions
@@ -23,4 +23,7 @@ libc {
   GLIBC_2.11 {
     fallocate64;
   }
+  GLIBC_2.13 {
+    fanotify_mark;
+  }
 }
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/Versions b/sysdeps/unix/sysv/linux/wordsize-64/Versions
index a3b40cc..bff2126 100644
--- a/sysdeps/unix/sysv/linux/wordsize-64/Versions
+++ b/sysdeps/unix/sysv/linux/wordsize-64/Versions
@@ -2,4 +2,7 @@ libc {
   GLIBC_2.10 {
     fallocate64;
   }
+  GLIBC_2.13 {
+    fanotify_mark;
+  }
 }


GrÃÃe,
 Thomas

Attachment: pgp00000.pgp
Description: PGP signature