about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-07-15 07:40:56 -0400
committerMike Frysinger <vapier@gentoo.org>2015-07-16 09:03:46 -0400
commit6b96d6de8ccd1c04f172a43d3785960e0a76be3f (patch)
treebbeece79f9e84e4eb1055b57a344a9f41971f0aa
parent2a6ad8142d14c998e6c5eb51418aac1f598b621e (diff)
downloadglibc-6b96d6de8ccd1c04f172a43d3785960e0a76be3f.tar.gz
glibc-6b96d6de8ccd1c04f172a43d3785960e0a76be3f.tar.xz
glibc-6b96d6de8ccd1c04f172a43d3785960e0a76be3f.zip
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.
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/hppa/Versions2
-rw-r--r--sysdeps/hppa/dl-lookupcfg.h2
-rw-r--r--sysdeps/ia64/Versions2
-rw-r--r--sysdeps/ia64/dl-lookupcfg.h2
5 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 47e88edebe..1630c1d582 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2015-07-16  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.
+
+2015-07-16  Mike Frysinger  <vapier@gentoo.org>
+
 	* elf/dl-symaddr.c (_dl_symbol_address): Add rtld_hidden_def.
 	* sysdeps/hppa/dl-lookupcfg.h (_dl_symbol_address): Add
 	rtld_hidden_proto.
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)