From: Andreas Schwab Date: Thu, 1 Jul 2010 11:14:26 +0000 (+0200) Subject: Fix PLT reference X-Git-Tag: fedora/glibc-2.12.90-4~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70d0a630700f602a457832383161d261fe222db5;p=thirdparty%2Fglibc.git Fix PLT reference --- diff --git a/ChangeLog b/ChangeLog index 04b40d1e8ff..87d907aca16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-07-01 Andreas Schwab + + * include/sys/resource.h (__getrlimit): Add hidden proto. + * sysdeps/unix/sysv/linux/i386/getrlimit.c: Add libc_hidden_weak. + * sysdeps/mach/hurd/getrlimit.c: Add libc_hidden_def. + * resource/getrlimit.c: Likewise. + 2010-06-28 Andreas Schwab * allocatestack.c (setxid_mark_thread): Ensure that the exiting diff --git a/include/sys/resource.h b/include/sys/resource.h index 9fd59dde0cd..0570f0dcd6a 100644 --- a/include/sys/resource.h +++ b/include/sys/resource.h @@ -12,4 +12,5 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage) extern int __setrlimit (enum __rlimit_resource __resource, const struct rlimit *__rlimits); +libc_hidden_proto (__getrlimit) #endif diff --git a/resource/getrlimit.c b/resource/getrlimit.c index d4bcadd7622..5caca6e2388 100644 --- a/resource/getrlimit.c +++ b/resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; } +libc_hidden_def (__getrlimit) weak_alias (__getrlimit, getrlimit) stub_warning (getrlimit) diff --git a/sysdeps/mach/hurd/getrlimit.c b/sysdeps/mach/hurd/getrlimit.c index 4ad8f3c5703..6ee9ea20845 100644 --- a/sysdeps/mach/hurd/getrlimit.c +++ b/sysdeps/mach/hurd/getrlimit.c @@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) return 0; } +libc_hidden_def (__getrlimit) weak_alias (__getrlimit, getrlimit) diff --git a/sysdeps/unix/sysv/linux/i386/getrlimit.c b/sysdeps/unix/sysv/linux/i386/getrlimit.c index 59951ac100d..bfb2d635389 100644 --- a/sysdeps/unix/sysv/linux/i386/getrlimit.c +++ b/sysdeps/unix/sysv/linux/i386/getrlimit.c @@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) } weak_alias (__new_getrlimit, __getrlimit); +libc_hidden_weak (__getrlimit) versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2);