Move hidden_proto (__dl_iterate_phdr) to include/link.h [BZ #18822]

__dl_iterate_phdr is hidden and should be accessed directly within
libc.so and libc.a without using GOT nor PLT.

	[BZ #18822]
	* elf/dl-iteratephdr.c (hidden_proto (__dl_iterate_phdr)): Moved
	to ...
	* include/link.h (hidden_proto (__dl_iterate_phdr)): Here.

diff --git a/ChangeLog b/ChangeLog
index 396cf74ef82a6e64b397d1a87187e1fd1466d035..33177f2ceecc156d15e3c59adbb34e509d48321d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-10-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+       [BZ #18822]
+       * elf/dl-iteratephdr.c (hidden_proto (__dl_iterate_phdr)): Moved
+       to ...
+       * include/link.h (hidden_proto (__dl_iterate_phdr)): Here.
+
 2017-10-01  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #18822]

diff --git a/elf/dl-iteratephdr.c b/elf/dl-iteratephdr.c
index ddd5bde83163a4304f4d58fffc1c2eedfcfd274d..88473e790b0728086c1af16f101eecfa76764eb5 100644 (file)
--- a/elf/dl-iteratephdr.c
+++ b/elf/dl-iteratephdr.c
@@ -28,7 +28,6 @@ cancel_handler (void *arg __attribute__((unused)))
   __rtld_lock_unlock_recursive (GL(dl_load_write_lock));
 }
 
-hidden_proto (__dl_iterate_phdr)
 int
 __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
                                    size_t size, void *data), void *data)

diff --git a/include/link.h b/include/link.h
index eeb5f4d53b4db414cf1dc0b67afda8f7dbfa05eb..3e1b2aefb7844b873aadf0c14b7cf4c5372fabe1 100644 (file)
--- a/include/link.h
+++ b/include/link.h
@@ -341,6 +341,7 @@ struct link_map
 extern int __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
                                               size_t size, void *data),
                              void *data);
+hidden_proto (__dl_iterate_phdr)
 
 /* We use this macro to refer to ELF macros independent of the native
    wordsize.  `ELFW(R_TYPE)' is used in place of `ELF32_R_TYPE' or