From: H.J. Lu <hjl.tools@gmail.com>
Date: Thu, 15 Oct 2015 20:41:21 +0000 (-0700)
Subject: Mark x86 _dl_unmap/_dl_make_tlsdesc_dynamic hidden
X-Git-Tag: glibc-2.23~335
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9edf9b18b1dc5de0f3d76c42877b405cb439df4f;p=thirdparty%2Fglibc.git

Mark x86 _dl_unmap/_dl_make_tlsdesc_dynamic hidden

Since x86 _dl_unmap and _dl_make_tlsdesc_dynamic are only used
internally in ld.so, they can be made hidden.

	[BZ #19122]
	* sysdeps/i386/dl-lookupcfg.h (_dl_unmap): Add attribute_hidden.
	* sysdeps/i386/dl-tlsdesc.h (_dl_make_tlsdesc_dynamic):
	Likewise.
	* sysdeps/x86_64/dl-tlsdesc.h (_dl_make_tlsdesc_dynamic):
	Likewise.
	* sysdeps/x86_64/dl-lookupcfg.h (_dl_unmap): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 6f103e86320..0edfbe59561 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-10-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #19122]
+	* sysdeps/i386/dl-lookupcfg.h (_dl_unmap): Add attribute_hidden.
+	* sysdeps/i386/dl-tlsdesc.h (_dl_make_tlsdesc_dynamic):
+	Likewise.
+	* sysdeps/x86_64/dl-tlsdesc.h (_dl_make_tlsdesc_dynamic):
+	Likewise.
+	* sysdeps/x86_64/dl-lookupcfg.h (_dl_unmap): Likewise.
+
 2015-10-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/unix/sysv/linux/i386/sysdep.h: Add comments for
diff --git a/sysdeps/i386/dl-lookupcfg.h b/sysdeps/i386/dl-lookupcfg.h
index 310f261fec6..a42d5ef4824 100644
--- a/sysdeps/i386/dl-lookupcfg.h
+++ b/sysdeps/i386/dl-lookupcfg.h
@@ -26,6 +26,7 @@
 
 struct link_map;
 
-extern void internal_function _dl_unmap (struct link_map *map);
+extern void _dl_unmap (struct link_map *map)
+  internal_function attribute_hidden;
 
 #define DL_UNMAP(map) _dl_unmap (map)
diff --git a/sysdeps/i386/dl-tlsdesc.h b/sysdeps/i386/dl-tlsdesc.h
index c58423389e4..ee6d7fa10a6 100644
--- a/sysdeps/i386/dl-tlsdesc.h
+++ b/sysdeps/i386/dl-tlsdesc.h
@@ -50,8 +50,9 @@ extern ptrdiff_t attribute_hidden __attribute__ ((regparm (1)))
   _dl_tlsdesc_resolve_hold (struct tlsdesc *);
 
 # ifdef SHARED
-extern void *internal_function _dl_make_tlsdesc_dynamic (struct link_map *map,
-							 size_t ti_offset);
+extern void *_dl_make_tlsdesc_dynamic (struct link_map *map,
+				       size_t ti_offset)
+  internal_function attribute_hidden;
 
 extern ptrdiff_t attribute_hidden __attribute__ ((regparm (1)))
   _dl_tlsdesc_dynamic (struct tlsdesc *);
diff --git a/sysdeps/x86_64/dl-lookupcfg.h b/sysdeps/x86_64/dl-lookupcfg.h
index 310f261fec6..a42d5ef4824 100644
--- a/sysdeps/x86_64/dl-lookupcfg.h
+++ b/sysdeps/x86_64/dl-lookupcfg.h
@@ -26,6 +26,7 @@
 
 struct link_map;
 
-extern void internal_function _dl_unmap (struct link_map *map);
+extern void _dl_unmap (struct link_map *map)
+  internal_function attribute_hidden;
 
 #define DL_UNMAP(map) _dl_unmap (map)
diff --git a/sysdeps/x86_64/dl-tlsdesc.h b/sysdeps/x86_64/dl-tlsdesc.h
index cf32328264c..542641d4b8a 100644
--- a/sysdeps/x86_64/dl-tlsdesc.h
+++ b/sysdeps/x86_64/dl-tlsdesc.h
@@ -60,8 +60,9 @@ extern ptrdiff_t attribute_hidden
   _dl_tlsdesc_resolve_hold(struct tlsdesc *on_rax);
 
 # ifdef SHARED
-extern void *internal_function _dl_make_tlsdesc_dynamic (struct link_map *map,
-							 size_t ti_offset);
+extern void *_dl_make_tlsdesc_dynamic (struct link_map *map,
+				       size_t ti_offset)
+  internal_function attribute_hidden;
 
 extern ptrdiff_t attribute_hidden _dl_tlsdesc_dynamic(struct tlsdesc *);
 # endif