From ee600e3f76afbdc92c3258c362b6c061ada58b21 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 10 Jul 2004 20:00:44 +0000 Subject: Update. 2004-07-10 Ulrich Drepper * elf/ldconfig.c: Define PROCINFO_CLASS as static before including ldsodefs.h. * sysdeps/generic/ldsodefs.h: Only define PROCINFO_CLASS if it is not already defined. * sysdeps/i386/dl-procinfo.c: Define PROCINFO_CALLS only if not already defined. * elf/rtld.c (print_statistics): Mark with noinline attribute. * sysdeps/i386/dl-machine.h (elf_machine_rel): Mark with always_inline attribute. (elf_machine_rel_relative): Likewise. * include/string.h: Add libc_hidden_proto for __strtok_r and __strsep_g. * sysdeps/generic/strsep.c: Add libc_hidden_def. * sysdeps/generic/strtok_r.c: Likewise. * sysdeps/i386/strtok_r.S: Add alias for internal symbol. * sysdeps/i386/i686/strtok_r.S: Likewise. * sysdeps/x86_64/strtok_r.S: Likewise. 2004-07-09 Alexandre Oliva * inet/getnetgrent_r.c (internal_setnetgrent): Make it hidden instead of internal-linkage, such that we can alias to it. (internal_endnetgrent, internal_getnetgrent_r): Likewise. --- sysdeps/generic/ldsodefs.h | 4 +++- sysdeps/generic/strsep.c | 3 ++- sysdeps/generic/strtok_r.c | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'sysdeps/generic') diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 53c3290..49f7666 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -424,7 +424,9 @@ struct rtld_global_ro /* Get architecture specific definitions. */ #define PROCINFO_DECL -#define PROCINFO_CLASS EXTERN +#ifndef PROCINFO_CLASS +# define PROCINFO_CLASS EXTERN +#endif #include /* Names of shared object for which the RPATH should be ignored. */ diff --git a/sysdeps/generic/strsep.c b/sysdeps/generic/strsep.c index 5761eec..e5342f7 100644 --- a/sysdeps/generic/strsep.c +++ b/sysdeps/generic/strsep.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 93, 96, 97, 98, 99 Free Software Foundation, Inc. +/* Copyright (C) 1992, 93, 96, 97, 98, 99, 2004 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 @@ -67,3 +67,4 @@ __strsep (char **stringp, const char *delim) } weak_alias (__strsep, strsep) strong_alias (__strsep, __strsep_g) +libc_hidden_def (__strsep_g) diff --git a/sysdeps/generic/strtok_r.c b/sysdeps/generic/strtok_r.c index 34cc85c..3a5c047 100644 --- a/sysdeps/generic/strtok_r.c +++ b/sysdeps/generic/strtok_r.c @@ -1,5 +1,5 @@ /* Reentrant string tokenizer. Generic version. - Copyright (C) 1991, 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc. + Copyright (C) 1991,1996-1999,2001,2004 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 @@ -65,4 +65,5 @@ __strtok_r (s, delim, save_ptr) } return token; } +libc_hidden_def (__strtok_r) weak_alias (__strtok_r, strtok_r) -- cgit v1.1