From 17e00cc69eac2ec10ac69a3f85db0dffc9d73845 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 31 Aug 2017 16:59:37 +0200
Subject: elf: Remove internal_function attribute

---
 elf/dl-addr-obj.c                | 1 -
 elf/dl-cache.c                   | 2 --
 elf/dl-debug.c                   | 1 -
 elf/dl-deps.c                    | 2 --
 elf/dl-environ.c                 | 1 -
 elf/dl-execstack.c               | 1 -
 elf/dl-fini.c                    | 1 -
 elf/dl-hwcaps.c                  | 1 -
 elf/dl-libc.c                    | 1 -
 elf/dl-load.c                    | 5 -----
 elf/dl-lookup.c                  | 5 -----
 elf/dl-misc.c                    | 4 ----
 elf/dl-object.c                  | 2 --
 elf/dl-profile.c                 | 1 -
 elf/dl-reloc.c                   | 7 +++----
 elf/dl-support.c                 | 2 --
 elf/dl-sym.c                     | 2 --
 elf/dl-sysdep.c                  | 2 --
 elf/dl-tls.c                     | 6 ------
 elf/dl-version.c                 | 3 ---
 elf/dynamic-link.h               | 3 +--
 elf/tlsdeschtab.h                | 1 -
 elf/tst-_dl_addr_inside_object.c | 3 +--
 23 files changed, 5 insertions(+), 52 deletions(-)

(limited to 'elf')

diff --git a/elf/dl-addr-obj.c b/elf/dl-addr-obj.c
index 62aa630..5986160 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 e9632da..b04ddee 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 f395704..73c69df 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 7c82d42..35cad36 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 cbffec8..8134324 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 875338b..a266c07 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 d6201b2..71c06fc 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 ac50fd2..92f2eb4 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 9fdc8b1..bd3c18d 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 c1b6d4b..a067760 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 645dc3e..d77e803 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 c469b5a..c1955dd 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 4c43235..da13882 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 a4f1108..c295dd6 100644
--- a/elf/dl-profile.c
+++ b/elf/dl-profile.c
@@ -180,7 +180,6 @@ static unsigned int log_hashfraction;
 /* Set up profiling data to profile object desribed by MAP.  The output
    file is found (or created) in OUTPUT_DIR.  */
 void
-internal_function
 _dl_start_profile (void)
 {
   char *filename;
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index b3c3a9b..eef9e3a 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -45,7 +45,6 @@
    directly, as static TLS should be rare and code handling it should
    not be inlined as much as possible.  */
 int
-internal_function
 _dl_try_allocate_static_tls (struct link_map *map)
 {
   /* If we've already used the variable with dynamic access, or if the
@@ -112,7 +111,7 @@ _dl_try_allocate_static_tls (struct link_map *map)
 }
 
 void
-internal_function __attribute_noinline__
+__attribute_noinline__
 _dl_allocate_static_tls (struct link_map *map)
 {
   if (map->l_tls_offset == FORCED_DYNAMIC_TLS_OFFSET
@@ -308,7 +307,7 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
 }
 
 
-void internal_function
+void
 _dl_protect_relro (struct link_map *l)
 {
   ElfW(Addr) start = ALIGN_DOWN((l->l_addr
@@ -328,7 +327,7 @@ cannot apply additional memory protection after relocation");
 }
 
 void
-internal_function __attribute_noinline__
+__attribute_noinline__
 _dl_reloc_bad_type (struct link_map *map, unsigned int type, int plt)
 {
 #define DIGIT(b)	_itoa_lower_digits[(b) & 0xf];
diff --git a/elf/dl-support.c b/elf/dl-support.c
index 48340f7..5e3de90 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -221,7 +221,6 @@ __rtld_lock_define_initialized_recursive (, _dl_load_write_lock)
 int _dl_clktck;
 
 void
-internal_function
 _dl_aux_init (ElfW(auxv_t) *av)
 {
   int seen = 0;
@@ -305,7 +304,6 @@ _dl_aux_init (ElfW(auxv_t) *av)
 
 
 void
-internal_function
 _dl_non_dynamic_init (void)
 {
   _dl_main_map.l_origin = _dl_get_origin ();
diff --git a/elf/dl-sym.c b/elf/dl-sym.c
index 97cfcca..3e23555 100644
--- a/elf/dl-sym.c
+++ b/elf/dl-sym.c
@@ -41,7 +41,6 @@
 /* Return the symbol address given the map of the module it is in and
    the symbol record.  This is used in dl-sym.c.  */
 static void *
-internal_function
 _dl_tls_symaddr (struct link_map *map, const ElfW(Sym) *ref)
 {
 # ifndef DONT_USE_TLS_INDEX
@@ -83,7 +82,6 @@ call_dl_lookup (void *ptr)
 
 
 static void *
-internal_function
 do_sym (void *handle, const char *name, void *who,
 	struct r_found_version *vers, int flags)
 {
diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c
index c4ff8b2..6d92df5 100644
--- a/elf/dl-sysdep.c
+++ b/elf/dl-sysdep.c
@@ -255,13 +255,11 @@ _dl_sysdep_start (void **start_argptr,
 }
 
 void
-internal_function
 _dl_sysdep_start_cleanup (void)
 {
 }
 
 void
-internal_function
 _dl_show_auxv (void)
 {
   char buf[64];
diff --git a/elf/dl-tls.c b/elf/dl-tls.c
index ddf9fb2..d791a5c 100644
--- a/elf/dl-tls.c
+++ b/elf/dl-tls.c
@@ -44,7 +44,6 @@ oom (void)
 
 
 size_t
-internal_function
 _dl_next_tls_modid (void)
 {
   size_t result;
@@ -105,7 +104,6 @@ _dl_next_tls_modid (void)
 
 
 size_t
-internal_function
 _dl_count_modids (void)
 {
   /* It is rare that we have gaps; see elf/dl-open.c (_dl_open) where
@@ -133,7 +131,6 @@ _dl_count_modids (void)
 
 #ifdef SHARED
 void
-internal_function
 _dl_determine_tlsoffset (void)
 {
   size_t max_align = TLS_TCB_ALIGN;
@@ -277,7 +274,6 @@ _dl_determine_tlsoffset (void)
 #endif /* SHARED */
 
 static void *
-internal_function
 allocate_dtv (void *result)
 {
   dtv_t *dtv;
@@ -308,7 +304,6 @@ allocate_dtv (void *result)
 
 /* Get size and alignment requirements of the static TLS block.  */
 void
-internal_function
 _dl_get_tls_static_info (size_t *sizep, size_t *alignp)
 {
   *sizep = GL(dl_tls_static_size);
@@ -333,7 +328,6 @@ tcb_to_pointer_to_free_location (void *tcb)
 }
 
 void *
-internal_function
 _dl_allocate_tls_storage (void)
 {
   void *result;
diff --git a/elf/dl-version.c b/elf/dl-version.c
index c0d76ad..6401bc4 100644
--- a/elf/dl-version.c
+++ b/elf/dl-version.c
@@ -51,7 +51,6 @@ find_needed (const char *name, struct link_map *map)
 
 
 static int
-internal_function
 match_symbol (const char *name, Lmid_t ns, ElfW(Word) hash, const char *string,
 	      struct link_map *map, int verbose, int weak)
 {
@@ -153,7 +152,6 @@ checking for version `%s' in file %s [%lu] required by file %s [%lu]\n",
 
 
 int
-internal_function
 _dl_check_map_versions (struct link_map *map, int verbose, int trace_mode)
 {
   int result = 0;
@@ -360,7 +358,6 @@ _dl_check_map_versions (struct link_map *map, int verbose, int trace_mode)
 
 
 int
-internal_function
 _dl_check_all_versions (struct link_map *map, int verbose, int trace_mode)
 {
   struct link_map *l;
diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h
index 60f2d91..ebea756 100644
--- a/elf/dynamic-link.h
+++ b/elf/dynamic-link.h
@@ -42,8 +42,7 @@
      && (__builtin_expect ((sym_map)->l_tls_offset != NO_TLS_OFFSET, 1)	\
 	 || _dl_try_allocate_static_tls (sym_map) == 0))
 
-int internal_function attribute_hidden
-  _dl_try_allocate_static_tls (struct link_map *map);
+int _dl_try_allocate_static_tls (struct link_map *map) attribute_hidden;
 
 #include <elf.h>
 
diff --git a/elf/tlsdeschtab.h b/elf/tlsdeschtab.h
index 3091d8b..ad3001d 100644
--- a/elf/tlsdeschtab.h
+++ b/elf/tlsdeschtab.h
@@ -79,7 +79,6 @@ map_generation (struct link_map *map)
 }
 
 void *
-internal_function
 _dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset)
 {
   struct hashtab *ht;
diff --git a/elf/tst-_dl_addr_inside_object.c b/elf/tst-_dl_addr_inside_object.c
index 1604b8d..0a407ec 100644
--- a/elf/tst-_dl_addr_inside_object.c
+++ b/elf/tst-_dl_addr_inside_object.c
@@ -22,8 +22,7 @@
 #include <elf.h>
 #include <libc-symbols.h>
 
-extern int internal_function _dl_addr_inside_object (struct link_map *l,
-						     const ElfW(Addr) addr);
+extern int _dl_addr_inside_object (struct link_map *l, const ElfW(Addr) addr);
 
 static int
 do_test (void)
-- 
cgit v1.1