[2/2] hppa/ia64: _dl_unmap: make it hidden

Message ID 1436961343-4773-2-git-send-email-vapier@gentoo.org
State Committed
Delegated to: Mike Frysinger
Headers

Commit Message

Mike Frysinger July 15, 2015, 11:55 a.m. UTC
  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.

2015-07-15  Mike Frysinger  <vapier@gentoo.org>

	* 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.
---
 sysdeps/hppa/Versions       | 2 +-
 sysdeps/hppa/dl-lookupcfg.h | 2 +-
 sysdeps/ia64/Versions       | 2 +-
 sysdeps/ia64/dl-lookupcfg.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
  

Patch

diff --git a/sysdeps/hppa/Versions b/sysdeps/hppa/Versions
index 2ae3cbd..c9723b4 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 cd0d6b1..c36928c 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 56b417d..ac3bff9 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 edf2635..3c55e08 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)