diff options
author | Joseph Myers <joseph@codesourcery.com> | 2015-02-18 00:26:35 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2015-02-18 00:26:35 +0000 |
commit | 1a2325c06cf309d1d8b4aafcfb1a3d43905baf9b (patch) | |
tree | 3a9750d1402c1723379b2a3219f6f2e62c637fd4 /resource | |
parent | 8ae4bb5a3882331a2a8d0828a35b89965310fc76 (diff) | |
download | glibc-1a2325c06cf309d1d8b4aafcfb1a3d43905baf9b.tar.gz glibc-1a2325c06cf309d1d8b4aafcfb1a3d43905baf9b.tar.xz glibc-1a2325c06cf309d1d8b4aafcfb1a3d43905baf9b.zip |
Fix posix_spawn getrlimit64 namespace (bug 17991).
posix_spawn (a standard POSIX function) brings in a use of getrlimit64 (not a standard POSIX function). This patch fixes this by using __getrlimit64 and making getrlimit64 a weak alias. This is more complicated than some such changes because of files that define getrlimit64 in their own way using symbol versioning after including the main sysdeps/unix/sysv/linux/getrlimit64.c with a getrlimit macro defined. There are various existing patterns for such cases in glibc; the one I've used here is that a getrlimit64 macro disables the weak_alias / libc_hidden_weak calls, leaving it to the including file to define the getrlimit64 name in whatever way is appropriate. Tested for x86_64 and x86 that installed stripped shared libraries are unchanged by this patch. [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.
Diffstat (limited to 'resource')
-rw-r--r-- | resource/getrlimit64.c | 6 |
1 files changed, 4 insertions, 2 deletions
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) |