elf: Remove internal_function attribute

44 files changed, 130 insertions, 139 deletions

diff --git a/ChangeLog b/ChangeLog
index 0ad07472a7..befd2ed2b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,80 @@
 2017-08-31  Florian Weimer  <fweimer@redhat.com>
 
+	* elf/dl-addr-obj.c (_dl_addr_inside_object): Remove
+	internal_function.
+	* elf/dl-cache.c (_dl_cache_libcmp, _dl_load_cache_lookup):
+	Likewise.
+	* elf/dl-debug.c (_dl_debug_initialize): Likewise.
+	* elf/dl-deps.c (_dl_build_local_scope, _dl_map_object_deps): Likewise.
+	* elf/dl-environ.c (_dl_next_ld_env_entry): Likewise.
+	* elf/dl-execstack.c (_dl_make_stack_executable): Likewise.
+	* elf/dl-fini.c (_dl_sort_fini): Likewise.
+	* elf/dl-hwcaps.c (_dl_important_hwcaps): Likewise.
+	* elf/dl-libc.c (dlerror_run): Likewise.
+	* elf/dl-load.c (add_name_to_object, decompose_rpath)
+	(_dl_init_paths, _dl_map_object, _dl_rtld_di_serinfo): Likewise.
+	* elf/dl-lookup.c (add_dependency, _dl_debug_bindings)
+	(_dl_lookup_symbol_x, _dl_setup_hash, _dl_debug_bindings):
+	Likewise.
+	* elf/dl-misc.c (_dl_sysdep_read_whole_file, _dl_name_match_p)
+	(_dl_higher_prime_number, _dl_strtoul): Likewise.
+	* elf/dl-object.c (_dl_add_to_namespace_list, _dl_new_object): Likewise.
+	* elf/dl-profile.c (_dl_start_profile): Likewise.
+	* elf/dl-reloc.c (_dl_try_allocate_static_tls)
+	(_dl_allocate_static_tls, _dl_protect_relro, _dl_reloc_bad_type):
+	Likewise.
+	* elf/dl-support.c (_dl_aux_init, _dl_non_dynamic_init): Likewise.
+	* elf/dl-sym.c (_dl_tls_symaddr, do_sym): Likewise.
+	* elf/dl-sysdep.c (_dl_sysdep_start_cleanup, _dl_show_auxv): Likewise.
+	* elf/dl-tls.c (_dl_next_tls_modid, _dl_count_modids)
+	(_dl_determine_tlsoffset, allocate_dtv, _dl_get_tls_static_info)
+	(_dl_allocate_tls_storage): Likewise.
+	* elf/dl-version.c (match_symbol, _dl_check_map_versions)
+	(_dl_check_all_versions): Likewise.
+	* elf/dynamic-link.h (_dl_try_allocate_static_tls): Likewise.
+	* elf/tlsdeschtab.h (_dl_make_tlsdesc_dynamic): Likewise.
+	* elf/tst-_dl_addr_inside_object.c (_dl_addr_inside_object): Likewise.
+	* sysdeps/aarch64/dl-tlsdesc.h (_dl_make_tlsdesc_dynamic): Likewise.
+	* sysdeps/aarch64/tlsdesc.c (_dl_unmap): Likewise.
+	* sysdeps/arm/dl-lookupcfg.h (_dl_unmap): Likewise.
+	* sysdeps/arm/dl-machine.h (elf_machine_load_address): Remove
+	internal_function from __dl_start.
+	* sysdeps/arm/dl-tlsdesc.h (_dl_unmap): Remove internal_function.
+	* sysdeps/generic/dl-cache.h (_dl_cache_libcmp): Likewise.
+	* sysdeps/generic/ldsodefs.h (_dl_name_match_p)
+	(_dl_higher_prime_number, _dl_strtoul, _dl_map_object)
+	(_dl_map_object_deps, _dl_setup_hash, _dl_rtld_di_serinfo)
+	(_dl_lookup_symbol_x, _dl_add_to_namespace_list, _dl_new_object)
+	(_dl_protect_relro, _dl_reloc_bad_type, _dl_check_all_versions)
+	(_dl_check_map_versions, _dl_sort_fini, _dl_debug_initialize)
+	(_dl_init_paths, _dl_start_profile, _dl_show_auxv)
+	(_dl_next_ld_env_entry, _dl_important_hwcaps)
+	(_dl_load_cache_lookup, _dl_sysdep_read_whole_file)
+	(_dl_sysdep_start_cleanup, _dl_next_tls_modid, _dl_count_modids)
+	(_dl_determine_tlsoffset, _dl_get_tls_static_info)
+	(_dl_allocate_static_tls, _dl_allocate_tls_storage)
+	(_dl_addr_inside_object, _dl_non_dynamic_init, _dl_aux_init):
+	Likewise.
+	(struct rtld_global_ro): Remove internal_function from the
+	_dl_lookup_symbol_x member.
+	(_dl_symbol_value): Remove.  No longer defined anywhere.
+	* sysdeps/i386/dl-lookupcfg.h (_dl_unmap): Remove
+	internal_function.
+	* sysdeps/i386/dl-tlsdesc.h (_dl_make_tlsdesc_dynamic): Likewise.
+	* sysdeps/i386/tlsdesc.c (_dl_unmap): Likewise.
+	* sysdeps/mach/hurd/dl-sysdep.c (_dl_show_auxv): Likewise.
+	* sysdeps/nios2/dl-init.c (_dl_nios2_get_gp_value): Likewise.
+	* sysdeps/tile/dl-lookupcfg.h (_dl_unmap): Likewise.
+	* sysdeps/tile/dl-machine.h (_dl_after_load): Likewise.
+	* sysdeps/tile/dl-runtime.c (_dl_after_load, _dl_unmap): Likewise.
+	* sysdeps/unix/sysv/linux/dl-vdso.c (_dl_vdso_vsym): Likewise.
+	* sysdeps/unix/sysv/linux/dl-vdso.h (_dl_vdso_vsym): Likewise.
+	* sysdeps/x86_64/dl-lookupcfg.h (_dl_unmap): Likewise.
+	* sysdeps/x86_64/dl-tlsdesc.h (_dl_make_tlsdesc_dynamic): Likewise.
+	* sysdeps/x86_64/tlsdesc.c (_dl_unmap): Likewise.
+
+2017-08-31  Florian Weimer  <fweimer@redhat.com>
+
 	* gmon/gmon.c (write_hist, write_call_graph, write_bb_counts):
 	Remove internal_function.
 	* sysdeps/arm/machine-gmon.h (mcount_internal, _MCOUNT_DECL):
diff --git a/elf/dl-addr-obj.c b/elf/dl-addr-obj.c
index 62aa630ce5..5986160241 100644
--- a/elf/dl-addr-obj.c
+++ b/elf/dl-addr-obj.c
@@ -61,7 +61,6 @@
 
 */
 int
-internal_function
 _dl_addr_inside_object (struct link_map *l, const ElfW(Addr) addr)
 {
   int n = l->l_phnum;
diff --git a/elf/dl-cache.c b/elf/dl-cache.c
index e9632da0b3..b04ddee93f 100644
--- a/elf/dl-cache.c
+++ b/elf/dl-cache.c
@@ -134,7 +134,6 @@ while (0)
 
 
 int
-internal_function
 _dl_cache_libcmp (const char *p1, const char *p2)
 {
   while (*p1 != '\0')
@@ -181,7 +180,6 @@ _dl_cache_libcmp (const char *p1, const char *p2)
    this function must take care that it does not return references to
    any data in the mapping.  */
 char *
-internal_function
 _dl_load_cache_lookup (const char *name)
 {
   int left, right, middle;
diff --git a/elf/dl-debug.c b/elf/dl-debug.c
index f3957044f6..73c69dfbae 100644
--- a/elf/dl-debug.c
+++ b/elf/dl-debug.c
@@ -42,7 +42,6 @@ struct r_debug _r_debug;
    _r_debug.r_ldbase.  Returns the address of _r_debug.  */
 
 struct r_debug *
-internal_function
 _dl_debug_initialize (ElfW(Addr) ldbase, Lmid_t ns)
 {
   struct r_debug *r;
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index 7c82d42be9..35cad364b7 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -68,7 +68,6 @@ openaux (void *a)
 }
 
 static ptrdiff_t
-internal_function
 _dl_build_local_scope (struct link_map **list, struct link_map *map)
 {
   struct link_map **p = list;
@@ -153,7 +152,6 @@ preload (struct list *known, unsigned int *nlist, struct link_map *map)
 }
 
 void
-internal_function
 _dl_map_object_deps (struct link_map *map,
 		     struct link_map **preloads, unsigned int npreloads,
 		     int trace_mode, int open_mode)
diff --git a/elf/dl-environ.c b/elf/dl-environ.c
index cbffec8808..8134324d9d 100644
--- a/elf/dl-environ.c
+++ b/elf/dl-environ.c
@@ -24,7 +24,6 @@
 /* Walk through the environment of the process and return all entries
    starting with `LD_'.  */
 char *
-internal_function
 _dl_next_ld_env_entry (char ***position)
 {
   char **current = *position;
diff --git a/elf/dl-execstack.c b/elf/dl-execstack.c
index 875338bea5..a266c077f3 100644
--- a/elf/dl-execstack.c
+++ b/elf/dl-execstack.c
@@ -23,7 +23,6 @@
    so as to mprotect it.  */
 
 int
-internal_function
 _dl_make_stack_executable (void **stack_endp)
 {
   return ENOSYS;
diff --git a/elf/dl-fini.c b/elf/dl-fini.c
index d6201b2c81..71c06fc68b 100644
--- a/elf/dl-fini.c
+++ b/elf/dl-fini.c
@@ -26,7 +26,6 @@ typedef void (*fini_t) (void);
 
 
 void
-internal_function
 _dl_sort_fini (struct link_map **maps, size_t nmaps, char *used, Lmid_t ns)
 {
   /* A list of one element need not be sorted.  */
diff --git a/elf/dl-hwcaps.c b/elf/dl-hwcaps.c
index ac50fd2c38..92f2eb45ce 100644
--- a/elf/dl-hwcaps.c
+++ b/elf/dl-hwcaps.c
@@ -34,7 +34,6 @@
 
 /* Return an array of useful/necessary hardware capability names.  */
 const struct r_strlenpair *
-internal_function
 _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
 		      size_t *max_capstrlen)
 {
diff --git a/elf/dl-libc.c b/elf/dl-libc.c
index 9fdc8b1130..bd3c18d20f 100644
--- a/elf/dl-libc.c
+++ b/elf/dl-libc.c
@@ -36,7 +36,6 @@ extern char **__environ;
    Much of this code came from gconv_dl.c with slight modifications. */
 
 static int
-internal_function
 dlerror_run (void (*operate) (void *), void *args)
 {
   const char *objname;
diff --git a/elf/dl-load.c b/elf/dl-load.c
index c1b6d4ba0f..a067760cc6 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -392,7 +392,6 @@ expand_dynamic_string_token (struct link_map *l, const char *s, int is_path)
    be freed if the shared object already has this name.
    Returns false if the object already had this name.  */
 static void
-internal_function
 add_name_to_object (struct link_map *l, const char *name)
 {
   struct libname_list *lnp, *lastp;
@@ -536,7 +535,6 @@ fillin_rpath (char *rpath, struct r_search_path_elem **result, const char *sep,
 
 
 static bool
-internal_function
 decompose_rpath (struct r_search_path_struct *sps,
 		 const char *rpath, struct link_map *l, const char *what)
 {
@@ -656,7 +654,6 @@ cache_rpath (struct link_map *l,
 
 
 void
-internal_function
 _dl_init_paths (const char *llp)
 {
   size_t idx;
@@ -1887,7 +1884,6 @@ open_path (const char *name, size_t namelen, int mode,
 /* Map in the shared object file NAME.  */
 
 struct link_map *
-internal_function
 _dl_map_object (struct link_map *loader, const char *name,
 		int type, int trace_mode, int mode, Lmid_t nsid)
 {
@@ -2241,7 +2237,6 @@ add_path (struct add_path_state *p, const struct r_search_path_struct *sps,
 }
 
 void
-internal_function
 _dl_rtld_di_serinfo (struct link_map *loader, Dl_serinfo *si, bool counting)
 {
   if (counting)
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index 645dc3ebb4..d77e803976 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -560,7 +560,6 @@ dl_new_hash (const char *s)
 
 /* Add extra dependency on MAP to UNDEF_MAP.  */
 static int
-internal_function
 add_dependency (struct link_map *undef_map, struct link_map *map, int flags)
 {
   struct link_map *runp;
@@ -770,7 +769,6 @@ add_dependency (struct link_map *undef_map, struct link_map *map, int flags)
 }
 
 static void
-internal_function
 _dl_debug_bindings (const char *undef_name, struct link_map *undef_map,
 		    const ElfW(Sym) **ref, struct sym_val *value,
 		    const struct r_found_version *version, int type_class,
@@ -784,7 +782,6 @@ _dl_debug_bindings (const char *undef_name, struct link_map *undef_map,
    or in any function which gets called.  If this would happen the audit
    code might create a thread which can throw off all the scope locking.  */
 lookup_t
-internal_function
 _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map,
 		     const ElfW(Sym) **ref,
 		     struct r_scope_elem *symbol_scope[],
@@ -935,7 +932,6 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map,
 /* Cache the location of MAP's hash table.  */
 
 void
-internal_function
 _dl_setup_hash (struct link_map *map)
 {
   Elf_Symndx *hash;
@@ -979,7 +975,6 @@ _dl_setup_hash (struct link_map *map)
 
 
 static void
-internal_function
 _dl_debug_bindings (const char *undef_name, struct link_map *undef_map,
 		    const ElfW(Sym) **ref, struct sym_val *value,
 		    const struct r_found_version *version, int type_class,
diff --git a/elf/dl-misc.c b/elf/dl-misc.c
index c469b5a365..c1955dda30 100644
--- a/elf/dl-misc.c
+++ b/elf/dl-misc.c
@@ -40,7 +40,6 @@
    is returned.  */
 
 void *
-internal_function
 _dl_sysdep_read_whole_file (const char *file, size_t *sizep, int prot)
 {
   void *result = MAP_FAILED;
@@ -279,7 +278,6 @@ _dl_dprintf (int fd, const char *fmt, ...)
 
 /* Test whether given NAME matches any of the names of the given object.  */
 int
-internal_function
 _dl_name_match_p (const char *name, const struct link_map *map)
 {
   if (strcmp (name, map->l_name) == 0)
@@ -298,7 +296,6 @@ _dl_name_match_p (const char *name, const struct link_map *map)
 
 
 unsigned long int
-internal_function
 _dl_higher_prime_number (unsigned long int n)
 {
   /* These are primes that are near, but slightly smaller than, a
@@ -366,7 +363,6 @@ _dl_higher_prime_number (unsigned long int n)
    called before errno may have been set up.  */
 
 uint64_t
-internal_function
 _dl_strtoul (const char *nptr, char **endptr)
 {
   uint64_t result = 0;
diff --git a/elf/dl-object.c b/elf/dl-object.c
index 4c43235148..da138829da 100644
--- a/elf/dl-object.c
+++ b/elf/dl-object.c
@@ -27,7 +27,6 @@
 
 /* Add the new link_map NEW to the end of the namespace list.  */
 void
-internal_function
 _dl_add_to_namespace_list (struct link_map *new, Lmid_t nsid)
 {
   /* We modify the list of loaded objects.  */
@@ -55,7 +54,6 @@ _dl_add_to_namespace_list (struct link_map *new, Lmid_t nsid)
 /* Allocate a `struct link_map' for a new object being loaded,
    and enter it into the _dl_loaded list.  */
 struct link_map *
-internal_function
 _dl_new_object (char *realname, const char *libname, int type,
 		struct link_map *loader, int mode, Lmid_t nsid)
 {
diff --git a/elf/dl-profile.c b/elf/dl-profile.c
index a4f11089a1..c295dd6d00 100644
--- a/elf/dl-profile.c
+++ b/