diff options
| -rw-r--r-- | ChangeLog | 29 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | conform/Makefile | 3 | ||||
| -rw-r--r-- | include/sys/resource.h | 2 | ||||
| -rw-r--r-- | resource/getrlimit64.c | 6 | ||||
| -rw-r--r-- | sysdeps/posix/spawni.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/getrlimit64.c | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/getrlimit64.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/getrlimit64.c | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/wordsize-64/syscalls.list | 2 |
11 files changed, 50 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog index ee0a822daf..068ed1baf7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +2015-02-17 Joseph Myers <joseph@codesourcery.com> + + [BZ #17991] + * include/sys/resource.h (__getrlimit64): Declare. Use + libc_hidden_proto. + * resource/getrlimit64.c (getrlimit64): Rename to __getrlimit64 + and define as weak alias of __getrlimit64. Use libc_hidden_weak. + * sysdeps/posix/spawni.c (__spawni): Call __getrlimit64 instead of + getrlimit64. + * sysdeps/unix/sysv/linux/getrlimit64.c (getrlimit64): Rename to + __getrlimit64. + [!getrlimit64] (getrlimit64): Define as weak alias of + __getrlimit64. Use libc_hidden_weak. + * sysdeps/unix/sysv/linux/i386/getrlimit64.c (getrlimit64): Define + using __getrlimit64 not __new_getrlimit64. + (__GI_getrlimit64): Likewise. + * sysdeps/unix/sysv/linux/mips/getrlimit64.c (getrlimit64): + Likewise. + (__GI_getrlimit64): Likewise. + (__old_getrlimit64): Use __getrlimit64 not __new_getrlimit64. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list + (getrlimit): Add __getrlimit64 alias. + * sysdeps/unix/sysv/linux/wordsize-64/syscalls.list (getrlimit): + Likewise. + * conform/Makefile (test-xfail-XOPEN2K/spawn.h/linknamespace): + Remove variable. + (test-xfail-POSIX2008/spawn.h/linknamespace): Likewise. + (test-xfail-XOPEN2K8/spawn.h/linknamespace): Likewise. + 2015-02-17 Paul Pluzhnikov <ppluzhnikov@google.com> * libio/fileops.c: Add missing sys/mman.h diff --git a/NEWS b/NEWS index 1c5e5909c4..29af3e9979 100644 --- a/NEWS +++ b/NEWS @@ -10,7 +10,7 @@ Version 2.22 * The following bugs are resolved with this release: 4719, 15467, 15790, 16560, 17569, 17792, 17912, 17932, 17944, 17949, - 17964, 17965, 17967, 17969, 17978, 17987. + 17964, 17965, 17967, 17969, 17978, 17987, 17991. Version 2.21 diff --git a/conform/Makefile b/conform/Makefile index 331590a266..c0c0db74a9 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -391,7 +391,6 @@ test-xfail-XOPEN2K/netdb.h/linknamespace = yes test-xfail-XOPEN2K/regex.h/linknamespace = yes test-xfail-XOPEN2K/search.h/linknamespace = yes test-xfail-XOPEN2K/signal.h/linknamespace = yes -test-xfail-XOPEN2K/spawn.h/linknamespace = yes test-xfail-XOPEN2K/stdlib.h/linknamespace = yes test-xfail-XOPEN2K/sys/wait.h/linknamespace = yes test-xfail-XOPEN2K/syslog.h/linknamespace = yes @@ -403,7 +402,6 @@ test-xfail-POSIX2008/grp.h/linknamespace = yes test-xfail-POSIX2008/netdb.h/linknamespace = yes test-xfail-POSIX2008/regex.h/linknamespace = yes test-xfail-POSIX2008/semaphore.h/linknamespace = yes -test-xfail-POSIX2008/spawn.h/linknamespace = yes test-xfail-POSIX2008/unistd.h/linknamespace = yes test-xfail-XOPEN2K8/dirent.h/linknamespace = yes test-xfail-XOPEN2K8/fmtmsg.h/linknamespace = yes @@ -412,6 +410,5 @@ test-xfail-XOPEN2K8/netdb.h/linknamespace = yes test-xfail-XOPEN2K8/pwd.h/linknamespace = yes test-xfail-XOPEN2K8/regex.h/linknamespace = yes test-xfail-XOPEN2K8/search.h/linknamespace = yes -test-xfail-XOPEN2K8/spawn.h/linknamespace = yes test-xfail-XOPEN2K8/syslog.h/linknamespace = yes test-xfail-XOPEN2K8/unistd.h/linknamespace = yes diff --git a/include/sys/resource.h b/include/sys/resource.h index 1ce190f5f0..7622da969a 100644 --- a/include/sys/resource.h +++ b/include/sys/resource.h @@ -5,6 +5,8 @@ libc_hidden_proto (getpriority) libc_hidden_proto (setpriority) libc_hidden_proto (getrlimit64) +extern __typeof (getrlimit64) __getrlimit64; +libc_hidden_proto (__getrlimit64); /* Now define the internal interfaces. */ extern int __getrlimit (enum __rlimit_resource __resource, diff --git a/resource/getrlimit64.c b/resource/getrlimit64.c index 6d22eca2b3..cb494cc4d1 100644 --- a/resource/getrlimit64.c +++ b/resource/getrlimit64.c @@ -22,7 +22,7 @@ /* Put the soft and hard limits for RESOURCE in *RLIMITS. Returns 0 if successful, -1 if not (and sets errno). */ int -getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits) +__getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits) { struct rlimit rlimits32; @@ -40,4 +40,6 @@ getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits) return 0; } -libc_hidden_def (getrlimit64) +libc_hidden_def (__getrlimit64) +weak_alias (__getrlimit64, getrlimit64) +libc_hidden_weak (getrlimit64) diff --git a/sysdeps/posix/spawni.c b/sysdeps/posix/spawni.c index 4a25c89c4b..eee9331ecf 100644 --- a/sysdeps/posix/spawni.c +++ b/sysdeps/posix/spawni.c @@ -188,7 +188,7 @@ __spawni (pid_t *pid, const char *file, { if (! have_fdlimit) { - getrlimit64 (RLIMIT_NOFILE, &fdlimit); + __getrlimit64 (RLIMIT_NOFILE, &fdlimit); have_fdlimit = true; } diff --git a/sysdeps/unix/sysv/linux/getrlimit64.c b/sysdeps/unix/sysv/linux/getrlimit64.c index 461d3458df..100ba623e2 100644 --- a/sysdeps/unix/sysv/linux/getrlimit64.c +++ b/sysdeps/unix/sysv/linux/getrlimit64.c @@ -24,7 +24,7 @@ /* Put the soft and hard limits for RESOURCE in *RLIMITS. Returns 0 if successful, -1 if not (and sets errno). */ int -getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits) +__getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits) { #ifdef __ASSUME_PRLIMIT64 return INLINE_SYSCALL (prlimit64, 4, 0, resource, NULL, rlimits); @@ -51,4 +51,8 @@ getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits) return 0; #endif } -libc_hidden_def (getrlimit64) +libc_hidden_def (__getrlimit64) +#ifndef getrlimit64 +weak_alias (__getrlimit64, getrlimit64) +libc_hidden_weak (getrlimit64) +#endif diff --git a/sysdeps/unix/sysv/linux/i386/getrlimit64.c b/sysdeps/unix/sysv/linux/i386/getrlimit64.c index a771584399..8bd3bd9dab 100644 --- a/sysdeps/unix/sysv/linux/i386/getrlimit64.c +++ b/sysdeps/unix/sysv/linux/i386/getrlimit64.c @@ -21,5 +21,5 @@ #undef getrlimit64 #include <shlib-compat.h> -versioned_symbol (libc, __new_getrlimit64, getrlimit64, GLIBC_2_2); -strong_alias (__new_getrlimit64, __GI_getrlimit64) +versioned_symbol (libc, __getrlimit64, getrlimit64, GLIBC_2_2); +strong_alias (__getrlimit64, __GI_getrlimit64) diff --git a/sysdeps/unix/sysv/linux/mips/getrlimit64.c b/sysdeps/unix/sysv/linux/mips/getrlimit64.c index 7080f77e81..751b11a631 100644 --- a/sysdeps/unix/sysv/linux/mips/getrlimit64.c +++ b/sysdeps/unix/sysv/linux/mips/getrlimit64.c @@ -25,8 +25,8 @@ # include <sysdeps/unix/sysv/linux/getrlimit64.c> # undef getrlimit64 -versioned_symbol (libc, __new_getrlimit64, getrlimit64, GLIBC_2_19); -strong_alias (__new_getrlimit64, __GI_getrlimit64) +versioned_symbol (libc, __getrlimit64, getrlimit64, GLIBC_2_19); +strong_alias (__getrlimit64, __GI_getrlimit64) # if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_19) @@ -45,7 +45,7 @@ __old_getrlimit64 (enum __rlimit_resource resource, { struct rlimit64 krlimits; - if (__new_getrlimit64 (resource, &krlimits) < 0) + if (__getrlimit64 (resource, &krlimits) < 0) return -1; if (krlimits.rlim_cur == RLIM64_INFINITY) diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list index aee60bf9d5..6ba6f9b1e9 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list @@ -1,3 +1,3 @@ # File name Caller Syscall name # args Strong name Weak names -getrlimit - ugetrlimit i:ip __getrlimit getrlimit getrlimit64 +getrlimit - ugetrlimit i:ip __getrlimit getrlimit getrlimit64 __getrlimit64 diff --git a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list index 77aa246435..2876bbdc3e 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list +++ b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list @@ -10,7 +10,7 @@ statfs - statfs i:sp __statfs statfs statfs64 mmap - mmap b:aniiii __mmap mmap __mmap64 mmap64 ftruncate - ftruncate i:ii __ftruncate ftruncate ftruncate64 __ftruncate64 truncate - truncate i:si truncate truncate64 -getrlimit - getrlimit i:ip __getrlimit getrlimit getrlimit64 +getrlimit - getrlimit i:ip __getrlimit getrlimit getrlimit64 __getrlimit64 setrlimit - setrlimit i:ip __setrlimit setrlimit setrlimit64 readahead - readahead i:iii __readahead readahead sendfile - sendfile i:iipi sendfile sendfile64 |