diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/setrlimit.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/setrlimit.c | 38 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/syscalls.list | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/m680x0/syscalls.list | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/setrlimit.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/setrlimit.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/setrlimit.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sh/setrlimit.c | 1 |
11 files changed, 22 insertions, 43 deletions
diff --git a/ChangeLog b/ChangeLog index 7fa614ca0c..2761d9a023 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2014-09-23 Joseph Myers <joseph@codesourcery.com> + + [BZ #14138] + * sysdeps/unix/sysv/linux/arm/setrlimit.c: Remove file. + * sysdeps/unix/sysv/linux/i386/setrlimit.c: Likewise. + * sysdeps/unix/sysv/linux/m68k/setrlimit.c: Likewise. + * sysdeps/unix/sysv/linux/powerpc/setrlimit.c: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/setrlimit.c: Likewise. + * sysdeps/unix/sysv/linux/sh/setrlimit.c: Likewise. + * sysdeps/unix/sysv/linux/i386/syscalls.list (setrlimit): Add + syscall entry for GLIBC_2.2 symbol version. + * sysdeps/unix/sysv/linux/m68k/m680x0/syscalls.list (setrlimit): + Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list + (setrlimit): Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list (setrlimit): + Likewise. + 2014-09-23 Will Newton <will.newton@linaro.org> * sysdeps/unix/sysv/linux/arm/bits/hwcap.h: Check for diff --git a/sysdeps/unix/sysv/linux/arm/setrlimit.c b/sysdeps/unix/sysv/linux/arm/setrlimit.c deleted file mode 100644 index bfaef74c38..0000000000 --- a/sysdeps/unix/sysv/linux/arm/setrlimit.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/i386/setrlimit.c> diff --git a/sysdeps/unix/sysv/linux/i386/setrlimit.c b/sysdeps/unix/sysv/linux/i386/setrlimit.c deleted file mode 100644 index 2868d90759..0000000000 --- a/sysdeps/unix/sysv/linux/i386/setrlimit.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (C) 1999-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/>. */ - -#include <errno.h> -#include <sys/param.h> -#include <sys/resource.h> - -#include <sysdep.h> -#include <sys/syscall.h> -#include <shlib-compat.h> - -extern int __new_setrlimit (enum __rlimit_resource resource, - const struct rlimit *rlimits); - -/* Consider moving to syscalls.list. */ - -int -__new_setrlimit (enum __rlimit_resource resource, const struct rlimit *rlimits) -{ - return INLINE_SYSCALL (setrlimit, 2, resource, rlimits); -} - -weak_alias (__new_setrlimit, __setrlimit); -versioned_symbol (libc, __new_setrlimit, setrlimit, GLIBC_2_2); diff --git a/sysdeps/unix/sysv/linux/i386/syscalls.list b/sysdeps/unix/sysv/linux/i386/syscalls.list index 149d432347..8d94828cb4 100644 --- a/sysdeps/unix/sysv/linux/i386/syscalls.list +++ b/sysdeps/unix/sysv/linux/i386/syscalls.list @@ -5,6 +5,7 @@ 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 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 913f051ff4..6f1053618d 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/syscalls.list +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/syscalls.list @@ -2,3 +2,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 diff --git a/sysdeps/unix/sysv/linux/m68k/setrlimit.c b/sysdeps/unix/sysv/linux/m68k/setrlimit.c deleted file mode 100644 index bfaef74c38..0000000000 --- a/sysdeps/unix/sysv/linux/m68k/setrlimit.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/i386/setrlimit.c> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list index aaa3557831..fb6535aa8a 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list @@ -3,6 +3,7 @@ # 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 # Due to 64bit alignment there is a dummy second parameter readahead - readahead i:iiiii __readahead readahead diff --git a/sysdeps/unix/sysv/linux/powerpc/setrlimit.c b/sysdeps/unix/sysv/linux/powerpc/setrlimit.c deleted file mode 100644 index bfaef74c38..0000000000 --- a/sysdeps/unix/sysv/linux/powerpc/setrlimit.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/i386/setrlimit.c> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/setrlimit.c b/sysdeps/unix/sysv/linux/s390/s390-32/setrlimit.c deleted file mode 100644 index bfaef74c38..0000000000 --- a/sysdeps/unix/sysv/linux/s390/s390-32/setrlimit.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/i386/setrlimit.c> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list index ce9f21081a..523bd2c9f7 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list +++ b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list @@ -2,6 +2,7 @@ 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 prlimit64 EXTRA prlimit64 i:iipp prlimit64 fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/sh/setrlimit.c b/sysdeps/unix/sysv/linux/sh/setrlimit.c deleted file mode 100644 index bfaef74c38..0000000000 --- a/sysdeps/unix/sysv/linux/sh/setrlimit.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/i386/setrlimit.c> |