diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | sysdeps/unix/make-syscalls.sh | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/syscalls.list | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/m680x0/syscalls.list | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/lchown.S | 38 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list | 3 |
7 files changed, 23 insertions, 47 deletions
@@ -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 6eba62c946..fd6ebb4dbc 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 8d94828cb4..0d3eabee64 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 6f1053618d..b0ad68936d 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 17857486a4..0000000000 --- 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 25487cc3e0..451d50884b 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 523bd2c9f7..902491c6dd 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 |