From 8cf8ce1702c354a8266e3cfa6ab54c2467d1873f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 13 Jan 2011 16:21:04 -0500 Subject: Clean up PLT use for getrlimit64. --- ChangeLog | 3 +++ include/sys/resource.h | 1 + sysdeps/unix/sysv/linux/getrlimit64.c | 3 ++- sysdeps/unix/sysv/linux/i386/getrlimit64.c | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea9b1cc75e..0c22abd775 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ * sysdeps/posix/spawni.c (__spawni): Don't fail if close file action in child fails because the descriptor is already closed. + * include/sys/resource.h: Add libc_hidden_proto for getrlimit64. + * sysdeps/unix/sysv/linux/getrlimit64.c: Add libc_hidden_def. + * sysdeps/unix/sysv/linux/i386/getrlimit64.c: Likewise. [BZ #12397] * sysdeps/unix/sysv/linux/mkdirat.c (mkdirat): Fix handling of missing diff --git a/include/sys/resource.h b/include/sys/resource.h index 9fd59dde0c..b4ea1ae592 100644 --- a/include/sys/resource.h +++ b/include/sys/resource.h @@ -3,6 +3,7 @@ libc_hidden_proto (getpriority) libc_hidden_proto (setpriority) +libc_hidden_proto (getrlimit64) /* Now define the internal interfaces. */ extern int __getrlimit (enum __rlimit_resource __resource, diff --git a/sysdeps/unix/sysv/linux/getrlimit64.c b/sysdeps/unix/sysv/linux/getrlimit64.c index 19e991166f..419e324274 100644 --- a/sysdeps/unix/sysv/linux/getrlimit64.c +++ b/sysdeps/unix/sysv/linux/getrlimit64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010 Free Software Foundation, Inc. +/* Copyright (C) 2010, 2011 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 @@ -52,3 +52,4 @@ getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits) return 0; #endif } +libc_hidden_def (getrlimit64) diff --git a/sysdeps/unix/sysv/linux/i386/getrlimit64.c b/sysdeps/unix/sysv/linux/i386/getrlimit64.c index 00be3d6144..91dadab073 100644 --- a/sysdeps/unix/sysv/linux/i386/getrlimit64.c +++ b/sysdeps/unix/sysv/linux/i386/getrlimit64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000, 2005, 2010 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2005, 2010, 2011 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 @@ -23,3 +23,4 @@ #undef getrlimit64 #include versioned_symbol (libc, __new_getrlimit64, getrlimit64, GLIBC_2_2); +strong_alias (__new_getrlimit64, __GI_getrlimit64) -- cgit 1.4.1