From a0aef7830eb0698f72129b647be8c00cdf0c7938 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sun, 1 Oct 2017 16:09:20 -0700 Subject: 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. --- ChangeLog | 7 +++++++ elf/dl-iteratephdr.c | 1 - include/link.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 396cf74ef8..33177f2cee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2017-10-01 H.J. Lu + + [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 [BZ #18822] diff --git a/elf/dl-iteratephdr.c b/elf/dl-iteratephdr.c index ddd5bde831..88473e790b 100644 --- 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 eeb5f4d53b..3e1b2aefb7 100644 --- 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 -- cgit 1.4.1