aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-10-06 22:58:59 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-10-06 22:58:59 +0000
commitf7b425175c3fa2f063a6c5657d84b799929db459 (patch)
tree1e0ef614915b3f58279845a294e48ac589166f31
parentabb280f799c47f76463b27d60f271208cbbf0c49 (diff)
downloadtermbaud-f7b425175c3fa2f063a6c5657d84b799929db459.tar.gz
termbaud-f7b425175c3fa2f063a6c5657d84b799929db459.tar.xz
termbaud-f7b425175c3fa2f063a6c5657d84b799929db459.zip
Support and use mixed compat/non-compat aliases in syscalls.list.
This patch enables syscalls.list entries to specify both compat and non-compat symbol versions for the same syscall definition, making use of this for setrlimit / chown / lchown where the inability to specify such aliases showed up in the course of work on bug 14138. The change to make-syscalls.sh is minimal: adding a SHARED conditional on the compat_symbol calls. It remains the case that if a compat symbol version is specified, the syscall is only built for the shared library at all if an explicit symbol version is given for a non-compat symbol (so it's necessary to specify "lchown@@GLIBC_2.0 chown@GLIBC_2.0" rather than just "lchown chown@GLIBC_2.0"). It also remains the case, as already commented in make-syscalls.sh, that no SHLIB_COMPAT conditionals are generated, so there would be problems if the same syscalls.list file, with compat symbols, were used for both configurations that should have those symbols and configurations for which they should be conditioned out with SHLIB_COMPAT. Tested for x86. * sysdeps/unix/make-syscalls.sh (emit_weak_aliases): Condition compat_symbol calls on [SHARED]. * sysdeps/unix/sysv/linux/powerpc/lchown.S: Remove file. * sysdeps/unix/sysv/linux/i386/syscalls.list (oldsetrlimit): Remove. (setrlimit): Add setrlimit@GLIBC_2.0 alias. * sysdeps/unix/sysv/linux/m68k/m680x0/syscalls.list (oldsetrlimit): Remove. (setrlimit): Add setrlimit@GLIBC_2.0 alias. * sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list (lchown): New syscall entry. (oldsetrlimit): Remove. (setrlimit): Add setrlimit@GLIBC_2.0 alias. * sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list (oldsetrlimit): Remove. (setrlimit): Add setrlimit@GLIBC_2.0 alias.
-rw-r--r--ChangeLog17
-rw-r--r--sysdeps/unix/make-syscalls.sh2
-rw-r--r--sysdeps/unix/sysv/linux/i386/syscalls.list3
-rw-r--r--sysdeps/unix/sysv/linux/m68k/m680x0/syscalls.list3
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/lchown.S38
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list4
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list3
7 files changed, 23 insertions, 47 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a89797b45f..29c5883ca6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
2014-10-06 Joseph Myers <joseph@codesourcery.com>
+ * sysdeps/unix/make-syscalls.sh (emit_weak_aliases): Condition
+ compat_symbol calls on [SHARED].
+ * sysdeps/unix/sysv/linux/powerpc/lchown.S: Remove file.
+ * sysdeps/unix/sysv/linux/i386/syscalls.list (oldsetrlimit):
+ Remove.
+ (setrlimit): Add setrlimit@GLIBC_2.0 alias.
+ * sysdeps/unix/sysv/linux/m68k/m680x0/syscalls.list
+ (oldsetrlimit): Remove.
+ (setrlimit): Add setrlimit@GLIBC_2.0 alias.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
+ (lchown): New syscall entry.
+ (oldsetrlimit): Remove.
+ (setrlimit): Add setrlimit@GLIBC_2.0 alias.
+ * sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
+ (oldsetrlimit): Remove.
+ (setrlimit): Add setrlimit@GLIBC_2.0 alias.
+
[BZ #14138]
* sysdeps/unix/sysv/linux/arm/fchown.c: Remove file.
* sysdeps/unix/sysv/linux/arm/lchown.c: Likewise.
diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh
index 6eba62c9461..fd6ebb4dbcc 100644
--- a/sysdeps/unix/make-syscalls.sh
+++ b/sysdeps/unix/make-syscalls.sh
@@ -113,7 +113,7 @@ emit_weak_aliases()
*@*)
base=`echo $name | sed 's/@.*//'`
ver=`echo $name | sed 's/.*@//;s/\./_/g'`
- echo " echo '#ifndef NOT_IN_libc'; \\"
+ echo " echo '#if defined SHARED && !defined NOT_IN_libc'; \\"
if test -z "$vcount" ; then
source=$strong
vcount=1
diff --git a/sysdeps/unix/sysv/linux/i386/syscalls.list b/sysdeps/unix/sysv/linux/i386/syscalls.list
index 8d94828cb49..0d3eabee64d 100644
--- a/sysdeps/unix/sysv/linux/i386/syscalls.list
+++ b/sysdeps/unix/sysv/linux/i386/syscalls.list
@@ -4,8 +4,7 @@ modify_ldt EXTRA modify_ldt i:ipi __modify_ldt modify_ldt
vm86old EXTRA vm86old i:p __vm86old vm86@GLIBC_2.0
vm86 - vm86 i:ip __vm86 vm86@@GLIBC_2.3.4
oldgetrlimit EXTRA getrlimit i:ip __old_getrlimit getrlimit@GLIBC_2.0
-oldsetrlimit EXTRA setrlimit i:ip __old_setrlimit setrlimit@GLIBC_2.0
-setrlimit - setrlimit i:ip __setrlimit setrlimit@@GLIBC_2.2
+setrlimit - setrlimit i:ip __setrlimit setrlimit@GLIBC_2.0 setrlimit@@GLIBC_2.2
waitpid - waitpid Ci:ipi __waitpid waitpid __libc_waitpid
prlimit64 EXTRA prlimit64 i:iipp prlimit64
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/syscalls.list b/sysdeps/unix/sysv/linux/m68k/m680x0/syscalls.list
index 6f1053618dc..b0ad68936de 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/syscalls.list
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/syscalls.list
@@ -1,5 +1,4 @@
# File name Caller Syscall name Args Strong name Weak names
oldgetrlimit EXTRA getrlimit i:ip __old_getrlimit getrlimit@GLIBC_2.0
-oldsetrlimit EXTRA setrlimit i:ip __old_setrlimit setrlimit@GLIBC_2.0
-setrlimit - setrlimit i:ip __setrlimit setrlimit@@GLIBC_2.2
+setrlimit - setrlimit i:ip __setrlimit setrlimit@GLIBC_2.0 setrlimit@@GLIBC_2.2
diff --git a/sysdeps/unix/sysv/linux/powerpc/lchown.S b/sysdeps/unix/sysv/linux/powerpc/lchown.S
deleted file mode 100644
index 17857486a4a..00000000000
--- a/sysdeps/unix/sysv/linux/powerpc/lchown.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/* lchown system call.
- Copyright (C) 1998-2014 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-/* Some old kernel headers call lchown() 'chown'. The number is
- the same. */
-
-#include <sysdep.h>
-
-#ifdef __NR_lchown
- PSEUDO (__lchown, lchown, 3)
-#else
- PSEUDO (__lchown, chown, 3)
-#endif
- ret
- PSEUDO_END(__lchown)
- weak_alias (__lchown, lchown)
-
-#ifdef SHARED
-#include <shlib-compat.h>
-# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
-compat_symbol (libc, __lchown, chown, GLIBC_2_0)
-# endif
-#endif
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
index 25487cc3e0d..451d50884bb 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
@@ -1,11 +1,11 @@
# File name Caller Syscall name # args Strong name Weak names
chown - chown i:sii __chown chown@@GLIBC_2.1
+lchown - lchown i:sii __lchown lchown@@GLIBC_2.0 chown@GLIBC_2.0
# System calls with wrappers.
oldgetrlimit EXTRA getrlimit i:ip __old_getrlimit getrlimit@GLIBC_2.0
-oldsetrlimit EXTRA setrlimit i:ip __old_setrlimit setrlimit@GLIBC_2.0
-setrlimit - setrlimit i:ip __setrlimit setrlimit@@GLIBC_2.2
+setrlimit - setrlimit i:ip __setrlimit setrlimit@GLIBC_2.0 setrlimit@@GLIBC_2.2
# Due to 64bit alignment there is a dummy second parameter
readahead - readahead i:iiiii __readahead readahead
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
index 523bd2c9f76..902491c6dd6 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
@@ -1,8 +1,7 @@
# File name Caller Syscall name Args Strong name Weak names
oldgetrlimit EXTRA getrlimit i:ip __old_getrlimit getrlimit@GLIBC_2.0
-oldsetrlimit EXTRA setrlimit i:ip __old_setrlimit setrlimit@GLIBC_2.0
-setrlimit - setrlimit i:ip __setrlimit setrlimit@@GLIBC_2.2
+setrlimit - setrlimit i:ip __setrlimit setrlimit@GLIBC_2.0 setrlimit@@GLIBC_2.2
prlimit64 EXTRA prlimit64 i:iipp prlimit64
fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark