Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/808281/?format=api
{ "id": 808281, "url": "http://patchwork.ozlabs.org/api/patches/808281/?format=api", "web_url": "http://patchwork.ozlabs.org/project/glibc/patch/20170831152238.C14EA43994318@oldenburg.str.redhat.com/", "project": { "id": 41, "url": "http://patchwork.ozlabs.org/api/projects/41/?format=api", "name": "GNU C Library", "link_name": "glibc", "list_id": "libc-alpha.sourceware.org", "list_email": "libc-alpha@sourceware.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170831152238.C14EA43994318@oldenburg.str.redhat.com>", "list_archive_url": null, "date": "2017-08-31T15:22:38", "name": "[COMMITTED] elf: Remove internal_function attribute", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "08778715aa8fc9bd19c8ecc37ed18c0687cc5535", "submitter": { "id": 14312, "url": "http://patchwork.ozlabs.org/api/people/14312/?format=api", "name": "Florian Weimer", "email": "fweimer@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/glibc/patch/20170831152238.C14EA43994318@oldenburg.str.redhat.com/mbox/", "series": [ { "id": 854, "url": "http://patchwork.ozlabs.org/api/series/854/?format=api", "web_url": "http://patchwork.ozlabs.org/project/glibc/list/?series=854", "date": "2017-08-31T15:22:38", "name": "[COMMITTED] elf: Remove internal_function attribute", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/854/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/808281/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/808281/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<libc-alpha-return-83930-incoming=patchwork.ozlabs.org@sourceware.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "mailing list libc-alpha@sourceware.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=sourceware.org\n\t(client-ip=209.132.180.131; helo=sourceware.org;\n\tenvelope-from=libc-alpha-return-83930-incoming=patchwork.ozlabs.org@sourceware.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dkim=pass (1024-bit key;\n\tsecure) header.d=sourceware.org header.i=@sourceware.org\n\theader.b=\"ieqp1Cbe\"; dkim-atps=neutral", "sourceware.org; auth=none", "ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=fweimer@redhat.com" ], "Received": [ "from sourceware.org (server1.sourceware.org [209.132.180.131])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjmNB2K38z9s83\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 1 Sep 2017 01:23:06 +1000 (AEST)", "(qmail 47578 invoked by alias); 31 Aug 2017 15:22:52 -0000", "(qmail 47507 invoked by uid 89); 31 Aug 2017 15:22:52 -0000" ], "DomainKey-Signature": "a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:date:to:subject:mime-version:content-type\n\t:content-transfer-encoding:message-id:from; q=dns; s=default; b=\n\tJTYYDi9tZv+9FHHU9ddawJuDMRPNM2w1SRpFT/vKiTKNO1wFBt72o8F0pNUa1WqL\n\tcdF8140zxVnT5PBuuZpSnVbKhNKydjb6cBCdAHvMrhz5j3qNItba4MKz2MBTVyWq\n\t1mRv7XAt7qGFds0HHkb1kTrvERfBB7lGH3WnUirPcXk=", "DKIM-Signature": "v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:date:to:subject:mime-version:content-type\n\t:content-transfer-encoding:message-id:from; s=default; bh=76MDxE\n\t3OdPHB/s9goOMbMitizPo=; b=ieqp1CbeZ5vbYCF5CktLTpLwXPHQ2UVrENnxTa\n\teqMnN0otRLG128I1vw79tD4SQqxgcgQCaHQo0xaQHcqXmvJfWshyrbdnCAv0sMXk\n\tSCwmyjaOnIMjAdIWZq/L85ANAOvt/aSlkRgzCMTGftIq28Ud8p7+TyeIABUuRi/8\n\txsC+o=", "Mailing-List": "contact libc-alpha-help@sourceware.org; run by ezmlm", "Precedence": "bulk", "List-Id": "<libc-alpha.sourceware.org>", "List-Unsubscribe": "<mailto:libc-alpha-unsubscribe-incoming=patchwork.ozlabs.org@sourceware.org>", "List-Subscribe": "<mailto:libc-alpha-subscribe@sourceware.org>", "List-Archive": "<http://sourceware.org/ml/libc-alpha/>", "List-Post": "<mailto:libc-alpha@sourceware.org>", "List-Help": "<mailto:libc-alpha-help@sourceware.org>,\n\t<http://sourceware.org/ml/#faqs>", "Sender": "libc-alpha-owner@sourceware.org", "X-Virus-Found": "No", "X-Spam-SWARE-Status": "No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0,\n\tGIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3,\n\tKAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD,\n\tSPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Protect, adr,\n\tauditing", "X-HELO": "mx1.redhat.com", "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 1790DC047B8D", "Date": "Thu, 31 Aug 2017 17:22:38 +0200", "To": "libc-alpha@sourceware.org", "Subject": "[PATCH COMMITTED] elf: Remove internal_function attribute", "User-Agent": "Heirloom mailx 12.5 7/5/10", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=us-ascii", "Content-Transfer-Encoding": "7bit", "Message-Id": "<20170831152238.C14EA43994318@oldenburg.str.redhat.com>", "From": "fweimer@redhat.com (Florian Weimer)" }, "content": "2017-08-31 Florian Weimer <fweimer@redhat.com>\n\n\t* elf/dl-addr-obj.c (_dl_addr_inside_object): Remove\n\tinternal_function.\n\t* elf/dl-cache.c (_dl_cache_libcmp, _dl_load_cache_lookup):\n\tLikewise.\n\t* elf/dl-debug.c (_dl_debug_initialize): Likewise.\n\t* elf/dl-deps.c (_dl_build_local_scope, _dl_map_object_deps): Likewise.\n\t* elf/dl-environ.c (_dl_next_ld_env_entry): Likewise.\n\t* elf/dl-execstack.c (_dl_make_stack_executable): Likewise.\n\t* elf/dl-fini.c (_dl_sort_fini): Likewise.\n\t* elf/dl-hwcaps.c (_dl_important_hwcaps): Likewise.\n\t* elf/dl-libc.c (dlerror_run): Likewise.\n\t* elf/dl-load.c (add_name_to_object, decompose_rpath)\n\t(_dl_init_paths, _dl_map_object, _dl_rtld_di_serinfo): Likewise.\n\t* elf/dl-lookup.c (add_dependency, _dl_debug_bindings)\n\t(_dl_lookup_symbol_x, _dl_setup_hash, _dl_debug_bindings):\n\tLikewise.\n\t* elf/dl-misc.c (_dl_sysdep_read_whole_file, _dl_name_match_p)\n\t(_dl_higher_prime_number, _dl_strtoul): Likewise.\n\t* elf/dl-object.c (_dl_add_to_namespace_list, _dl_new_object): Likewise.\n\t* elf/dl-profile.c (_dl_start_profile): Likewise.\n\t* elf/dl-reloc.c (_dl_try_allocate_static_tls)\n\t(_dl_allocate_static_tls, _dl_protect_relro, _dl_reloc_bad_type):\n\tLikewise.\n\t* elf/dl-support.c (_dl_aux_init, _dl_non_dynamic_init): Likewise.\n\t* elf/dl-sym.c (_dl_tls_symaddr, do_sym): Likewise.\n\t* elf/dl-sysdep.c (_dl_sysdep_start_cleanup, _dl_show_auxv): Likewise.\n\t* elf/dl-tls.c (_dl_next_tls_modid, _dl_count_modids)\n\t(_dl_determine_tlsoffset, allocate_dtv, _dl_get_tls_static_info)\n\t(_dl_allocate_tls_storage): Likewise.\n\t* elf/dl-version.c (match_symbol, _dl_check_map_versions)\n\t(_dl_check_all_versions): Likewise.\n\t* elf/dynamic-link.h (_dl_try_allocate_static_tls): Likewise.\n\t* elf/tlsdeschtab.h (_dl_make_tlsdesc_dynamic): Likewise.\n\t* elf/tst-_dl_addr_inside_object.c (_dl_addr_inside_object): Likewise.\n\t* sysdeps/aarch64/dl-tlsdesc.h (_dl_make_tlsdesc_dynamic): Likewise.\n\t* sysdeps/aarch64/tlsdesc.c (_dl_unmap): Likewise.\n\t* sysdeps/arm/dl-lookupcfg.h (_dl_unmap): Likewise.\n\t* sysdeps/arm/dl-machine.h (elf_machine_load_address): Remove\n\tinternal_function from __dl_start.\n\t* sysdeps/arm/dl-tlsdesc.h (_dl_unmap): Remove internal_function.\n\t* sysdeps/generic/dl-cache.h (_dl_cache_libcmp): Likewise.\n\t* sysdeps/generic/ldsodefs.h (_dl_name_match_p)\n\t(_dl_higher_prime_number, _dl_strtoul, _dl_map_object)\n\t(_dl_map_object_deps, _dl_setup_hash, _dl_rtld_di_serinfo)\n\t(_dl_lookup_symbol_x, _dl_add_to_namespace_list, _dl_new_object)\n\t(_dl_protect_relro, _dl_reloc_bad_type, _dl_check_all_versions)\n\t(_dl_check_map_versions, _dl_sort_fini, _dl_debug_initialize)\n\t(_dl_init_paths, _dl_start_profile, _dl_show_auxv)\n\t(_dl_next_ld_env_entry, _dl_important_hwcaps)\n\t(_dl_load_cache_lookup, _dl_sysdep_read_whole_file)\n\t(_dl_sysdep_start_cleanup, _dl_next_tls_modid, _dl_count_modids)\n\t(_dl_determine_tlsoffset, _dl_get_tls_static_info)\n\t(_dl_allocate_static_tls, _dl_allocate_tls_storage)\n\t(_dl_addr_inside_object, _dl_non_dynamic_init, _dl_aux_init):\n\tLikewise.\n\t(struct rtld_global_ro): Remove internal_function from the\n\t_dl_lookup_symbol_x member.\n\t(_dl_symbol_value): Remove. No longer defined anywhere.\n\t* sysdeps/i386/dl-lookupcfg.h (_dl_unmap): Remove\n\tinternal_function.\n\t* sysdeps/i386/dl-tlsdesc.h (_dl_make_tlsdesc_dynamic): Likewise.\n\t* sysdeps/i386/tlsdesc.c (_dl_unmap): Likewise.\n\t* sysdeps/mach/hurd/dl-sysdep.c (_dl_show_auxv): Likewise.\n\t* sysdeps/nios2/dl-init.c (_dl_nios2_get_gp_value): Likewise.\n\t* sysdeps/tile/dl-lookupcfg.h (_dl_unmap): Likewise.\n\t* sysdeps/tile/dl-machine.h (_dl_after_load): Likewise.\n\t* sysdeps/tile/dl-runtime.c (_dl_after_load, _dl_unmap): Likewise.\n\t* sysdeps/unix/sysv/linux/dl-vdso.c (_dl_vdso_vsym): Likewise.\n\t* sysdeps/unix/sysv/linux/dl-vdso.h (_dl_vdso_vsym): Likewise.\n\t* sysdeps/x86_64/dl-lookupcfg.h (_dl_unmap): Likewise.\n\t* sysdeps/x86_64/dl-tlsdesc.h (_dl_make_tlsdesc_dynamic): Likewise.\n\t* sysdeps/x86_64/tlsdesc.c (_dl_unmap): Likewise.", "diff": "diff --git a/elf/dl-addr-obj.c b/elf/dl-addr-obj.c\nindex 62aa630ce5..5986160241 100644\n--- a/elf/dl-addr-obj.c\n+++ b/elf/dl-addr-obj.c\n@@ -61,7 +61,6 @@\n \n */\n int\n-internal_function\n _dl_addr_inside_object (struct link_map *l, const ElfW(Addr) addr)\n {\n int n = l->l_phnum;\ndiff --git a/elf/dl-cache.c b/elf/dl-cache.c\nindex e9632da0b3..b04ddee93f 100644\n--- a/elf/dl-cache.c\n+++ b/elf/dl-cache.c\n@@ -134,7 +134,6 @@ while (0)\n \n \n int\n-internal_function\n _dl_cache_libcmp (const char *p1, const char *p2)\n {\n while (*p1 != '\\0')\n@@ -181,7 +180,6 @@ _dl_cache_libcmp (const char *p1, const char *p2)\n this function must take care that it does not return references to\n any data in the mapping. */\n char *\n-internal_function\n _dl_load_cache_lookup (const char *name)\n {\n int left, right, middle;\ndiff --git a/elf/dl-debug.c b/elf/dl-debug.c\nindex f3957044f6..73c69dfbae 100644\n--- a/elf/dl-debug.c\n+++ b/elf/dl-debug.c\n@@ -42,7 +42,6 @@ struct r_debug _r_debug;\n _r_debug.r_ldbase. Returns the address of _r_debug. */\n \n struct r_debug *\n-internal_function\n _dl_debug_initialize (ElfW(Addr) ldbase, Lmid_t ns)\n {\n struct r_debug *r;\ndiff --git a/elf/dl-deps.c b/elf/dl-deps.c\nindex 7c82d42be9..35cad364b7 100644\n--- a/elf/dl-deps.c\n+++ b/elf/dl-deps.c\n@@ -68,7 +68,6 @@ openaux (void *a)\n }\n \n static ptrdiff_t\n-internal_function\n _dl_build_local_scope (struct link_map **list, struct link_map *map)\n {\n struct link_map **p = list;\n@@ -153,7 +152,6 @@ preload (struct list *known, unsigned int *nlist, struct link_map *map)\n }\n \n void\n-internal_function\n _dl_map_object_deps (struct link_map *map,\n \t\t struct link_map **preloads, unsigned int npreloads,\n \t\t int trace_mode, int open_mode)\ndiff --git a/elf/dl-environ.c b/elf/dl-environ.c\nindex cbffec8808..8134324d9d 100644\n--- a/elf/dl-environ.c\n+++ b/elf/dl-environ.c\n@@ -24,7 +24,6 @@\n /* Walk through the environment of the process and return all entries\n starting with `LD_'. */\n char *\n-internal_function\n _dl_next_ld_env_entry (char ***position)\n {\n char **current = *position;\ndiff --git a/elf/dl-execstack.c b/elf/dl-execstack.c\nindex 875338bea5..a266c077f3 100644\n--- a/elf/dl-execstack.c\n+++ b/elf/dl-execstack.c\n@@ -23,7 +23,6 @@\n so as to mprotect it. */\n \n int\n-internal_function\n _dl_make_stack_executable (void **stack_endp)\n {\n return ENOSYS;\ndiff --git a/elf/dl-fini.c b/elf/dl-fini.c\nindex d6201b2c81..71c06fc68b 100644\n--- a/elf/dl-fini.c\n+++ b/elf/dl-fini.c\n@@ -26,7 +26,6 @@ typedef void (*fini_t) (void);\n \n \n void\n-internal_function\n _dl_sort_fini (struct link_map **maps, size_t nmaps, char *used, Lmid_t ns)\n {\n /* A list of one element need not be sorted. */\ndiff --git a/elf/dl-hwcaps.c b/elf/dl-hwcaps.c\nindex ac50fd2c38..92f2eb45ce 100644\n--- a/elf/dl-hwcaps.c\n+++ b/elf/dl-hwcaps.c\n@@ -34,7 +34,6 @@\n \n /* Return an array of useful/necessary hardware capability names. */\n const struct r_strlenpair *\n-internal_function\n _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,\n \t\t size_t *max_capstrlen)\n {\ndiff --git a/elf/dl-libc.c b/elf/dl-libc.c\nindex 9fdc8b1130..bd3c18d20f 100644\n--- a/elf/dl-libc.c\n+++ b/elf/dl-libc.c\n@@ -36,7 +36,6 @@ extern char **__environ;\n Much of this code came from gconv_dl.c with slight modifications. */\n \n static int\n-internal_function\n dlerror_run (void (*operate) (void *), void *args)\n {\n const char *objname;\ndiff --git a/elf/dl-load.c b/elf/dl-load.c\nindex c1b6d4ba0f..a067760cc6 100644\n--- a/elf/dl-load.c\n+++ b/elf/dl-load.c\n@@ -392,7 +392,6 @@ expand_dynamic_string_token (struct link_map *l, const char *s, int is_path)\n be freed if the shared object already has this name.\n Returns false if the object already had this name. */\n static void\n-internal_function\n add_name_to_object (struct link_map *l, const char *name)\n {\n struct libname_list *lnp, *lastp;\n@@ -536,7 +535,6 @@ fillin_rpath (char *rpath, struct r_search_path_elem **result, const char *sep,\n \n \n static bool\n-internal_function\n decompose_rpath (struct r_search_path_struct *sps,\n \t\t const char *rpath, struct link_map *l, const char *what)\n {\n@@ -656,7 +654,6 @@ cache_rpath (struct link_map *l,\n \n \n void\n-internal_function\n _dl_init_paths (const char *llp)\n {\n size_t idx;\n@@ -1887,7 +1884,6 @@ open_path (const char *name, size_t namelen, int mode,\n /* Map in the shared object file NAME. */\n \n struct link_map *\n-internal_function\n _dl_map_object (struct link_map *loader, const char *name,\n \t\tint type, int trace_mode, int mode, Lmid_t nsid)\n {\n@@ -2241,7 +2237,6 @@ add_path (struct add_path_state *p, const struct r_search_path_struct *sps,\n }\n \n void\n-internal_function\n _dl_rtld_di_serinfo (struct link_map *loader, Dl_serinfo *si, bool counting)\n {\n if (counting)\ndiff --git a/elf/dl-lookup.c b/elf/dl-lookup.c\nindex 645dc3ebb4..d77e803976 100644\n--- a/elf/dl-lookup.c\n+++ b/elf/dl-lookup.c\n@@ -560,7 +560,6 @@ dl_new_hash (const char *s)\n \n /* Add extra dependency on MAP to UNDEF_MAP. */\n static int\n-internal_function\n add_dependency (struct link_map *undef_map, struct link_map *map, int flags)\n {\n struct link_map *runp;\n@@ -770,7 +769,6 @@ add_dependency (struct link_map *undef_map, struct link_map *map, int flags)\n }\n \n static void\n-internal_function\n _dl_debug_bindings (const char *undef_name, struct link_map *undef_map,\n \t\t const ElfW(Sym) **ref, struct sym_val *value,\n \t\t const struct r_found_version *version, int type_class,\n@@ -784,7 +782,6 @@ _dl_debug_bindings (const char *undef_name, struct link_map *undef_map,\n or in any function which gets called. If this would happen the audit\n code might create a thread which can throw off all the scope locking. */\n lookup_t\n-internal_function\n _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map,\n \t\t const ElfW(Sym) **ref,\n \t\t struct r_scope_elem *symbol_scope[],\n@@ -935,7 +932,6 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map,\n /* Cache the location of MAP's hash table. */\n \n void\n-internal_function\n _dl_setup_hash (struct link_map *map)\n {\n Elf_Symndx *hash;\n@@ -979,7 +975,6 @@ _dl_setup_hash (struct link_map *map)\n \n \n static void\n-internal_function\n _dl_debug_bindings (const char *undef_name, struct link_map *undef_map,\n \t\t const ElfW(Sym) **ref, struct sym_val *value,\n \t\t const struct r_found_version *version, int type_class,\ndiff --git a/elf/dl-misc.c b/elf/dl-misc.c\nindex c469b5a365..c1955dda30 100644\n--- a/elf/dl-misc.c\n+++ b/elf/dl-misc.c\n@@ -40,7 +40,6 @@\n is returned. */\n \n void *\n-internal_function\n _dl_sysdep_read_whole_file (const char *file, size_t *sizep, int prot)\n {\n void *result = MAP_FAILED;\n@@ -279,7 +278,6 @@ _dl_dprintf (int fd, const char *fmt, ...)\n \n /* Test whether given NAME matches any of the names of the given object. */\n int\n-internal_function\n _dl_name_match_p (const char *name, const struct link_map *map)\n {\n if (strcmp (name, map->l_name) == 0)\n@@ -298,7 +296,6 @@ _dl_name_match_p (const char *name, const struct link_map *map)\n \n \n unsigned long int\n-internal_function\n _dl_higher_prime_number (unsigned long int n)\n {\n /* These are primes that are near, but slightly smaller than, a\n@@ -366,7 +363,6 @@ _dl_higher_prime_number (unsigned long int n)\n called before errno may have been set up. */\n \n uint64_t\n-internal_function\n _dl_strtoul (const char *nptr, char **endptr)\n {\n uint64_t result = 0;\ndiff --git a/elf/dl-object.c b/elf/dl-object.c\nindex 4c43235148..da138829da 100644\n--- a/elf/dl-object.c\n+++ b/elf/dl-object.c\n@@ -27,7 +27,6 @@\n \n /* Add the new link_map NEW to the end of the namespace list. */\n void\n-internal_function\n _dl_add_to_namespace_list (struct link_map *new, Lmid_t nsid)\n {\n /* We modify the list of loaded objects. */\n@@ -55,7 +54,6 @@ _dl_add_to_namespace_list (struct link_map *new, Lmid_t nsid)\n /* Allocate a `struct link_map' for a new object being loaded,\n and enter it into the _dl_loaded list. */\n struct link_map *\n-internal_function\n _dl_new_object (char *realname, const char *libname, int type,\n \t\tstruct link_map *loader, int mode, Lmid_t nsid)\n {\ndiff --git a/elf/dl-profile.c b/elf/dl-profile.c\nindex a4f11089a1..c295dd6d00 100644\n--- a/elf/dl-profile.c\n+++ b/elf/dl-profile.c\n@@ -180,7 +180,6 @@ static unsigned int log_hashfraction;\n /* Set up profiling data to profile object desribed by MAP. The output\n file is found (or created) in OUTPUT_DIR. */\n void\n-internal_function\n _dl_start_profile (void)\n {\n char *filename;\ndiff --git a/elf/dl-reloc.c b/elf/dl-reloc.c\nindex b3c3a9bbf9..eef9e3ad0c 100644\n--- a/elf/dl-reloc.c\n+++ b/elf/dl-reloc.c\n@@ -45,7 +45,6 @@\n directly, as static TLS should be rare and code handling it should\n not be inlined as much as possible. */\n int\n-internal_function\n _dl_try_allocate_static_tls (struct link_map *map)\n {\n /* If we've already used the variable with dynamic access, or if the\n@@ -112,7 +111,7 @@ _dl_try_allocate_static_tls (struct link_map *map)\n }\n \n void\n-internal_function __attribute_noinline__\n+__attribute_noinline__\n _dl_allocate_static_tls (struct link_map *map)\n {\n if (map->l_tls_offset == FORCED_DYNAMIC_TLS_OFFSET\n@@ -308,7 +307,7 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],\n }\n \n \n-void internal_function\n+void\n _dl_protect_relro (struct link_map *l)\n {\n ElfW(Addr) start = ALIGN_DOWN((l->l_addr\n@@ -328,7 +327,7 @@ cannot apply additional memory protection after relocation\");\n }\n \n void\n-internal_function __attribute_noinline__\n+__attribute_noinline__\n _dl_reloc_bad_type (struct link_map *map, unsigned int type, int plt)\n {\n #define DIGIT(b)\t_itoa_lower_digits[(b) & 0xf];\ndiff --git a/elf/dl-support.c b/elf/dl-support.c\nindex 48340f7959..5e3de90598 100644\n--- a/elf/dl-support.c\n+++ b/elf/dl-support.c\n@@ -221,7 +221,6 @@ __rtld_lock_define_initialized_recursive (, _dl_load_write_lock)\n int _dl_clktck;\n \n void\n-internal_function\n _dl_aux_init (ElfW(auxv_t) *av)\n {\n int seen = 0;\n@@ -305,7 +304,6 @@ _dl_aux_init (ElfW(auxv_t) *av)\n \n \n void\n-internal_function\n _dl_non_dynamic_init (void)\n {\n _dl_main_map.l_origin = _dl_get_origin ();\ndiff --git a/elf/dl-sym.c b/elf/dl-sym.c\nindex 97cfcca712..3e23555b78 100644\n--- a/elf/dl-sym.c\n+++ b/elf/dl-sym.c\n@@ -41,7 +41,6 @@\n /* Return the symbol address given the map of the module it is in and\n the symbol record. This is used in dl-sym.c. */\n static void *\n-internal_function\n _dl_tls_symaddr (struct link_map *map, const ElfW(Sym) *ref)\n {\n # ifndef DONT_USE_TLS_INDEX\n@@ -83,7 +82,6 @@ call_dl_lookup (void *ptr)\n \n \n static void *\n-internal_function\n do_sym (void *handle, const char *name, void *who,\n \tstruct r_found_version *vers, int flags)\n {\ndiff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c\nindex c4ff8b2937..6d92df5e56 100644\n--- a/elf/dl-sysdep.c\n+++ b/elf/dl-sysdep.c\n@@ -255,13 +255,11 @@ _dl_sysdep_start (void **start_argptr,\n }\n \n void\n-internal_function\n _dl_sysdep_start_cleanup (void)\n {\n }\n \n void\n-internal_function\n _dl_show_auxv (void)\n {\n char buf[64];\ndiff --git a/elf/dl-tls.c b/elf/dl-tls.c\nindex ddf9fb26cc..d791a5c06b 100644\n--- a/elf/dl-tls.c\n+++ b/elf/dl-tls.c\n@@ -44,7 +44,6 @@ oom (void)\n \n \n size_t\n-internal_function\n _dl_next_tls_modid (void)\n {\n size_t result;\n@@ -105,7 +104,6 @@ _dl_next_tls_modid (void)\n \n \n size_t\n-internal_function\n _dl_count_modids (void)\n {\n /* It is rare that we have gaps; see elf/dl-open.c (_dl_open) where\n@@ -133,7 +131,6 @@ _dl_count_modids (void)\n \n #ifdef SHARED\n void\n-internal_function\n _dl_determine_tlsoffset (void)\n {\n size_t max_align = TLS_TCB_ALIGN;\n@@ -277,7 +274,6 @@ _dl_determine_tlsoffset (void)\n #endif /* SHARED */\n \n static void *\n-internal_function\n allocate_dtv (void *result)\n {\n dtv_t *dtv;\n@@ -308,7 +304,6 @@ allocate_dtv (void *result)\n \n /* Get size and alignment requirements of the static TLS block. */\n void\n-internal_function\n _dl_get_tls_static_info (size_t *sizep, size_t *alignp)\n {\n *sizep = GL(dl_tls_static_size);\n@@ -333,7 +328,6 @@ tcb_to_pointer_to_free_location (void *tcb)\n }\n \n void *\n-internal_function\n _dl_allocate_tls_storage (void)\n {\n void *result;\ndiff --git a/elf/dl-version.c b/elf/dl-version.c\nindex c0d76ad42a..6401bc478d 100644\n--- a/elf/dl-version.c\n+++ b/elf/dl-version.c\n@@ -51,7 +51,6 @@ find_needed (const char *name, struct link_map *map)\n \n \n static int\n-internal_function\n match_symbol (const char *name, Lmid_t ns, ElfW(Word) hash, const char *string,\n \t struct link_map *map, int verbose, int weak)\n {\n@@ -153,7 +152,6 @@ checking for version `%s' in file %s [%lu] required by file %s [%lu]\\n\",\n \n \n int\n-internal_function\n _dl_check_map_versions (struct link_map *map, int verbose, int trace_mode)\n {\n int result = 0;\n@@ -360,7 +358,6 @@ _dl_check_map_versions (struct link_map *map, int verbose, int trace_mode)\n \n \n int\n-internal_function\n _dl_check_all_versions (struct link_map *map, int verbose, int trace_mode)\n {\n struct link_map *l;\ndiff --git a/elf/dynamic-link.h b/elf/dynamic-link.h\nindex 60f2d91151..ebea7567cd 100644\n--- a/elf/dynamic-link.h\n+++ b/elf/dynamic-link.h\n@@ -42,8 +42,7 @@\n && (__builtin_expect ((sym_map)->l_tls_offset != NO_TLS_OFFSET, 1)\t\\\n \t || _dl_try_allocate_static_tls (sym_map) == 0))\n \n-int internal_function attribute_hidden\n- _dl_try_allocate_static_tls (struct link_map *map);\n+int _dl_try_allocate_static_tls (struct link_map *map) attribute_hidden;\n \n #include <elf.h>\n \ndiff --git a/elf/tlsdeschtab.h b/elf/tlsdeschtab.h\nindex 3091d8b420..ad3001dac5 100644\n--- a/elf/tlsdeschtab.h\n+++ b/elf/tlsdeschtab.h\n@@ -79,7 +79,6 @@ map_generation (struct link_map *map)\n }\n \n void *\n-internal_function\n _dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset)\n {\n struct hashtab *ht;\ndiff --git a/elf/tst-_dl_addr_inside_object.c b/elf/tst-_dl_addr_inside_object.c\nindex 1604b8df63..0a407ec19c 100644\n--- a/elf/tst-_dl_addr_inside_object.c\n+++ b/elf/tst-_dl_addr_inside_object.c\n@@ -22,8 +22,7 @@\n #include <elf.h>\n #include <libc-symbols.h>\n \n-extern int internal_function _dl_addr_inside_object (struct link_map *l,\n-\t\t\t\t\t\t const ElfW(Addr) addr);\n+extern int _dl_addr_inside_object (struct link_map *l, const ElfW(Addr) addr);\n \n static int\n do_test (void)\ndiff --git a/sysdeps/aarch64/dl-tlsdesc.h b/sysdeps/aarch64/dl-tlsdesc.h\nindex 127d1258d3..66ec0dea7f 100644\n--- a/sysdeps/aarch64/dl-tlsdesc.h\n+++ b/sysdeps/aarch64/dl-tlsdesc.h\n@@ -58,8 +58,7 @@ extern ptrdiff_t attribute_hidden\n _dl_tlsdesc_resolve_hold (struct tlsdesc *);\n \n # ifdef SHARED\n-extern void *internal_function _dl_make_tlsdesc_dynamic (struct link_map *,\n-\t\t\t\t\t\t\t size_t);\n+extern void *_dl_make_tlsdesc_dynamic (struct link_map *, size_t);\n \n extern ptrdiff_t attribute_hidden\n _dl_tlsdesc_dynamic (struct tlsdesc *);\ndiff --git a/sysdeps/aarch64/tlsdesc.c b/sysdeps/aarch64/tlsdesc.c\nindex 0b57031126..4c8a5a81d1 100644\n--- a/sysdeps/aarch64/tlsdesc.c\n+++ b/sysdeps/aarch64/tlsdesc.c\n@@ -154,7 +154,6 @@ _dl_tlsdesc_resolve_hold_fixup (struct tlsdesc *td, void *caller)\n if there is one. */\n \n void\n-internal_function\n _dl_unmap (struct link_map *map)\n {\n _dl_unmap_segments (map);\ndiff --git a/sysdeps/arm/dl-lookupcfg.h b/sysdeps/arm/dl-lookupcfg.h\nindex 23b4e7e9af..6d3bca57c2 100644\n--- a/sysdeps/arm/dl-lookupcfg.h\n+++ b/sysdeps/arm/dl-lookupcfg.h\n@@ -22,6 +22,6 @@\n \n struct link_map;\n \n-extern void internal_function _dl_unmap (struct link_map *map);\n+extern void _dl_unmap (struct link_map *map);\n \n #define DL_UNMAP(map) _dl_unmap (map)\ndiff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h\nindex 0a126ce117..7d733f2b1c 100644\n--- a/sysdeps/arm/dl-machine.h\n+++ b/sysdeps/arm/dl-machine.h\n@@ -53,7 +53,7 @@ elf_machine_dynamic (void)\n static inline Elf32_Addr __attribute__ ((unused))\n elf_machine_load_address (void)\n {\n- extern Elf32_Addr internal_function __dl_start (void *) asm (\"_dl_start\");\n+ extern Elf32_Addr __dl_start (void *) asm (\"_dl_start\");\n Elf32_Addr got_addr = (Elf32_Addr) &__dl_start;\n Elf32_Addr pcrel_addr;\n asm (\"adr %0, _dl_start\" : \"=r\" (pcrel_addr));\ndiff --git a/sysdeps/arm/tlsdesc.c b/sysdeps/arm/tlsdesc.c\nindex 7ec5fef688..ad79506178 100644\n--- a/sysdeps/arm/tlsdesc.c\n+++ b/sysdeps/arm/tlsdesc.c\n@@ -144,7 +144,6 @@ _dl_tlsdesc_resolve_hold_fixup (struct tlsdesc volatile *td,\n if there is one. */\n \n void\n-internal_function\n _dl_unmap (struct link_map *map)\n {\n _dl_unmap_segments (map);\ndiff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h\nindex 1f0b8f629d..e552ac2589 100644\n--- a/sysdeps/generic/dl-cache.h\n+++ b/sysdeps/generic/dl-cache.h\n@@ -100,5 +100,4 @@ struct cache_file_new\n (((addr) + __alignof__ (struct cache_file_new) -1)\t\\\n & (~(__alignof__ (struct cache_file_new) - 1)))\n \n-extern int _dl_cache_libcmp (const char *p1, const char *p2)\n- internal_function attribute_hidden;\n+extern int _dl_cache_libcmp (const char *p1, const char *p2) attribute_hidden;\ndiff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h\nindex 49e673dd24..1a4449eeb3 100644\n--- a/sysdeps/generic/ldsodefs.h\n+++ b/sysdeps/generic/ldsodefs.h\n@@ -248,15 +248,14 @@ struct audit_ifaces\n \n /* Test whether given NAME matches any of the names of the given object. */\n extern int _dl_name_match_p (const char *__name, const struct link_map *__map)\n- internal_function attribute_hidden;\n+ attribute_hidden;\n \n /* Compute next higher prime number. */\n extern unsigned long int _dl_higher_prime_number (unsigned long int n)\n- internal_function attribute_hidden;\n+ attribute_hidden;\n \n /* A stripped down strtoul-like implementation. */\n-uint64_t internal_function _dl_strtoul (const char *, char **)\n- internal_function attribute_hidden;\n+uint64_t _dl_strtoul (const char *, char **) attribute_hidden;\n \n /* Function used as argument for `_dl_receive_error' function. The\n arguments are the error code, error string, and the objname the\n@@ -586,13 +585,10 @@ struct rtld_global_ro\n void (*_dl_debug_printf) (const char *, ...)\n __attribute__ ((__format__ (__printf__, 1, 2)));\n void (*_dl_mcount) (ElfW(Addr) frompc, ElfW(Addr) selfpc);\n- lookup_t (internal_function *_dl_lookup_symbol_x) (const char *,\n-\t\t\t\t\t\t struct link_map *,\n-\t\t\t\t\t\t const ElfW(Sym) **,\n-\t\t\t\t\t\t struct r_scope_elem *[],\n-\t\t\t\t\t\t const struct r_found_version *,\n-\t\t\t\t\t\t int, int,\n-\t\t\t\t\t\t struct link_map *);\n+ lookup_t (*_dl_lookup_symbol_x) (const char *, struct link_map *,\n+\t\t\t\t const ElfW(Sym) **, struct r_scope_elem *[],\n+\t\t\t\t const struct r_found_version *, int, int,\n+\t\t\t\t struct link_map *);\n int (*_dl_check_caller) (const void *, enum allowmask);\n void *(*_dl_open) (const char *file, int mode, const void *caller_dlopen,\n \t\t Lmid_t nsid, int argc, char *argv[], char *env[]);\n@@ -851,8 +847,7 @@ libc_hidden_proto (_dl_catch_exception)\n extern struct link_map *_dl_map_object (struct link_map *loader,\n \t\t\t\t\tconst char *name,\n \t\t\t\t\tint type, int trace_mode, int mode,\n-\t\t\t\t\tLmid_t nsid)\n- internal_function attribute_hidden;\n+\t\t\t\t\tLmid_t nsid) attribute_hidden;\n \n /* Call _dl_map_object on the dependencies of MAP, and set up\n MAP->l_searchlist. PRELOADS points to a vector of NPRELOADS previously\n@@ -862,11 +857,10 @@ extern void _dl_map_object_deps (struct link_map *map,\n \t\t\t\t struct link_map **preloads,\n \t\t\t\t unsigned int npreloads, int trace_mode,\n \t\t\t\t int open_mode)\n- internal_function attribute_hidden;\n+ attribute_hidden;\n \n /* Cache the locations of MAP's hash table. */\n-extern void _dl_setup_hash (struct link_map *map)\n- internal_function attribute_hidden;\n+extern void _dl_setup_hash (struct link_map *map) attribute_hidden;\n \n \n /* Collect the directories in the search path for LOADER's dependencies.\n@@ -875,8 +869,7 @@ extern void _dl_setup_hash (struct link_map *map)\n by a previous call with COUNTING set, and SI must point to SI->dls_size\n bytes to be used in filling in the result. */\n extern void _dl_rtld_di_serinfo (struct link_map *loader,\n-\t\t\t\t Dl_serinfo *si, bool counting)\n- internal_function;\n+\t\t\t\t Dl_serinfo *si, bool counting);\n \n \n /* Search loaded objects' symbol tables for a definition of the symbol\n@@ -907,22 +900,18 @@ extern lookup_t _dl_lookup_symbol_x (const char *undef,\n \t\t\t\t const struct r_found_version *version,\n \t\t\t\t int type_class, int flags,\n \t\t\t\t struct link_map *skip_map)\n- internal_function attribute_hidden;\n+ attribute_hidden;\n \n \n-/* Look up symbol NAME in MAP's scope and return its run-time address. */\n-extern ElfW(Addr) _dl_symbol_value (struct link_map *map, const char *name)\n- internal_function;\n-\n /* Add the new link_map NEW to the end of the namespace list. */\n extern void _dl_add_to_namespace_list (struct link_map *new, Lmid_t nsid)\n- internal_function attribute_hidden;\n+ attribute_hidden;\n \n /* Allocate a `struct link_map' for a new object being loaded. */\n extern struct link_map *_dl_new_object (char *realname, const char *libname,\n \t\t\t\t\tint type, struct link_map *loader,\n \t\t\t\t\tint mode, Lmid_t nsid)\n- internal_function attribute_hidden;\n+ attribute_hidden;\n \n /* Relocate the given object (if it hasn't already been).\n SCOPE is passed to _dl_lookup_symbol in symbol lookups.\n@@ -933,15 +922,14 @@ extern void _dl_relocate_object (struct link_map *map,\n attribute_hidden;\n \n /* Protect PT_GNU_RELRO area. */\n-extern void _dl_protect_relro (struct link_map *map)\n- internal_function attribute_hidden;\n+extern void _dl_protect_relro (struct link_map *map) attribute_hidden;\n \n /* Call _dl_signal_error with a message about an unhandled reloc type.\n TYPE is the result of ELFW(R_TYPE) (r_info), i.e. an R_<CPU>_* value.\n PLT is nonzero if this was a PLT reloc; it just affects the message. */\n extern void _dl_reloc_bad_type (struct link_map *map,\n \t\t\t\tunsigned int type, int plt)\n- internal_function attribute_hidden __attribute__ ((__noreturn__));\n+ attribute_hidden __attribute__ ((__noreturn__));\n \n /* Resolve conflicts if prelinking. */\n extern void _dl_resolve_conflicts (struct link_map *l,\n@@ -952,14 +940,12 @@ extern void _dl_resolve_conflicts (struct link_map *l,\n /* Check the version dependencies of all objects available through\n MAP. If VERBOSE print some more diagnostics. */\n extern int _dl_check_all_versions (struct link_map *map, int verbose,\n-\t\t\t\t int trace_mode)\n- internal_function attribute_hidden;\n+\t\t\t\t int trace_mode) attribute_hidden;\n \n /* Check the version dependencies for MAP. If VERBOSE print some more\n diagnostics. */\n extern int _dl_check_map_versions (struct link_map *map, int verbose,\n-\t\t\t\t int trace_mode)\n- internal_function attribute_hidden;\n+\t\t\t\t int trace_mode) attribute_hidden;\n \n /* Initialize the object in SCOPE by calling the constructors with\n ARGC, ARGV, and ENV as the parameters. */\n@@ -972,8 +958,7 @@ extern void _dl_fini (void);\n \n /* Sort array MAPS according to dependencies of the contained objects. */\n extern void _dl_sort_fini (struct link_map **maps, size_t nmaps, char *used,\n-\t\t\t Lmid_t ns)\n- internal_function attribute_hidden;\n+\t\t\t Lmid_t ns) attribute_hidden;\n \n /* The dynamic linker calls this function before and having changing\n any shared object mappings. The `r_state' member of `struct r_debug'\n@@ -986,15 +971,14 @@ rtld_hidden_proto (_dl_debug_state)\n argument is the run-time load address of the dynamic linker, to be put\n in the `r_ldbase' member. Returns the address of the structure. */\n extern struct r_debug *_dl_debug_initialize (ElfW(Addr) ldbase, Lmid_t ns)\n- internal_function attribute_hidden;\n+ attribute_hidden;\n \n /* Initialize the basic data structure for the search paths. */\n-extern void _dl_init_paths (const char *library_path)\n- internal_function attribute_hidden;\n+extern void _dl_init_paths (const char *library_path) attribute_hidden;\n \n /* Gather the information needed to install the profiling tables and start\n the timers. */\n-extern void _dl_start_profile (void) internal_function attribute_hidden;\n+extern void _dl_start_profile (void) attribute_hidden;\n \n /* The actual functions used to keep book on the calls. */\n extern void _dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc);\n@@ -1006,25 +990,22 @@ rtld_hidden_proto (_dl_mcount)\n extern void _dl_mcount_wrapper (void *selfpc);\n \n /* Show the members of the auxiliary array passed up from the kernel. */\n-extern void _dl_show_auxv (void)\n- internal_function attribute_hidden;\n+extern void _dl_show_auxv (void) attribute_hidden;\n \n /* Return all environment variables starting with `LD_', one after the\n other. */\n-extern char *_dl_next_ld_env_entry (char ***position)\n- internal_function attribute_hidden;\n+extern char *_dl_next_ld_env_entry (char ***position) attribute_hidden;\n \n /* Return an array with the names of the important hardware capabilities. */\n extern const struct r_strlenpair *_dl_important_hwcaps (const char *platform,\n \t\t\t\t\t\t\tsize_t paltform_len,\n \t\t\t\t\t\t\tsize_t *sz,\n \t\t\t\t\t\t\tsize_t *max_capstrlen)\n- internal_function attribute_hidden;\n+ attribute_hidden;\n \n /* Look up NAME in ld.so.cache and return the file name stored there,\n or null if none is found. Caller must free returned string. */\n-extern char *_dl_load_cache_lookup (const char *name)\n- internal_function attribute_hidden;\n+extern char *_dl_load_cache_lookup (const char *name) attribute_hidden;\n \n /* If the system does not support MAP_COPY we cannot leave the file open\n all the time since this would create problems when the file is replaced.\n@@ -1036,8 +1017,7 @@ extern void _dl_unload_cache (void) attribute_hidden;\n most convenient manner available. *SIZEP gets the size of the\n file. On error MAP_FAILED is returned. */\n extern void *_dl_sysdep_read_whole_file (const char *file, size_t *sizep,\n-\t\t\t\t\t int prot)\n- internal_function attribute_hidden;\n+\t\t\t\t\t int prot) attribute_hidden;\n \n /* System-specific function to do initial startup for the dynamic linker.\n After this, file access calls and getenv must work. This is responsible\n@@ -1050,18 +1030,17 @@ extern ElfW(Addr) _dl_sysdep_start (void **start_argptr,\n \t\t\t\t\t\t ElfW(auxv_t) *auxv))\n attribute_hidden;\n \n-extern void _dl_sysdep_start_cleanup (void)\n- internal_function attribute_hidden;\n+extern void _dl_sysdep_start_cleanup (void) attribute_hidden;\n \n \n /* Determine next available module ID. */\n-extern size_t _dl_next_tls_modid (void) internal_function attribute_hidden;\n+extern size_t _dl_next_tls_modid (void) attribute_hidden;\n \n /* Count the modules with TLS segments. */\n-extern size_t _dl_count_modids (void) internal_function attribute_hidden;\n+extern size_t _dl_count_modids (void) attribute_hidden;\n \n /* Calculate offset of the TLS blocks in the static TLS block. */\n-extern void _dl_determine_tlsoffset (void) internal_function attribute_hidden;\n+extern void _dl_determine_tlsoffset (void) attribute_hidden;\n \n #ifndef SHARED\n /* Set up the TCB for statically linked applications. This is called\n@@ -1079,16 +1058,13 @@ extern void *_dl_allocate_tls (void *mem);\n rtld_hidden_proto (_dl_allocate_tls)\n \n /* Get size and alignment requirements of the static TLS block. */\n-extern void _dl_get_tls_static_info (size_t *sizep, size_t *alignp)\n- internal_function;\n+extern void _dl_get_tls_static_info (size_t *sizep, size_t *alignp);\n \n-extern void _dl_allocate_static_tls (struct link_map *map)\n- internal_function attribute_hidden;\n+extern void _dl_allocate_static_tls (struct link_map *map) attribute_hidden;\n \n /* These are internal entry points to the two halves of _dl_allocate_tls,\n only used within rtld.c itself at startup time. */\n-extern void *_dl_allocate_tls_storage (void)\n- internal_function attribute_hidden;\n+extern void *_dl_allocate_tls_storage (void) attribute_hidden;\n extern void *_dl_allocate_tls_init (void *);\n rtld_hidden_proto (_dl_allocate_tls_init)\n \n@@ -1137,7 +1113,7 @@ extern struct link_map *_dl_update_slotinfo (unsigned long int req_modid)\n extern void *_dl_tls_get_addr_soft (struct link_map *l) attribute_hidden;\n \n extern int _dl_addr_inside_object (struct link_map *l, const ElfW(Addr) addr)\n- internal_function attribute_hidden;\n+ attribute_hidden;\n \n /* Show show of an object. */\n extern void _dl_show_scope (struct link_map *new, int from)\n@@ -1147,10 +1123,10 @@ extern struct link_map *_dl_find_dso_for_object (const ElfW(Addr) addr);\n rtld_hidden_proto (_dl_find_dso_for_object)\n \n /* Initialization which is normally done by the dynamic linker. */\n-extern void _dl_non_dynamic_init (void) internal_function;\n+extern void _dl_non_dynamic_init (void);\n \n /* Used by static binaries to check the auxiliary vector. */\n-extern void _dl_aux_init (ElfW(auxv_t) *av) internal_function;\n+extern void _dl_aux_init (ElfW(auxv_t) *av);\n \n \n __END_DECLS\ndiff --git a/sysdeps/i386/dl-lookupcfg.h b/sysdeps/i386/dl-lookupcfg.h\nindex 47b534a059..80e829d004 100644\n--- a/sysdeps/i386/dl-lookupcfg.h\n+++ b/sysdeps/i386/dl-lookupcfg.h\n@@ -26,7 +26,6 @@\n \n struct link_map;\n \n-extern void _dl_unmap (struct link_map *map)\n- internal_function attribute_hidden;\n+extern void _dl_unmap (struct link_map *map) attribute_hidden;\n \n #define DL_UNMAP(map) _dl_unmap (map)\ndiff --git a/sysdeps/i386/dl-tlsdesc.h b/sysdeps/i386/dl-tlsdesc.h\nindex 242bebfc8e..967b8bc2cb 100644\n--- a/sysdeps/i386/dl-tlsdesc.h\n+++ b/sysdeps/i386/dl-tlsdesc.h\n@@ -51,8 +51,7 @@ extern ptrdiff_t attribute_hidden __attribute__ ((regparm (1)))\n \n # ifdef SHARED\n extern void *_dl_make_tlsdesc_dynamic (struct link_map *map,\n-\t\t\t\t size_t ti_offset)\n- internal_function attribute_hidden;\n+\t\t\t\t size_t ti_offset) attribute_hidden;\n \n extern ptrdiff_t attribute_hidden __attribute__ ((regparm (1)))\n _dl_tlsdesc_dynamic (struct tlsdesc *);\ndiff --git a/sysdeps/i386/tlsdesc.c b/sysdeps/i386/tlsdesc.c\nindex 90de2bb05e..7902908c9a 100644\n--- a/sysdeps/i386/tlsdesc.c\n+++ b/sysdeps/i386/tlsdesc.c\n@@ -256,7 +256,6 @@ _dl_tlsdesc_resolve_hold_fixup (struct tlsdesc volatile *td,\n if there is one. */\n \n void\n-internal_function\n _dl_unmap (struct link_map *map)\n {\n _dl_unmap_segments (map);\ndiff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c\nindex 3794aed521..6d5c1abf83 100644\n--- a/sysdeps/mach/hurd/dl-sysdep.c\n+++ b/sysdeps/mach/hurd/dl-sysdep.c\n@@ -277,7 +277,6 @@ fmh();\t\t\t\t/* XXX */\n }\n \n void\n-internal_function\n _dl_sysdep_start_cleanup (void)\n {\n /* Deallocate the reply port and task port rights acquired by\n@@ -645,7 +644,6 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg,\n \n \n void\n-internal_function\n _dl_show_auxv (void)\n {\n /* There is nothing to print. Hurd has no auxiliary vector. */\ndiff --git a/sysdeps/nios2/dl-init.c b/sysdeps/nios2/dl-init.c\nindex 5d3d0edc68..9fc8e1a2ca 100644\n--- a/sysdeps/nios2/dl-init.c\n+++ b/sysdeps/nios2/dl-init.c\n@@ -19,7 +19,6 @@\n #include <elf/dl-init.c>\n \n unsigned int\n-internal_function\n _dl_nios2_get_gp_value (struct link_map *main_map)\n {\n ElfW(Dyn) *dyn = main_map->l_ld;\ndiff --git a/sysdeps/tile/dl-lookupcfg.h b/sysdeps/tile/dl-lookupcfg.h\nindex 18a816ec89..c829823680 100644\n--- a/sysdeps/tile/dl-lookupcfg.h\n+++ b/sysdeps/tile/dl-lookupcfg.h\n@@ -22,6 +22,6 @@\n \n struct link_map;\n \n-void internal_function _dl_unmap (struct link_map *map);\n+void _dl_unmap (struct link_map *map);\n \n #define DL_UNMAP(map) _dl_unmap (map)\ndiff --git a/sysdeps/tile/dl-machine.h b/sysdeps/tile/dl-machine.h\nindex ae92673ac8..f7af7c3848 100644\n--- a/sysdeps/tile/dl-machine.h\n+++ b/sysdeps/tile/dl-machine.h\n@@ -255,7 +255,7 @@ elf_machine_plt_value (struct link_map *map, const ElfW(Rela) *reloc,\n }\n \n /* Support notifying the simulator about new objects. */\n-void internal_function _dl_after_load (struct link_map *l);\n+void _dl_after_load (struct link_map *l);\n #define DL_AFTER_LOAD _dl_after_load\n \n /* Names of the architecture-specific auditing callback functions. */\ndiff --git a/sysdeps/tile/dl-runtime.c b/sysdeps/tile/dl-runtime.c\nindex 3aced41643..c58e6192bd 100644\n--- a/sysdeps/tile/dl-runtime.c\n+++ b/sysdeps/tile/dl-runtime.c\n@@ -94,7 +94,7 @@ dl_realpath (const char *name, char *rpath)\n }\n \n /* Support notifying the simulator about new objects. */\n-void internal_function\n+void\n _dl_after_load (struct link_map *l)\n {\n int shift;\n@@ -151,7 +151,7 @@ sim_dlclose (ElfW(Addr) map_start)\n #undef DLPUTC\n }\n \n-void internal_function\n+void\n _dl_unmap (struct link_map *map)\n {\n sim_dlclose (map->l_map_start);\ndiff --git a/sysdeps/unix/sysv/linux/dl-vdso.c b/sysdeps/unix/sysv/linux/dl-vdso.c\nindex 7e3546e5bc..abdc22b6b4 100644\n--- a/sysdeps/unix/sysv/linux/dl-vdso.c\n+++ b/sysdeps/unix/sysv/linux/dl-vdso.c\n@@ -21,7 +21,6 @@\n \n \n void *\n-internal_function\n _dl_vdso_vsym (const char *name, const struct r_found_version *vers)\n {\n struct link_map *map = GLRO (dl_sysinfo_map);\ndiff --git a/sysdeps/unix/sysv/linux/dl-vdso.h b/sysdeps/unix/sysv/linux/dl-vdso.h\nindex 8923883f88..7d51a33f80 100644\n--- a/sysdeps/unix/sysv/linux/dl-vdso.h\n+++ b/sysdeps/unix/sysv/linux/dl-vdso.h\n@@ -48,6 +48,6 @@\n /* Functions for resolving symbols in the VDSO link map. */\n extern void *_dl_vdso_vsym (const char *name,\n \t\t\t const struct r_found_version *version)\n- internal_function attribute_hidden;\n+ attribute_hidden;\n \n #endif /* dl-vdso.h */\ndiff --git a/sysdeps/x86_64/dl-lookupcfg.h b/sysdeps/x86_64/dl-lookupcfg.h\nindex 47b534a059..80e829d004 100644\n--- a/sysdeps/x86_64/dl-lookupcfg.h\n+++ b/sysdeps/x86_64/dl-lookupcfg.h\n@@ -26,7 +26,6 @@\n \n struct link_map;\n \n-extern void _dl_unmap (struct link_map *map)\n- internal_function attribute_hidden;\n+extern void _dl_unmap (struct link_map *map) attribute_hidden;\n \n #define DL_UNMAP(map) _dl_unmap (map)\ndiff --git a/sysdeps/x86_64/dl-tlsdesc.h b/sysdeps/x86_64/dl-tlsdesc.h\nindex 14019a2610..a2279e73fe 100644\n--- a/sysdeps/x86_64/dl-tlsdesc.h\n+++ b/sysdeps/x86_64/dl-tlsdesc.h\n@@ -62,7 +62,7 @@ extern ptrdiff_t attribute_hidden\n # ifdef SHARED\n extern void *_dl_make_tlsdesc_dynamic (struct link_map *map,\n \t\t\t\t size_t ti_offset)\n- internal_function attribute_hidden;\n+ attribute_hidden;\n \n extern ptrdiff_t attribute_hidden _dl_tlsdesc_dynamic(struct tlsdesc *);\n # endif\ndiff --git a/sysdeps/x86_64/tlsdesc.c b/sysdeps/x86_64/tlsdesc.c\nindex 20d821ac66..9752742062 100644\n--- a/sysdeps/x86_64/tlsdesc.c\n+++ b/sysdeps/x86_64/tlsdesc.c\n@@ -134,7 +134,6 @@ _dl_tlsdesc_resolve_hold_fixup (struct tlsdesc volatile *td,\n if there is one. */\n \n void\n-internal_function\n _dl_unmap (struct link_map *map)\n {\n _dl_unmap_segments (map);\n", "prefixes": [ "COMMITTED" ] }