From 6b96d6de8ccd1c04f172a43d3785960e0a76be3f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 15 Jul 2015 07:40:56 -0400 Subject: hppa/ia64: _dl_unmap: make it hidden This symbol is only used by DL_UNMAP which in turn is only used by _dl_close_worker in dl-close.c, and _dl_close_worker itself is marked hidden as it is only used by the ldso. That means _dl_unmap should be marked hidden. Without this, the elf/check-localplt test fails. --- ChangeLog | 7 +++++++ sysdeps/hppa/Versions | 2 +- sysdeps/hppa/dl-lookupcfg.h | 2 +- sysdeps/ia64/Versions | 2 +- sysdeps/ia64/dl-lookupcfg.h | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47e88edebe..1630c1d582 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-07-16 Mike Frysinger + + * sysdeps/hppa/Versions (GLIBC_PRIVATE): Delete _dl_unmap. + * sysdeps/hppa/dl-lookupcfg.h (_dl_unmap): Add attribute_hidden. + * sysdeps/ia64/Versions (GLIBC_PRIVATE): Delete _dl_unmap. + * sysdeps/ia64/dl-lookupcfg.h (_dl_unmap): Add attribute_hidden. + 2015-07-16 Mike Frysinger * elf/dl-symaddr.c (_dl_symbol_address): Add rtld_hidden_def. diff --git a/sysdeps/hppa/Versions b/sysdeps/hppa/Versions index 2ae3cbdf17..c9723b4746 100644 --- a/sysdeps/hppa/Versions +++ b/sysdeps/hppa/Versions @@ -1,7 +1,7 @@ ld { GLIBC_PRIVATE { # hppa specific functions in the dynamic linker, but used by libc.so. - _dl_symbol_address; _dl_unmap; _dl_lookup_address; + _dl_symbol_address; _dl_lookup_address; _dl_function_address; } } diff --git a/sysdeps/hppa/dl-lookupcfg.h b/sysdeps/hppa/dl-lookupcfg.h index cd0d6b15b3..c36928cc0d 100644 --- a/sysdeps/hppa/dl-lookupcfg.h +++ b/sysdeps/hppa/dl-lookupcfg.h @@ -35,7 +35,7 @@ Elf32_Addr _dl_lookup_address (const void *address); #define DL_LOOKUP_ADDRESS(addr) \ (_dl_lookup_address ((void *)((unsigned long)addr & ~3))) -void _dl_unmap (struct link_map *map); +void attribute_hidden _dl_unmap (struct link_map *map); #define DL_UNMAP(map) _dl_unmap (map) diff --git a/sysdeps/ia64/Versions b/sysdeps/ia64/Versions index 56b417d614..ac3bff9b78 100644 --- a/sysdeps/ia64/Versions +++ b/sysdeps/ia64/Versions @@ -1,7 +1,7 @@ ld { GLIBC_PRIVATE { # ia64 specific functions in the dynamic linker, but used by libc.so. - _dl_symbol_address; _dl_unmap; _dl_lookup_address; + _dl_symbol_address; _dl_lookup_address; _dl_function_address; } } diff --git a/sysdeps/ia64/dl-lookupcfg.h b/sysdeps/ia64/dl-lookupcfg.h index edf26359f6..3c55e08a44 100644 --- a/sysdeps/ia64/dl-lookupcfg.h +++ b/sysdeps/ia64/dl-lookupcfg.h @@ -36,7 +36,7 @@ extern Elf64_Addr _dl_lookup_address (const void *address); #define DL_LOOKUP_ADDRESS(addr) _dl_lookup_address (addr) -extern void _dl_unmap (struct link_map *map); +extern void attribute_hidden _dl_unmap (struct link_map *map); #define DL_UNMAP(map) _dl_unmap (map) -- cgit v1.2.3-70-g09d2