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/i386/dl-machine.h | 2 ++ sysdeps/i386/dl-procinfo.c | 6 +++--- sysdeps/i386/i686/strtok_r.S | 1 + sysdeps/i386/strtok_r.S | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) (limited to 'sysdeps/i386') diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 65ae53a408..4b5b8f22e7 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -389,6 +389,7 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc, MAP is the object containing the reloc. */ static inline void +__attribute ((always_inline)) elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, const Elf32_Sym *sym, const struct r_found_version *version, void *const reloc_addr_arg) @@ -639,6 +640,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, #endif /* !RTLD_BOOTSTRAP */ static inline void +__attribute ((always_inline)) elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc, void *const reloc_addr_arg) { diff --git a/sysdeps/i386/dl-procinfo.c b/sysdeps/i386/dl-procinfo.c index 01b24d15b1..2108f22cb9 100644 --- a/sysdeps/i386/dl-procinfo.c +++ b/sysdeps/i386/dl-procinfo.c @@ -1,5 +1,5 @@ /* Data for i386 version of processor capability information. - Copyright (C) 2001,2002,2003 Free Software Foundation, Inc. + Copyright (C) 2001,2002,2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2001. @@ -24,7 +24,7 @@ If anything should be added here check whether the size of each string is still ok with the given array size. - All the #ifdefs in the definitions ar equite irritating but + All the #ifdefs in the definitions are quite irritating but necessary if we want to avoid duplicating the information. There are three different modes: @@ -41,7 +41,7 @@ */ #ifndef PROCINFO_CLASS -#define PROCINFO_CLASS +# define PROCINFO_CLASS #endif #if !defined PROCINFO_DECL && defined SHARED diff --git a/sysdeps/i386/i686/strtok_r.S b/sysdeps/i386/i686/strtok_r.S index cbaeabbabe..1c24ca85f5 100644 --- a/sysdeps/i386/i686/strtok_r.S +++ b/sysdeps/i386/i686/strtok_r.S @@ -2,3 +2,4 @@ #define USE_AS_STRTOK_R 1 #include weak_alias (BP_SYM (__strtok_r), BP_SYM (strtok_r)) +strong_alias (BP_SYM (__strtok_r), BP_SYM (__GI___strtok_r)) diff --git a/sysdeps/i386/strtok_r.S b/sysdeps/i386/strtok_r.S index 621093a249..f4a6a2c409 100644 --- a/sysdeps/i386/strtok_r.S +++ b/sysdeps/i386/strtok_r.S @@ -2,3 +2,4 @@ #define USE_AS_STRTOK_R 1 #include weak_alias (BP_SYM (__strtok_r), BP_SYM (strtok_r)) +strong_alias (BP_SYM (__strtok_r), BP_SYM (__GI___strtok_r)) -- cgit 1.4.1