Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 808312,
    "url": "http://patchwork.ozlabs.org/api/1.2/patches/808312/?format=api",
    "web_url": "http://patchwork.ozlabs.org/project/glibc/patch/20170831165642.338BE43994318@oldenburg.str.redhat.com/",
    "project": {
        "id": 41,
        "url": "http://patchwork.ozlabs.org/api/1.2/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": "<20170831165642.338BE43994318@oldenburg.str.redhat.com>",
    "list_archive_url": null,
    "date": "2017-08-31T16:56:42",
    "name": "[COMMITTED] posix: Remove internal_function attribute",
    "commit_ref": null,
    "pull_url": null,
    "state": "new",
    "archived": false,
    "hash": "198b64836e16d64126bbc760f2b7fe3e1f8b9d5a",
    "submitter": {
        "id": 14312,
        "url": "http://patchwork.ozlabs.org/api/1.2/people/14312/?format=api",
        "name": "Florian Weimer",
        "email": "fweimer@redhat.com"
    },
    "delegate": null,
    "mbox": "http://patchwork.ozlabs.org/project/glibc/patch/20170831165642.338BE43994318@oldenburg.str.redhat.com/mbox/",
    "series": [
        {
            "id": 877,
            "url": "http://patchwork.ozlabs.org/api/1.2/series/877/?format=api",
            "web_url": "http://patchwork.ozlabs.org/project/glibc/list/?series=877",
            "date": "2017-08-31T16:56:42",
            "name": "[COMMITTED] posix: Remove internal_function attribute",
            "version": 1,
            "mbox": "http://patchwork.ozlabs.org/series/877/mbox/"
        }
    ],
    "comments": "http://patchwork.ozlabs.org/api/patches/808312/comments/",
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/808312/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<libc-alpha-return-83957-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-83957-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=\"l2OQ0yxo\"; dkim-atps=neutral",
            "sourceware.org; auth=none",
            "ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com",
            "ext-mx05.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 3xjpSm5Qbkz9sD5\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri,  1 Sep 2017 02:57:12 +1000 (AEST)",
            "(qmail 37418 invoked by alias); 31 Aug 2017 16:56:56 -0000",
            "(qmail 37325 invoked by uid 89); 31 Aug 2017 16:56:55 -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\tjT0aFGCamVROZZ3Vaz8b955++q7YT7eKt7abQVfyymrdMypptG6bWrWRxgpD69fF\n\t5fX4JzNC51rHOKSXVFL9yBnxJrgIxwFGqZQYs0b+lSa8G6sBV9lpfuWlHdiy15fS\n\tQLGP17/sFR/y+2RguFn4sd1qs+9mlcVe1mV20Neybh4=",
        "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=u+oEvF\n\tt9M9gE3TC9ZX+RH4Nla4Y=; b=l2OQ0yxooqQDUIWnnLcUJ7iHzFxjmstRsthu+6\n\tpi9LD5qTRp4lUO4WAso5O5uUeSBDEk76CyZZ/O03bQNO3umaAnYUQiw7l3OCPPoN\n\tNqzxza5qqYZT0BjbVWBxh0HdArHqiTgDkSjJ/8HTyUwJujtfpkDkWzBgdc/sMnUW\n\tpxir0=",
        "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=arrive,\n\tInside",
        "X-HELO": "mx1.redhat.com",
        "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 7E9ECFF4D",
        "Date": "Thu, 31 Aug 2017 18:56:42 +0200",
        "To": "libc-alpha@sourceware.org",
        "Subject": "[PATCH COMMITTED] posix: 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": "<20170831165642.338BE43994318@oldenburg.str.redhat.com>",
        "From": "fweimer@redhat.com (Florian Weimer)"
    },
    "content": "2017-08-31  Florian Weimer  <fweimer@redhat.com>\n\n\t* posix/fnmatch.c (internal_function): Remove definition.\n\t* posix/fnmatch_loop.c (FCT, EXT, END): Remove internal_function.\n\t* posix/regcomp.c (peek_token, init_word_char)\n\t(duplicate_node_closure, fetch_token, peek_token)\n\t(peek_token_bracket, build_range_exp, build_collating_symbol):\n\tLikewise.\n\t* posix/regex_internal.c (re_string_construct_common)\n\t(create_ci_newstate, create_cd_newstate, re_string_allocate)\n\t(re_string_construct, re_string_realloc_buffers, build_wcs_buffer)\n\t(build_wcs_upper_buffer, re_string_skip_chars, build_upper_buffer)\n\t(re_string_translate_buffer, re_string_reconstruct)\n\t(re_string_peek_byte_case, re_string_fetch_byte_case)\n\t(re_string_destruct, re_string_context_at, re_node_set_alloc)\n\t(re_node_set_init_1, re_node_set_init_2, re_node_set_init_copy)\n\t(re_node_set_add_intersect, re_node_set_init_union)\n\t(re_node_set_merge, re_node_set_insert, re_node_set_insert_last)\n\t(re_node_set_compare, re_node_set_contains, re_node_set_remove_at)\n\t(re_dfa_add_node, calc_state_hash, re_acquire_state)\n\t(re_acquire_state_context): Likewise.\n\t* posix/regex_internal.h (internal_function): Remove definition.\n\t(re_string_realloc_buffers, build_wcs_buffer)\n\t(build_wcs_upper_buffer, build_upper_buffer)\n\t(re_string_translate_buffer, re_string_context_at)\n\t(re_string_char_size_at, re_string_wchar_at)\n\t(re_string_elem_size_at): Likewise.\n\t* posix/regexec.c (match_ctx_init, match_ctx_clean)\n\t(match_ctx_free, match_ctx_add_entry, search_cur_bkref_entry)\n\t(match_ctx_add_subtop, match_ctx_add_sublast, sift_ctx_init)\n\t(re_search_internal, re_search_2_stub, re_search_stub)\n\t(re_copy_regs, prune_impossible_nodes, check_matching)\n\t(check_halt_state_context, update_regs, push_fail_stack, set_regs)\n\t(free_fail_stack_return, sift_states_iter_mb)\n\t(sift_states_backward, build_sifted_states)\n\t(update_cur_sifted_state, add_epsilon_src_nodes, check_dst_limits)\n\t(check_dst_limits_calc_pos_1, check_dst_limits_calc_pos)\n\t(check_subexp_limits, sift_states_bkref, merge_state_array)\n\t(find_recover_state, transit_state, merge_state_with_log)\n\t(check_subexp_matching_top, transit_state_sb, transit_state_sb)\n\t(transit_state_mb, transit_state_bkref, get_subexp)\n\t(get_subexp_sub, find_subexp_node, check_arrival)\n\t(check_arrival_add_next_nodes, check_arrival_expand_ecl)\n\t(check_arrival_expand_ecl_sub, expand_bkref_cache, build_trtable)\n\t(check_node_accept_bytes, find_collation_sequence_value)\n\t(group_nodes_into_DFAstates, check_node_accept, extend_buffers)\n\t(acquire_init_state_context, check_halt_node_context)\n\t(proceed_next_node, pop_fail_stack, clean_state_log_if_needed)\n\t(sub_epsilon_src_nodes): Likewise.\n\t* posix/spawn_int.h (__spawn_valid_fd): Likewise.\n\t* posix/spawn_valid_fd (__spawn_valid_fd): Likewise.\n\t* posix/wordexp.c (parse_dollars, parse_backtick, parse_dquote)\n\t(eval_expr, w_addmem, w_addstr, w_addword, parse_backslash)\n\t(parse_qtd_backslash, parse_tilde, do_parse_glob, parse_glob)\n\t(parse_squote, eval_expr_val, eval_expr_multdiv, parse_arith)\n\t(exec_comm_child, exec_comm, parse_comm, parse_param): Likewise.\n\t* sysdeps/posix/ttyname.c (getttyname): Likewise.\n\t* sysdeps/posix/ttyname_r.c (getttyname_r): Likewise.\n\t* sysdeps/unix/sysv/linux/preadv.c (__atomic_preadv_replacement)\n\t(PREADV): Likewise.\n\t* sysdeps/unix/sysv/linux/preadv64.c (__atomic_preadv64_replacement)\n\t(PREADV): Likewise.\n\t* sysdeps/unix/sysv/linux/pwritev.c (__atomic_pwritev_replacement)\n\t(PWRITEV): Likewise.\n\t* sysdeps/unix/sysv/linux/pwritev64.c (__atomic_pwritev64_replacement)\n\t(PWRITEV): Likewise.\n\t* sysdeps/unix/sysv/linux/ttyname.c (getttyname): Likewise.\n\t* sysdeps/unix/sysv/linux/ttyname_r.c (getttyname_r): Likewise.",
    "diff": "diff --git a/posix/fnmatch.c b/posix/fnmatch.c\nindex 441a41f0a5..62df3ece46 100644\n--- a/posix/fnmatch.c\n+++ b/posix/fnmatch.c\n@@ -186,12 +186,6 @@ __wcschrnul (const wchar_t *s, wint_t c)\n }\n # endif\n \n-# ifndef internal_function\n-/* Inside GNU libc we mark some function in a special way.  In other\n-   environments simply ignore the marking.  */\n-#  define internal_function\n-# endif\n-\n /* Note that this evaluates C many times.  */\n # ifdef _LIBC\n #  define FOLD(c) ((flags & FNM_CASEFOLD) ? tolower (c) : (c))\ndiff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c\nindex 2500dce615..e90ee46e01 100644\n--- a/posix/fnmatch_loop.c\n+++ b/posix/fnmatch_loop.c\n@@ -28,16 +28,13 @@ struct STRUCT\n    it matches, nonzero if not.  */\n static int FCT (const CHAR *pattern, const CHAR *string,\n \t\tconst CHAR *string_end, int no_leading_period, int flags,\n-\t\tstruct STRUCT *ends, size_t alloca_used)\n-     internal_function;\n+\t\tstruct STRUCT *ends, size_t alloca_used);\n static int EXT (INT opt, const CHAR *pattern, const CHAR *string,\n \t\tconst CHAR *string_end, int no_leading_period, int flags,\n-\t\tsize_t alloca_used)\n-     internal_function;\n-static const CHAR *END (const CHAR *patternp) internal_function;\n+\t\tsize_t alloca_used);\n+static const CHAR *END (const CHAR *patternp);\n \n static int\n-internal_function\n FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end,\n      int no_leading_period, int flags, struct STRUCT *ends, size_t alloca_used)\n {\n@@ -1000,7 +997,6 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end,\n \n \n static const CHAR *\n-internal_function\n END (const CHAR *pattern)\n {\n   const CHAR *p = pattern;\n@@ -1044,7 +1040,6 @@ END (const CHAR *pattern)\n \n \n static int\n-internal_function\n EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,\n      int no_leading_period, int flags, size_t alloca_used)\n {\ndiff --git a/posix/regcomp.c b/posix/regcomp.c\nindex b724ee3389..a5b46139a9 100644\n--- a/posix/regcomp.c\n+++ b/posix/regcomp.c\n@@ -61,7 +61,7 @@ static reg_errcode_t calc_inveclosure (re_dfa_t *dfa);\n static int fetch_number (re_string_t *input, re_token_t *token,\n \t\t\t reg_syntax_t syntax);\n static int peek_token (re_token_t *token, re_string_t *input,\n-\t\t\treg_syntax_t syntax) internal_function;\n+\t\t\treg_syntax_t syntax);\n static bin_tree_t *parse (re_string_t *regexp, regex_t *preg,\n \t\t\t  reg_syntax_t syntax, reg_errcode_t *err);\n static bin_tree_t *parse_reg_exp (re_string_t *regexp, regex_t *preg,\n@@ -916,7 +916,6 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)\n    character used by some operators like \"\\<\", \"\\>\", etc.  */\n \n static void\n-internal_function\n init_word_char (re_dfa_t *dfa)\n {\n   dfa->word_ops_used = 1;\n@@ -1460,7 +1459,6 @@ link_nfa_nodes (void *extra, bin_tree_t *node)\n    to their own constraint.  */\n \n static reg_errcode_t\n-internal_function\n duplicate_node_closure (re_dfa_t *dfa, int top_org_node, int top_clone_node,\n \t\t\tint root_node, unsigned int init_constraint)\n {\n@@ -1749,7 +1747,6 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, int node, int root)\n    We must not use this function inside bracket expressions.  */\n \n static void\n-internal_function\n fetch_token (re_token_t *result, re_string_t *input, reg_syntax_t syntax)\n {\n   re_string_skip_bytes (input, peek_token (result, input, syntax));\n@@ -1759,7 +1756,6 @@ fetch_token (re_token_t *result, re_string_t *input, reg_syntax_t syntax)\n    We must not use this function inside bracket expressions.  */\n \n static int\n-internal_function\n peek_token (re_token_t *token, re_string_t *input, reg_syntax_t syntax)\n {\n   unsigned char c;\n@@ -1998,7 +1994,6 @@ peek_token (re_token_t *token, re_string_t *input, reg_syntax_t syntax)\n    We must not use this function out of bracket expressions.  */\n \n static int\n-internal_function\n peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax)\n {\n   unsigned char c;\n@@ -2626,7 +2621,6 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,\n      update it.  */\n \n static reg_errcode_t\n-internal_function\n # ifdef RE_ENABLE_I18N\n build_range_exp (bitset_t sbcset, re_charset_t *mbcset, int *range_alloc,\n \t\t bracket_elem_t *start_elem, bracket_elem_t *end_elem)\n@@ -2747,7 +2741,6 @@ build_range_exp (bitset_t sbcset, bracket_elem_t *start_elem,\n    pointer argument since we may update it.  */\n \n static reg_errcode_t\n-internal_function\n # ifdef RE_ENABLE_I18N\n build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset,\n \t\t\tint *coll_sym_alloc, const unsigned char *name)\ndiff --git a/posix/regex_internal.c b/posix/regex_internal.c\nindex efafd173b3..111231c198 100644\n--- a/posix/regex_internal.c\n+++ b/posix/regex_internal.c\n@@ -20,14 +20,14 @@\n static void re_string_construct_common (const char *str, int len,\n \t\t\t\t\tre_string_t *pstr,\n \t\t\t\t\tRE_TRANSLATE_TYPE trans, int icase,\n-\t\t\t\t\tconst re_dfa_t *dfa) internal_function;\n+\t\t\t\t\tconst re_dfa_t *dfa);\n static re_dfastate_t *create_ci_newstate (const re_dfa_t *dfa,\n \t\t\t\t\t  const re_node_set *nodes,\n-\t\t\t\t\t  unsigned int hash) internal_function;\n+\t\t\t\t\t  unsigned int hash);\n static re_dfastate_t *create_cd_newstate (const re_dfa_t *dfa,\n \t\t\t\t\t  const re_node_set *nodes,\n \t\t\t\t\t  unsigned int context,\n-\t\t\t\t\t  unsigned int hash) internal_function;\n+\t\t\t\t\t  unsigned int hash);\n \f\n /* Functions for string operation.  */\n \n@@ -35,7 +35,7 @@ static re_dfastate_t *create_cd_newstate (const re_dfa_t *dfa,\n    re_string_reconstruct before using the object.  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n re_string_allocate (re_string_t *pstr, const char *str, int len, int init_len,\n \t\t    RE_TRANSLATE_TYPE trans, int icase, const re_dfa_t *dfa)\n {\n@@ -63,7 +63,7 @@ re_string_allocate (re_string_t *pstr, const char *str, int len, int init_len,\n /* This function allocate the buffers, and initialize them.  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n re_string_construct (re_string_t *pstr, const char *str, int len,\n \t\t     RE_TRANSLATE_TYPE trans, int icase, const re_dfa_t *dfa)\n {\n@@ -126,7 +126,7 @@ re_string_construct (re_string_t *pstr, const char *str, int len,\n /* Helper functions for re_string_allocate, and re_string_construct.  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n re_string_realloc_buffers (re_string_t *pstr, int new_buf_len)\n {\n #ifdef RE_ENABLE_I18N\n@@ -166,7 +166,6 @@ re_string_realloc_buffers (re_string_t *pstr, int new_buf_len)\n \n \n static void\n-internal_function\n re_string_construct_common (const char *str, int len, re_string_t *pstr,\n \t\t\t    RE_TRANSLATE_TYPE trans, int icase,\n \t\t\t    const re_dfa_t *dfa)\n@@ -198,7 +197,6 @@ re_string_construct_common (const char *str, int len, re_string_t *pstr,\n    built and starts from PSTR->VALID_LEN.  */\n \n static void\n-internal_function\n build_wcs_buffer (re_string_t *pstr)\n {\n #ifdef _LIBC\n@@ -267,7 +265,7 @@ build_wcs_buffer (re_string_t *pstr)\n    but for REG_ICASE.  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n build_wcs_upper_buffer (re_string_t *pstr)\n {\n   mbstate_t prev_st;\n@@ -486,7 +484,6 @@ build_wcs_upper_buffer (re_string_t *pstr)\n    Return the index.  */\n \n static int\n-internal_function\n re_string_skip_chars (re_string_t *pstr, int new_raw_idx, wint_t *last_wc)\n {\n   mbstate_t prev_st;\n@@ -527,7 +524,6 @@ re_string_skip_chars (re_string_t *pstr, int new_raw_idx, wint_t *last_wc)\n    This function is used in case of REG_ICASE.  */\n \n static void\n-internal_function\n build_upper_buffer (re_string_t *pstr)\n {\n   int char_idx, end_idx;\n@@ -550,7 +546,6 @@ build_upper_buffer (re_string_t *pstr)\n /* Apply TRANS to the buffer in PSTR.  */\n \n static void\n-internal_function\n re_string_translate_buffer (re_string_t *pstr)\n {\n   int buf_idx, end_idx;\n@@ -571,7 +566,7 @@ re_string_translate_buffer (re_string_t *pstr)\n    convert to upper case in case of REG_ICASE, apply translation.  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n re_string_reconstruct (re_string_t *pstr, int idx, int eflags)\n {\n   int offset = idx - pstr->raw_mbs_idx;\n@@ -831,7 +826,7 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags)\n }\n \n static unsigned char\n-internal_function __attribute ((pure))\n+__attribute ((pure))\n re_string_peek_byte_case (const re_string_t *pstr, int idx)\n {\n   int ch, off;\n@@ -867,7 +862,6 @@ re_string_peek_byte_case (const re_string_t *pstr, int idx)\n }\n \n static unsigned char\n-internal_function\n re_string_fetch_byte_case (re_string_t *pstr)\n {\n   if (BE (!pstr->mbs_allocated, 1))\n@@ -904,7 +898,6 @@ re_string_fetch_byte_case (re_string_t *pstr)\n }\n \n static void\n-internal_function\n re_string_destruct (re_string_t *pstr)\n {\n #ifdef RE_ENABLE_I18N\n@@ -918,7 +911,6 @@ re_string_destruct (re_string_t *pstr)\n /* Return the context at IDX in INPUT.  */\n \n static unsigned int\n-internal_function\n re_string_context_at (const re_string_t *input, int idx, int eflags)\n {\n   int c;\n@@ -963,7 +955,7 @@ re_string_context_at (const re_string_t *input, int idx, int eflags)\n /* Functions for set operation.  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n re_node_set_alloc (re_node_set *set, int size)\n {\n   set->alloc = size;\n@@ -975,7 +967,7 @@ re_node_set_alloc (re_node_set *set, int size)\n }\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n re_node_set_init_1 (re_node_set *set, int elem)\n {\n   set->alloc = 1;\n@@ -991,7 +983,7 @@ re_node_set_init_1 (re_node_set *set, int elem)\n }\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n re_node_set_init_2 (re_node_set *set, int elem1, int elem2)\n {\n   set->alloc = 2;\n@@ -1021,7 +1013,7 @@ re_node_set_init_2 (re_node_set *set, int elem1, int elem2)\n }\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n re_node_set_init_copy (re_node_set *dest, const re_node_set *src)\n {\n   dest->nelem = src->nelem;\n@@ -1046,7 +1038,7 @@ re_node_set_init_copy (re_node_set *dest, const re_node_set *src)\n    Note: We assume dest->elems is NULL, when dest->alloc is 0.  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1,\n \t\t\t   const re_node_set *src2)\n {\n@@ -1137,7 +1129,7 @@ re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1,\n    DEST. Return value indicate the error code or REG_NOERROR if succeeded.  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n re_node_set_init_union (re_node_set *dest, const re_node_set *src1,\n \t\t\tconst re_node_set *src2)\n {\n@@ -1190,7 +1182,7 @@ re_node_set_init_union (re_node_set *dest, const re_node_set *src1,\n    DEST. Return value indicate the error code or REG_NOERROR if succeeded.  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n re_node_set_merge (re_node_set *dest, const re_node_set *src)\n {\n   int is, id, sbase, delta;\n@@ -1273,7 +1265,7 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)\n    return -1 if an error is occured, return 1 otherwise.  */\n \n static int\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n re_node_set_insert (re_node_set *set, int elem)\n {\n   int idx;\n@@ -1330,7 +1322,7 @@ re_node_set_insert (re_node_set *set, int elem)\n    Return -1 if an error is occured, return 1 otherwise.  */\n \n static int\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n re_node_set_insert_last (re_node_set *set, int elem)\n {\n   /* Realloc if we need.  */\n@@ -1353,7 +1345,7 @@ re_node_set_insert_last (re_node_set *set, int elem)\n    return 1 if SET1 and SET2 are equivalent, return 0 otherwise.  */\n \n static int\n-internal_function __attribute ((pure))\n+__attribute ((pure))\n re_node_set_compare (const re_node_set *set1, const re_node_set *set2)\n {\n   int i;\n@@ -1368,7 +1360,7 @@ re_node_set_compare (const re_node_set *set1, const re_node_set *set2)\n /* Return (idx + 1) if SET contains the element ELEM, return 0 otherwise.  */\n \n static int\n-internal_function __attribute ((pure))\n+__attribute ((pure))\n re_node_set_contains (const re_node_set *set, int elem)\n {\n   unsigned int idx, right, mid;\n@@ -1390,7 +1382,6 @@ re_node_set_contains (const re_node_set *set, int elem)\n }\n \n static void\n-internal_function\n re_node_set_remove_at (re_node_set *set, int idx)\n {\n   if (idx < 0 || idx >= set->nelem)\n@@ -1405,7 +1396,6 @@ re_node_set_remove_at (re_node_set *set, int idx)\n    Or return -1, if an error will be occured.  */\n \n static int\n-internal_function\n re_dfa_add_node (re_dfa_t *dfa, re_token_t token)\n {\n   int type = token.type;\n@@ -1453,7 +1443,6 @@ re_dfa_add_node (re_dfa_t *dfa, re_token_t token)\n }\n \n static inline unsigned int\n-internal_function\n calc_state_hash (const re_node_set *nodes, unsigned int context)\n {\n   unsigned int hash = nodes->nelem + context;\n@@ -1473,7 +1462,7 @@ calc_state_hash (const re_node_set *nodes, unsigned int context)\n \t   optimization.  */\n \n static re_dfastate_t *\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n re_acquire_state (reg_errcode_t *err, const re_dfa_t *dfa,\n \t\t  const re_node_set *nodes)\n {\n@@ -1517,7 +1506,7 @@ re_acquire_state (reg_errcode_t *err, const re_dfa_t *dfa,\n \t   optimization.  */\n \n static re_dfastate_t *\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n re_acquire_state_context (reg_errcode_t *err, const re_dfa_t *dfa,\n \t\t\t  const re_node_set *nodes, unsigned int context)\n {\n@@ -1609,7 +1598,7 @@ free_state (re_dfastate_t *state)\n    Return the new state if succeeded, otherwise return NULL.  */\n \n static re_dfastate_t *\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes,\n \t\t    unsigned int hash)\n {\n@@ -1659,7 +1648,7 @@ create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes,\n    Return the new state if succeeded, otherwise return NULL.  */\n \n static re_dfastate_t *\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes,\n \t\t    unsigned int context, unsigned int hash)\n {\ndiff --git a/posix/regex_internal.h b/posix/regex_internal.h\nindex 04317128b7..fef1d35e55 100644\n--- a/posix/regex_internal.h\n+++ b/posix/regex_internal.h\n@@ -373,28 +373,17 @@ typedef struct re_string_t re_string_t;\n struct re_dfa_t;\n typedef struct re_dfa_t re_dfa_t;\n \n-#ifndef _LIBC\n-# ifdef __i386__\n-#  define internal_function   __attribute__ ((regparm (3), stdcall))\n-# else\n-#  define internal_function\n-# endif\n-#endif\n-\n #if IS_IN (libc)\n static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr,\n-\t\t\t\t\t\tint new_buf_len)\n-     internal_function;\n+\t\t\t\t\t\tint new_buf_len);\n # ifdef RE_ENABLE_I18N\n-static void build_wcs_buffer (re_string_t *pstr) internal_function;\n-static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr)\n-  internal_function;\n+static void build_wcs_buffer (re_string_t *pstr);\n+static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr);\n # endif /* RE_ENABLE_I18N */\n-static void build_upper_buffer (re_string_t *pstr) internal_function;\n-static void re_string_translate_buffer (re_string_t *pstr) internal_function;\n+static void build_upper_buffer (re_string_t *pstr);\n+static void re_string_translate_buffer (re_string_t *pstr);\n static unsigned int re_string_context_at (const re_string_t *input, int idx,\n-\t\t\t\t\t  int eflags)\n-     internal_function __attribute__ ((pure));\n+\t\t\t\t\t  int eflags) __attribute__ ((pure));\n #endif\n #define re_string_peek_byte(pstr, offset) \\\n   ((pstr)->mbs[(pstr)->cur_idx + offset])\n@@ -710,7 +699,7 @@ bitset_mask (bitset_t dest, const bitset_t src)\n #ifdef RE_ENABLE_I18N\n /* Inline functions for re_string.  */\n static int\n-internal_function __attribute__ ((pure, unused))\n+__attribute__ ((pure, unused))\n re_string_char_size_at (const re_string_t *pstr, int idx)\n {\n   int byte_idx;\n@@ -723,7 +712,7 @@ re_string_char_size_at (const re_string_t *pstr, int idx)\n }\n \n static wint_t\n-internal_function __attribute__ ((pure, unused))\n+__attribute__ ((pure, unused))\n re_string_wchar_at (const re_string_t *pstr, int idx)\n {\n   if (pstr->mb_cur_max == 1)\n@@ -737,7 +726,7 @@ re_string_wchar_at (const re_string_t *pstr, int idx)\n #  endif\n \n static int\n-internal_function __attribute__ ((pure, unused))\n+__attribute__ ((pure, unused))\n re_string_elem_size_at (const re_string_t *pstr, int idx)\n {\n #  ifdef _LIBC\ndiff --git a/posix/regexec.c b/posix/regexec.c\nindex 8eb09dcfa0..f46b1f71ca 100644\n--- a/posix/regexec.c\n+++ b/posix/regexec.c\n@@ -20,187 +20,159 @@\n #include <stdint.h>\n \n static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags,\n-\t\t\t\t     int n) internal_function;\n-static void match_ctx_clean (re_match_context_t *mctx) internal_function;\n-static void match_ctx_free (re_match_context_t *cache) internal_function;\n+\t\t\t\t     int n);\n+static void match_ctx_clean (re_match_context_t *mctx);\n+static void match_ctx_free (re_match_context_t *cache);\n static reg_errcode_t match_ctx_add_entry (re_match_context_t *cache, int node,\n-\t\t\t\t\t  int str_idx, int from, int to)\n-     internal_function;\n-static int search_cur_bkref_entry (const re_match_context_t *mctx, int str_idx)\n-     internal_function;\n+\t\t\t\t\t  int str_idx, int from, int to);\n+static int search_cur_bkref_entry (const re_match_context_t *mctx,\n+\t\t\t\t   int str_idx);\n static reg_errcode_t match_ctx_add_subtop (re_match_context_t *mctx, int node,\n-\t\t\t\t\t   int str_idx) internal_function;\n+\t\t\t\t\t   int str_idx);\n static re_sub_match_last_t * match_ctx_add_sublast (re_sub_match_top_t *subtop,\n-\t\t\t\t\t\t   int node, int str_idx)\n-     internal_function;\n+\t\t\t\t\t\t   int node, int str_idx);\n static void sift_ctx_init (re_sift_context_t *sctx, re_dfastate_t **sifted_sts,\n \t\t\t   re_dfastate_t **limited_sts, int last_node,\n-\t\t\t   int last_str_idx)\n-     internal_function;\n+\t\t\t   int last_str_idx);\n static reg_errcode_t re_search_internal (const regex_t *preg,\n \t\t\t\t\t const char *string, int length,\n \t\t\t\t\t int start, int range, int stop,\n \t\t\t\t\t size_t nmatch, regmatch_t pmatch[],\n-\t\t\t\t\t int eflags) internal_function;\n+\t\t\t\t\t int eflags);\n static int re_search_2_stub (struct re_pattern_buffer *bufp,\n \t\t\t     const char *string1, int length1,\n \t\t\t     const char *string2, int length2,\n \t\t\t     int start, int range, struct re_registers *regs,\n-\t\t\t     int stop, int ret_len) internal_function;\n+\t\t\t     int stop, int ret_len);\n static int re_search_stub (struct re_pattern_buffer *bufp,\n \t\t\t   const char *string, int length, int start,\n \t\t\t   int range, int stop, struct re_registers *regs,\n-\t\t\t   int ret_len) internal_function;\n+\t\t\t   int ret_len);\n static unsigned re_copy_regs (struct re_registers *regs, regmatch_t *pmatch,\n-\t\t\t      int nregs, int regs_allocated) internal_function;\n-static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx)\n-     internal_function;\n+\t\t\t      int nregs, int regs_allocated);\n+static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx);\n static int check_matching (re_match_context_t *mctx, int fl_longest_match,\n-\t\t\t   int *p_match_first) internal_function;\n+\t\t\t   int *p_match_first);\n static int check_halt_state_context (const re_match_context_t *mctx,\n-\t\t\t\t     const re_dfastate_t *state, int idx)\n-     internal_function;\n+\t\t\t\t     const re_dfastate_t *state, int idx);\n static void update_regs (const re_dfa_t *dfa, regmatch_t *pmatch,\n \t\t\t regmatch_t *prev_idx_match, int cur_node,\n-\t\t\t int cur_idx, int nmatch) internal_function;\n+\t\t\t int cur_idx, int nmatch);\n static reg_errcode_t push_fail_stack (struct re_fail_stack_t *fs,\n \t\t\t\t      int str_idx, int dest_node, int nregs,\n \t\t\t\t      regmatch_t *regs,\n-\t\t\t\t      re_node_set *eps_via_nodes)\n-     internal_function;\n+\t\t\t\t      re_node_set *eps_via_nodes);\n static reg_errcode_t set_regs (const regex_t *preg,\n \t\t\t       const re_match_context_t *mctx,\n \t\t\t       size_t nmatch, regmatch_t *pmatch,\n-\t\t\t       int fl_backtrack) internal_function;\n-static reg_errcode_t free_fail_stack_return (struct re_fail_stack_t *fs)\n-     internal_function;\n+\t\t\t       int fl_backtrack);\n+static reg_errcode_t free_fail_stack_return (struct re_fail_stack_t *fs);\n \n #ifdef RE_ENABLE_I18N\n static int sift_states_iter_mb (const re_match_context_t *mctx,\n \t\t\t\tre_sift_context_t *sctx,\n-\t\t\t\tint node_idx, int str_idx, int max_str_idx)\n-     internal_function;\n+\t\t\t\tint node_idx, int str_idx, int max_str_idx);\n #endif /* RE_ENABLE_I18N */\n static reg_errcode_t sift_states_backward (const re_match_context_t *mctx,\n-\t\t\t\t\t   re_sift_context_t *sctx)\n-     internal_function;\n+\t\t\t\t\t   re_sift_context_t *sctx);\n static reg_errcode_t build_sifted_states (const re_match_context_t *mctx,\n \t\t\t\t\t  re_sift_context_t *sctx, int str_idx,\n-\t\t\t\t\t  re_node_set *cur_dest)\n-     internal_function;\n+\t\t\t\t\t  re_node_set *cur_dest);\n static reg_errcode_t update_cur_sifted_state (const re_match_context_t *mctx,\n \t\t\t\t\t      re_sift_context_t *sctx,\n \t\t\t\t\t      int str_idx,\n-\t\t\t\t\t      re_node_set *dest_nodes)\n-     internal_function;\n+\t\t\t\t\t      re_node_set *dest_nodes);\n static reg_errcode_t add_epsilon_src_nodes (const re_dfa_t *dfa,\n \t\t\t\t\t    re_node_set *dest_nodes,\n-\t\t\t\t\t    const re_node_set *candidates)\n-     internal_function;\n+\t\t\t\t\t    const re_node_set *candidates);\n static int check_dst_limits (const re_match_context_t *mctx,\n \t\t\t     re_node_set *limits,\n \t\t\t     int dst_node, int dst_idx, int src_node,\n-\t\t\t     int src_idx) internal_function;\n+\t\t\t     int src_idx);\n static int check_dst_limits_calc_pos_1 (const re_match_context_t *mctx,\n \t\t\t\t\tint boundaries, int subexp_idx,\n-\t\t\t\t\tint from_node, int bkref_idx)\n-     internal_function;\n+\t\t\t\t\tint from_node, int bkref_idx);\n static int check_dst_limits_calc_pos (const re_match_context_t *mctx,\n \t\t\t\t      int limit, int subexp_idx,\n \t\t\t\t      int node, int str_idx,\n-\t\t\t\t      int bkref_idx) internal_function;\n+\t\t\t\t      int bkref_idx);\n static reg_errcode_t check_subexp_limits (const re_dfa_t *dfa,\n \t\t\t\t\t  re_node_set *dest_nodes,\n \t\t\t\t\t  const re_node_set *candidates,\n \t\t\t\t\t  re_node_set *limits,\n \t\t\t\t\t  struct re_backref_cache_entry *bkref_ents,\n-\t\t\t\t\t  int str_idx) internal_function;\n+\t\t\t\t\t  int str_idx);\n static reg_errcode_t sift_states_bkref (const re_match_context_t *mctx,\n \t\t\t\t\tre_sift_context_t *sctx,\n-\t\t\t\t\tint str_idx, const re_node_set *candidates)\n-     internal_function;\n+\t\t\t\t\tint str_idx,\n+\t\t\t\t\tconst re_node_set *candidates);\n static reg_errcode_t merge_state_array (const re_dfa_t *dfa,\n \t\t\t\t\tre_dfastate_t **dst,\n-\t\t\t\t\tre_dfastate_t **src, int num)\n-     internal_function;\n+\t\t\t\t\tre_dfastate_t **src, int num);\n static re_dfastate_t *find_recover_state (reg_errcode_t *err,\n-\t\t\t\t\t re_match_context_t *mctx) internal_function;\n+\t\t\t\t\t re_match_context_t *mctx);\n static re_dfastate_t *transit_state (reg_errcode_t *err,\n \t\t\t\t     re_match_context_t *mctx,\n-\t\t\t\t     re_dfastate_t *state) internal_function;\n+\t\t\t\t     re_dfastate_t *state);\n static re_dfastate_t *merge_state_with_log (reg_errcode_t *err,\n \t\t\t\t\t    re_match_context_t *mctx,\n-\t\t\t\t\t    re_dfastate_t *next_state)\n-     internal_function;\n+\t\t\t\t\t    re_dfastate_t *next_state);\n static reg_errcode_t check_subexp_matching_top (re_match_context_t *mctx,\n \t\t\t\t\t\tre_node_set *cur_nodes,\n-\t\t\t\t\t\tint str_idx) internal_function;\n+\t\t\t\t\t\tint str_idx);\n #if 0\n static re_dfastate_t *transit_state_sb (reg_errcode_t *err,\n \t\t\t\t\tre_match_context_t *mctx,\n-\t\t\t\t\tre_dfastate_t *pstate)\n-     internal_function;\n+\t\t\t\t\tre_dfastate_t *pstate);\n #endif\n #ifdef RE_ENABLE_I18N\n static reg_errcode_t transit_state_mb (re_match_context_t *mctx,\n-\t\t\t\t       re_dfastate_t *pstate)\n-     internal_function;\n+\t\t\t\t       re_dfastate_t *pstate);\n #endif /* RE_ENABLE_I18N */\n static reg_errcode_t transit_state_bkref (re_match_context_t *mctx,\n-\t\t\t\t\t  const re_node_set *nodes)\n-     internal_function;\n+\t\t\t\t\t  const re_node_set *nodes);\n static reg_errcode_t get_subexp (re_match_context_t *mctx,\n-\t\t\t\t int bkref_node, int bkref_str_idx)\n-     internal_function;\n+\t\t\t\t int bkref_node, int bkref_str_idx);\n static reg_errcode_t get_subexp_sub (re_match_context_t *mctx,\n \t\t\t\t     const re_sub_match_top_t *sub_top,\n \t\t\t\t     re_sub_match_last_t *sub_last,\n-\t\t\t\t     int bkref_node, int bkref_str)\n-     internal_function;\n+\t\t\t\t     int bkref_node, int bkref_str);\n static int find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes,\n-\t\t\t     int subexp_idx, int type) internal_function;\n+\t\t\t     int subexp_idx, int type);\n static reg_errcode_t check_arrival (re_match_context_t *mctx,\n \t\t\t\t    state_array_t *path, int top_node,\n \t\t\t\t    int top_str, int last_node, int last_str,\n-\t\t\t\t    int type) internal_function;\n+\t\t\t\t    int type);\n static reg_errcode_t check_arrival_add_next_nodes (re_match_context_t *mctx,\n \t\t\t\t\t\t   int str_idx,\n \t\t\t\t\t\t   re_node_set *cur_nodes,\n-\t\t\t\t\t\t   re_node_set *next_nodes)\n-     internal_function;\n+\t\t\t\t\t\t   re_node_set *next_nodes);\n static reg_errcode_t check_arrival_expand_ecl (const re_dfa_t *dfa,\n \t\t\t\t\t       re_node_set *cur_nodes,\n-\t\t\t\t\t       int ex_subexp, int type)\n-     internal_function;\n+\t\t\t\t\t       int ex_subexp, int type);\n static reg_errcode_t check_arrival_expand_ecl_sub (const re_dfa_t *dfa,\n \t\t\t\t\t\t   re_node_set *dst_nodes,\n \t\t\t\t\t\t   int target, int ex_subexp,\n-\t\t\t\t\t\t   int type) internal_function;\n+\t\t\t\t\t\t   int type);\n static reg_errcode_t expand_bkref_cache (re_match_context_t *mctx,\n \t\t\t\t\t re_node_set *cur_nodes, int cur_str,\n-\t\t\t\t\t int subexp_num, int type)\n-     internal_function;\n-static int build_trtable (const re_dfa_t *dfa,\n-\t\t\t  re_dfastate_t *state) internal_function;\n+\t\t\t\t\t int subexp_num, int type);\n+static int build_trtable (const re_dfa_t *dfa, re_dfastate_t *state);\n #ifdef RE_ENABLE_I18N\n static int check_node_accept_bytes (const re_dfa_t *dfa, int node_idx,\n-\t\t\t\t    const re_string_t *input, int idx)\n-     internal_function;\n+\t\t\t\t    const re_string_t *input, int idx);\n # ifdef _LIBC\n static unsigned int find_collation_sequence_value (const unsigned char *mbs,\n-\t\t\t\t\t\t   size_t name_len)\n-     internal_function;\n+\t\t\t\t\t\t   size_t name_len);\n # endif /* _LIBC */\n #endif /* RE_ENABLE_I18N */\n static int group_nodes_into_DFAstates (const re_dfa_t *dfa,\n \t\t\t\t       const re_dfastate_t *state,\n \t\t\t\t       re_node_set *states_node,\n-\t\t\t\t       bitset_t *states_ch) internal_function;\n+\t\t\t\t       bitset_t *states_ch);\n static int check_node_accept (const re_match_context_t *mctx,\n-\t\t\t      const re_token_t *node, int idx)\n-     internal_function;\n-static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len)\n-     internal_function;\n+\t\t\t      const re_token_t *node, int idx);\n+static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len);\n \f\n /* Entry point for POSIX code.  */\n \n@@ -345,7 +317,6 @@ weak_alias (__re_search_2, re_search_2)\n #endif\n \n static int\n-internal_function\n re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1,\n \t\t  int length1, const char *string2, int length2, int start,\n \t\t  int range, struct re_registers *regs,\n@@ -391,7 +362,6 @@ re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1,\n    otherwise the position of the match is returned.  */\n \n static int\n-internal_function\n re_search_stub (struct re_pattern_buffer *bufp, const char *string, int length,\n \t\tint start, int range, int stop, struct re_registers *regs,\n \t\tint ret_len)\n@@ -479,7 +449,6 @@ re_search_stub (struct re_pattern_buffer *bufp, const char *string, int length,\n }\n \n static unsigned\n-internal_function\n re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, int nregs,\n \t      int regs_allocated)\n {\n@@ -605,7 +574,7 @@ re_exec (const char *s)\n    (START + RANGE >= 0 && START + RANGE <= LENGTH)  */\n \n static reg_errcode_t\n-__attribute_warn_unused_result__ internal_function\n+__attribute_warn_unused_result__\n re_search_internal (const regex_t *preg, const char *string, int length,\n \t\t    int start, int range, int stop, size_t nmatch,\n \t\t    regmatch_t pmatch[], int eflags)\n@@ -928,7 +897,7 @@ re_search_internal (const regex_t *preg, const char *string, int length,\n }\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n prune_impossible_nodes (re_match_context_t *mctx)\n {\n   const re_dfa_t *const dfa = mctx->dfa;\n@@ -1024,7 +993,7 @@ prune_impossible_nodes (re_match_context_t *mctx)\n    since initial states may have constraints like \"\\<\", \"^\", etc..  */\n \n static inline re_dfastate_t *\n-__attribute ((always_inline)) internal_function\n+__attribute ((always_inline))\n acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx,\n \t\t\t    int idx)\n {\n@@ -1066,7 +1035,7 @@ acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx,\n    index of the buffer.  */\n \n static int\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n check_matching (re_match_context_t *mctx, int fl_longest_match,\n \t\tint *p_match_first)\n {\n@@ -1199,7 +1168,6 @@ check_matching (re_match_context_t *mctx, int fl_longest_match,\n /* Check NODE match the current context.  */\n \n static int\n-internal_function\n check_halt_node_context (const re_dfa_t *dfa, int node, unsigned int context)\n {\n   re_token_type_t type = dfa->nodes[node].type;\n@@ -1218,7 +1186,6 @@ check_halt_node_context (const re_dfa_t *dfa, int node, unsigned int context)\n    match the context, return the node.  */\n \n static int\n-internal_function\n check_halt_state_context (const re_match_context_t *mctx,\n \t\t\t  const re_dfastate_t *state, int idx)\n {\n@@ -1240,7 +1207,6 @@ check_halt_state_context (const re_match_context_t *mctx,\n    of errors.  */\n \n static int\n-internal_function\n proceed_next_node (const re_match_context_t *mctx, int nregs, regmatch_t *regs,\n \t\t   int *pidx, int node, re_node_set *eps_via_nodes,\n \t\t   struct re_fail_stack_t *fs)\n@@ -1340,7 +1306,7 @@ proceed_next_node (const re_match_context_t *mctx, int nregs, regmatch_t *regs,\n }\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n push_fail_stack (struct re_fail_stack_t *fs, int str_idx, int dest_node,\n \t\t int nregs, regmatch_t *regs, re_node_set *eps_via_nodes)\n {\n@@ -1367,7 +1333,6 @@ push_fail_stack (struct re_fail_stack_t *fs, int str_idx, int dest_node,\n }\n \n static int\n-internal_function\n pop_fail_stack (struct re_fail_stack_t *fs, int *pidx, int nregs,\n \t\tregmatch_t *regs, re_node_set *eps_via_nodes)\n {\n@@ -1387,7 +1352,7 @@ pop_fail_stack (struct re_fail_stack_t *fs, int *pidx, int nregs,\n    pmatch[i].rm_so == pmatch[i].rm_eo == -1 for 0 < i < nmatch.  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch,\n \t  regmatch_t *pmatch, int fl_backtrack)\n {\n@@ -1494,7 +1459,6 @@ set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch,\n }\n \n static reg_errcode_t\n-internal_function\n free_fail_stack_return (struct re_fail_stack_t *fs)\n {\n   if (fs)\n@@ -1511,7 +1475,6 @@ free_fail_stack_return (struct re_fail_stack_t *fs)\n }\n \n static void\n-internal_function\n update_regs (const re_dfa_t *dfa, regmatch_t *pmatch,\n \t     regmatch_t *prev_idx_match, int cur_node, int cur_idx, int nmatch)\n {\n@@ -1583,7 +1546,6 @@ update_regs (const re_dfa_t *dfa, regmatch_t *pmatch,\n   ((state) != NULL && re_node_set_contains (&(state)->nodes, node))\n \n static reg_errcode_t\n-internal_function\n sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx)\n {\n   reg_errcode_t err;\n@@ -1641,7 +1603,7 @@ sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx)\n }\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx,\n \t\t     int str_idx, re_node_set *cur_dest)\n {\n@@ -1703,7 +1665,6 @@ build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx,\n /* Helper functions.  */\n \n static reg_errcode_t\n-internal_function\n clean_state_log_if_needed (re_match_context_t *mctx, int next_state_log_idx)\n {\n   int top = mctx->state_log_top;\n@@ -1729,7 +1690,6 @@ clean_state_log_if_needed (re_match_context_t *mctx, int next_state_log_idx)\n }\n \n static reg_errcode_t\n-internal_function\n merge_state_array (const re_dfa_t *dfa, re_dfastate_t **dst,\n \t\t   re_dfastate_t **src, int num)\n {\n@@ -1756,7 +1716,6 @@ merge_state_array (const re_dfa_t *dfa, re_dfastate_t **dst,\n }\n \n static reg_errcode_t\n-internal_function\n update_cur_sifted_state (const re_match_context_t *mctx,\n \t\t\t re_sift_context_t *sctx, int str_idx,\n \t\t\t re_node_set *dest_nodes)\n@@ -1804,7 +1763,7 @@ update_cur_sifted_state (const re_match_context_t *mctx,\n }\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes,\n \t\t       const re_node_set *candidates)\n {\n@@ -1833,7 +1792,6 @@ add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes,\n }\n \n static reg_errcode_t\n-internal_function\n sub_epsilon_src_nodes (const re_dfa_t *dfa, int node, re_node_set *dest_nodes,\n \t\t       const re_node_set *candidates)\n {\n@@ -1882,7 +1840,6 @@ sub_epsilon_src_nodes (const re_dfa_t *dfa, int node, re_node_set *dest_nodes,\n }\n \n static int\n-internal_function\n check_dst_limits (const re_match_context_t *mctx, re_node_set *limits,\n \t\t  int dst_node, int dst_idx, int src_node, int src_idx)\n {\n@@ -1918,7 +1875,6 @@ check_dst_limits (const re_match_context_t *mctx, re_node_set *limits,\n }\n \n static int\n-internal_function\n check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries,\n \t\t\t     int subexp_idx, int from_node, int bkref_idx)\n {\n@@ -1999,7 +1955,6 @@ check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries,\n }\n \n static int\n-internal_function\n check_dst_limits_calc_pos (const re_match_context_t *mctx, int limit,\n \t\t\t   int subexp_idx, int from_node, int str_idx,\n \t\t\t   int bkref_idx)\n@@ -2029,7 +1984,6 @@ check_dst_limits_calc_pos (const re_match_context_t *mctx, int limit,\n    which are against limitations from DEST_NODES. */\n \n static reg_errcode_t\n-internal_function\n check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes,\n \t\t     const re_node_set *candidates, re_node_set *limits,\n \t\t     struct re_backref_cache_entry *bkref_ents, int str_idx)\n@@ -2117,7 +2071,7 @@ check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes,\n }\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx,\n \t\t   int str_idx, const re_node_set *candidates)\n {\n@@ -2217,7 +2171,6 @@ sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx,\n \n #ifdef RE_ENABLE_I18N\n static int\n-internal_function\n sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx,\n \t\t     int node_idx, int str_idx, int max_str_idx)\n {\n@@ -2247,7 +2200,7 @@ sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx,\n    update the destination of STATE_LOG.  */\n \n static re_dfastate_t *\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n transit_state (reg_errcode_t *err, re_match_context_t *mctx,\n \t       re_dfastate_t *state)\n {\n@@ -2305,7 +2258,6 @@ transit_state (reg_errcode_t *err, re_match_context_t *mctx,\n \n /* Update the state_log if we need */\n re_dfastate_t *\n-internal_function\n merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx,\n \t\t      re_dfastate_t *next_state)\n {\n@@ -2384,7 +2336,6 @@ merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx,\n    multi-byte match, then look in the log for a state\n    from which to restart matching.  */\n re_dfastate_t *\n-internal_function\n find_recover_state (reg_errcode_t *err, re_match_context_t *mctx)\n {\n   re_dfastate_t *cur_state;\n@@ -2415,7 +2366,6 @@ find_recover_state (reg_errcode_t *err, re_match_context_t *mctx)\n    correspoding back references.  */\n \n static reg_errcode_t\n-internal_function\n check_subexp_matching_top (re_match_context_t *mctx, re_node_set *cur_nodes,\n \t\t\t   int str_idx)\n {\n@@ -2488,7 +2438,6 @@ transit_state_sb (reg_errcode_t *err, re_match_context_t *mctx,\n \n #ifdef RE_ENABLE_I18N\n static reg_errcode_t\n-internal_function\n transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate)\n {\n   const re_dfa_t *const dfa = mctx->dfa;\n@@ -2558,7 +2507,6 @@ transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate)\n #endif /* RE_ENABLE_I18N */\n \n static reg_errcode_t\n-internal_function\n transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes)\n {\n   const re_dfa_t *const dfa = mctx->dfa;\n@@ -2672,7 +2620,7 @@ transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes)\n    delay these checking for prune_impossible_nodes().  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n get_subexp (re_match_context_t *mctx, int bkref_node, int bkref_str_idx)\n {\n   const re_dfa_t *const dfa = mctx->dfa;\n@@ -2821,7 +2769,6 @@ get_subexp (re_match_context_t *mctx, int bkref_node, int bkref_str_idx)\n    and SUB_LAST.  */\n \n static reg_errcode_t\n-internal_function\n get_subexp_sub (re_match_context_t *mctx, const re_sub_match_top_t *sub_top,\n \t\tre_sub_match_last_t *sub_last, int bkref_node, int bkref_str)\n {\n@@ -2850,7 +2797,6 @@ get_subexp_sub (re_match_context_t *mctx, const re_sub_match_top_t *sub_top,\n \t E.g. RE: (a){2}  */\n \n static int\n-internal_function\n find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes,\n \t\t  int subexp_idx, int type)\n {\n@@ -2872,7 +2818,7 @@ find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes,\n    Return REG_NOERROR if it can arrive, or REG_NOMATCH otherwise.  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n check_arrival (re_match_context_t *mctx, state_array_t *path, int top_node,\n \t       int top_str, int last_node, int last_str, int type)\n {\n@@ -3033,7 +2979,7 @@ check_arrival (re_match_context_t *mctx, state_array_t *path, int top_node,\n \t Can't we unify them?  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n check_arrival_add_next_nodes (re_match_context_t *mctx, int str_idx,\n \t\t\t      re_node_set *cur_nodes, re_node_set *next_nodes)\n {\n@@ -3112,7 +3058,6 @@ check_arrival_add_next_nodes (re_match_context_t *mctx, int str_idx,\n */\n \n static reg_errcode_t\n-internal_function\n check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes,\n \t\t\t  int ex_subexp, int type)\n {\n@@ -3165,7 +3110,7 @@ check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes,\n    problematic append it to DST_NODES.  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes,\n \t\t\t      int target, int ex_subexp, int type)\n {\n@@ -3209,7 +3154,7 @@ check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes,\n    in MCTX->BKREF_ENTS.  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes,\n \t\t    int cur_str, int subexp_num, int type)\n {\n@@ -3298,7 +3243,6 @@ expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes,\n    Return 1 if succeeded, otherwise return NULL.  */\n \n static int\n-internal_function\n build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)\n {\n   reg_errcode_t err;\n@@ -3534,7 +3478,6 @@ out_free:\n    to DEST_CH[i].  This function return the number of destinations.  */\n \n static int\n-internal_function\n group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,\n \t\t\t    re_node_set *dests_node, bitset_t *dests_ch)\n {\n@@ -3728,7 +3671,6 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,\n # endif\n \n static int\n-internal_function\n check_node_accept_bytes (const re_dfa_t *dfa, int node_idx,\n \t\t\t const re_string_t *input, int str_idx)\n {\n@@ -3966,7 +3908,6 @@ check_node_accept_bytes (const re_dfa_t *dfa, int node_idx,\n \n # ifdef _LIBC\n static unsigned int\n-internal_function\n find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len)\n {\n   uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);\n@@ -4029,7 +3970,6 @@ find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len)\n    byte of the INPUT.  */\n \n static int\n-internal_function\n check_node_accept (const re_match_context_t *mctx, const re_token_t *node,\n \t\t   int idx)\n {\n@@ -4079,7 +4019,7 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node,\n /* Extend the buffers, if the buffers have run out.  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n extend_buffers (re_match_context_t *mctx, int min_len)\n {\n   reg_errcode_t ret;\n@@ -4144,7 +4084,7 @@ extend_buffers (re_match_context_t *mctx, int min_len)\n /* Initialize MCTX.  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n match_ctx_init (re_match_context_t *mctx, int eflags, int n)\n {\n   mctx->eflags = eflags;\n@@ -4172,7 +4112,6 @@ match_ctx_init (re_match_context_t *mctx, int eflags, int n)\n    of the input, or changes the input string.  */\n \n static void\n-internal_function\n match_ctx_clean (re_match_context_t *mctx)\n {\n   int st_idx;\n@@ -4202,7 +4141,6 @@ match_ctx_clean (re_match_context_t *mctx)\n /* Free all the memory associated with MCTX.  */\n \n static void\n-internal_function\n match_ctx_free (re_match_context_t *mctx)\n {\n   /* First, free all the memory associated with MCTX->SUB_TOPS.  */\n@@ -4217,7 +4155,7 @@ match_ctx_free (re_match_context_t *mctx)\n */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n match_ctx_add_entry (re_match_context_t *mctx, int node, int str_idx, int from,\n \t\t     int to)\n {\n@@ -4266,7 +4204,6 @@ match_ctx_add_entry (re_match_context_t *mctx, int node, int str_idx, int from,\n    found.  Note that MCTX->BKREF_ENTS is already sorted by MCTX->STR_IDX.  */\n \n static int\n-internal_function\n search_cur_bkref_entry (const re_match_context_t *mctx, int str_idx)\n {\n   int left, right, mid, last;\n@@ -4289,7 +4226,7 @@ search_cur_bkref_entry (const re_match_context_t *mctx, int str_idx)\n    at STR_IDX.  */\n \n static reg_errcode_t\n-internal_function __attribute_warn_unused_result__\n+__attribute_warn_unused_result__\n match_ctx_add_subtop (re_match_context_t *mctx, int node, int str_idx)\n {\n #ifdef DEBUG\n@@ -4319,7 +4256,6 @@ match_ctx_add_subtop (re_match_context_t *mctx, int node, int str_idx)\n    at STR_IDX, whose corresponding OP_OPEN_SUBEXP is SUB_TOP.  */\n \n static re_sub_match_last_t *\n-internal_function\n match_ctx_add_sublast (re_sub_match_top_t *subtop, int node, int str_idx)\n {\n   re_sub_match_last_t *new_entry;\n@@ -4346,7 +4282,6 @@ match_ctx_add_sublast (re_sub_match_top_t *subtop, int node, int str_idx)\n }\n \n static void\n-internal_function\n sift_ctx_init (re_sift_context_t *sctx, re_dfastate_t **sifted_sts,\n \t       re_dfastate_t **limited_sts, int last_node, int last_str_idx)\n {\ndiff --git a/posix/spawn_int.h b/posix/spawn_int.h\nindex c60eb948bb..6ada827f55 100644\n--- a/posix/spawn_int.h\n+++ b/posix/spawn_int.h\n@@ -66,6 +66,6 @@ extern int __spawni (pid_t *pid, const char *path,\n \n /* Return true if FD falls into the range valid for file descriptors.\n    The check in this form is mandated by POSIX.  */\n-bool __spawn_valid_fd (int fd) internal_function attribute_hidden;\n+bool __spawn_valid_fd (int fd) attribute_hidden;\n \n #endif /* _SPAWN_INT_H */\ndiff --git a/posix/spawn_valid_fd.c b/posix/spawn_valid_fd.c\nindex eacabfc56d..6e1db5ac10 100644\n--- a/posix/spawn_valid_fd.c\n+++ b/posix/spawn_valid_fd.c\n@@ -21,7 +21,6 @@\n #include <unistd.h>\n \n bool\n-internal_function\n __spawn_valid_fd (int fd)\n {\n   long maxfd = __sysconf (_SC_OPEN_MAX);\ndiff --git a/posix/wordexp.c b/posix/wordexp.c\nindex dfc41736e6..e4cfce9460 100644\n--- a/posix/wordexp.c\n+++ b/posix/wordexp.c\n@@ -64,19 +64,16 @@ extern char **__libc_argv attribute_hidden;\n static int parse_dollars (char **word, size_t *word_length, size_t *max_length,\n \t\t\t  const char *words, size_t *offset, int flags,\n \t\t\t  wordexp_t *pwordexp, const char *ifs,\n-\t\t\t  const char *ifs_white, int quoted)\n-     internal_function;\n+\t\t\t  const char *ifs_white, int quoted);\n static int parse_backtick (char **word, size_t *word_length,\n \t\t\t   size_t *max_length, const char *words,\n \t\t\t   size_t *offset, int flags, wordexp_t *pwordexp,\n-\t\t\t   const char *ifs, const char *ifs_white)\n-     internal_function;\n+\t\t\t   const char *ifs, const char *ifs_white);\n static int parse_dquote (char **word, size_t *word_length, size_t *max_length,\n \t\t\t const char *words, size_t *offset, int flags,\n \t\t\t wordexp_t *pwordexp, const char *ifs,\n-\t\t\t const char *ifs_white)\n-     internal_function;\n-static int eval_expr (char *expr, long int *result) internal_function;\n+\t\t\t const char *ifs_white);\n+static int eval_expr (char *expr, long int *result);\n \n /* The w_*() functions manipulate word lists. */\n \n@@ -117,7 +114,6 @@ w_addchar (char *buffer, size_t *actlen, size_t *maxlen, char ch)\n }\n \n static char *\n-internal_function\n w_addmem (char *buffer, size_t *actlen, size_t *maxlen, const char *str,\n \t  size_t len)\n {\n@@ -144,7 +140,6 @@ w_addmem (char *buffer, size_t *actlen, size_t *maxlen, const char *str,\n }\n \n static char *\n-internal_function\n w_addstr (char *buffer, size_t *actlen, size_t *maxlen, const char *str)\n      /* (lengths exclude trailing zero) */\n {\n@@ -159,7 +154,6 @@ w_addstr (char *buffer, size_t *actlen, size_t *maxlen, const char *str)\n }\n \n static int\n-internal_function\n w_addword (wordexp_t *pwordexp, char *word)\n {\n   /* Add a word to the wordlist */\n@@ -200,7 +194,6 @@ no_space:\n  */\n \n static int\n-internal_function\n parse_backslash (char **word, size_t *word_length, size_t *max_length,\n \t\t const char *words, size_t *offset)\n {\n@@ -229,7 +222,6 @@ parse_backslash (char **word, size_t *word_length, size_t *max_length,\n }\n \n static int\n-internal_function\n parse_qtd_backslash (char **word, size_t *word_length, size_t *max_length,\n \t\t     const char *words, size_t *offset)\n {\n@@ -272,7 +264,6 @@ parse_qtd_backslash (char **word, size_t *word_length, size_t *max_length,\n }\n \n static int\n-internal_function\n parse_tilde (char **word, size_t *word_length, size_t *max_length,\n \t     const char *words, size_t *offset, size_t wordc)\n {\n@@ -379,7 +370,6 @@ parse_tilde (char **word, size_t *word_length, size_t *max_length,\n \n \n static int\n-internal_function\n do_parse_glob (const char *glob_word, char **word, size_t *word_length,\n \t       size_t *max_length, wordexp_t *pwordexp, const char *ifs,\n \t       const char *ifs_white)\n@@ -436,7 +426,6 @@ do_parse_glob (const char *glob_word, char **word, size_t *word_length,\n }\n \n static int\n-internal_function\n parse_glob (char **word, size_t *word_length, size_t *max_length,\n \t    const char *words, size_t *offset, int flags,\n \t    wordexp_t *pwordexp, const char *ifs, const char *ifs_white)\n@@ -532,7 +521,6 @@ tidy_up:\n }\n \n static int\n-internal_function\n parse_squote (char **word, size_t *word_length, size_t *max_length,\n \t      const char *words, size_t *offset)\n {\n@@ -554,7 +542,6 @@ parse_squote (char **word, size_t *word_length, size_t *max_length,\n \n /* Functions to evaluate an arithmetic expression */\n static int\n-internal_function\n eval_expr_val (char **expr, long int *result)\n {\n   char *digit;\n@@ -589,7 +576,6 @@ eval_expr_val (char **expr, long int *result)\n }\n \n static int\n-internal_function\n eval_expr_multdiv (char **expr, long int *result)\n {\n   long int arg;\n@@ -630,7 +616,6 @@ eval_expr_multdiv (char **expr, long int *result)\n }\n \n static int\n-internal_function\n eval_expr (char *expr, long int *result)\n {\n   long int arg;\n@@ -667,7 +652,6 @@ eval_expr (char *expr, long int *result)\n }\n \n static int\n-internal_function\n parse_arith (char **word, size_t *word_length, size_t *max_length,\n \t     const char *words, size_t *offset, int flags, int bracket)\n {\n@@ -817,7 +801,7 @@ parse_arith (char **word, size_t *word_length, size_t *max_length,\n \n /* Function called by child process in exec_comm() */\n static inline void\n-internal_function __attribute__ ((always_inline))\n+__attribute__ ((always_inline))\n exec_comm_child (char *comm, int *fildes, int showerr, int noexec)\n {\n   const char *args[4] = { _PATH_BSHELL, \"-c\", comm, NULL };\n@@ -875,7 +859,6 @@ exec_comm_child (char *comm, int *fildes, int showerr, int noexec)\n /* Function to execute a command and retrieve the results */\n /* pwordexp contains NULL if field-splitting is forbidden */\n static int\n-internal_function\n exec_comm (char *comm, char **word, size_t *word_length, size_t *max_length,\n \t   int flags, wordexp_t *pwordexp, const char *ifs,\n \t   const char *ifs_white)\n@@ -1109,7 +1092,6 @@ no_space:\n }\n \n static int\n-internal_function\n parse_comm (char **word, size_t *word_length, size_t *max_length,\n \t    const char *words, size_t *offset, int flags, wordexp_t *pwordexp,\n \t    const char *ifs, const char *ifs_white)\n@@ -1197,7 +1179,6 @@ parse_comm (char **word, size_t *word_length, size_t *max_length,\n   (memchr (char_set \"\", ch, sizeof (char_set) - 1) != NULL)\n \n static int\n-internal_function\n parse_param (char **word, size_t *word_length, size_t *max_length,\n \t     const char *words, size_t *offset, int flags, wordexp_t *pwordexp,\n \t     const char *ifs, const char *ifs_white, int quoted)\n@@ -2026,7 +2007,6 @@ do_error:\n #undef CHAR_IN_SET\n \n static int\n-internal_function\n parse_dollars (char **word, size_t *word_length, size_t *max_length,\n \t       const char *words, size_t *offset, int flags,\n \t       wordexp_t *pwordexp, const char *ifs, const char *ifs_white,\n@@ -2085,7 +2065,6 @@ parse_dollars (char **word, size_t *word_length, size_t *max_length,\n }\n \n static int\n-internal_function\n parse_backtick (char **word, size_t *word_length, size_t *max_length,\n \t\tconst char *words, size_t *offset, int flags,\n \t\twordexp_t *pwordexp, const char *ifs, const char *ifs_white)\n@@ -2149,7 +2128,6 @@ parse_backtick (char **word, size_t *word_length, size_t *max_length,\n }\n \n static int\n-internal_function\n parse_dquote (char **word, size_t *word_length, size_t *max_length,\n \t      const char *words, size_t *offset, int flags,\n \t      wordexp_t *pwordexp, const char * ifs, const char * ifs_white)\ndiff --git a/sysdeps/posix/ttyname.c b/sysdeps/posix/ttyname.c\nindex 288e22b307..b7497f3976 100644\n--- a/sysdeps/posix/ttyname.c\n+++ b/sysdeps/posix/ttyname.c\n@@ -28,13 +28,12 @@\n char *__ttyname;\n \n static char *getttyname (int fd, dev_t mydev, ino_t myino,\n-\t\t\t int save, int *dostat) internal_function;\n+\t\t\t int save, int *dostat);\n \n \n libc_freeres_ptr (static char *getttyname_name);\n \n static char *\n-internal_function\n getttyname (int fd, dev_t mydev, ino_t myino, int save, int *dostat)\n {\n   static const char dev[] = \"/dev\";\ndiff --git a/sysdeps/posix/ttyname_r.c b/sysdeps/posix/ttyname_r.c\nindex 56bf18e4bc..2d10bf65d6 100644\n--- a/sysdeps/posix/ttyname_r.c\n+++ b/sysdeps/posix/ttyname_r.c\n@@ -33,10 +33,9 @@ static const char dev[] = \"/dev\";\n \n static int getttyname_r (int fd, char *buf, size_t buflen,\n \t\t\t dev_t mydev, ino_t myino, int save,\n-\t\t\t int *dostat) __THROW internal_function;\n+\t\t\t int *dostat) __THROW;\n \n static int\n-internal_function\n getttyname_r (int fd, char *buf, size_t buflen, dev_t mydev, ino_t myino,\n \t      int save, int *dostat)\n {\ndiff --git a/sysdeps/unix/sysv/linux/preadv.c b/sysdeps/unix/sysv/linux/preadv.c\nindex ecabc8c9c6..d03ce8dc5c 100644\n--- a/sysdeps/unix/sysv/linux/preadv.c\n+++ b/sysdeps/unix/sysv/linux/preadv.c\n@@ -33,7 +33,7 @@ preadv (int fd, const struct iovec *vector, int count, off_t offset)\n }\n # else\n static ssize_t __atomic_preadv_replacement (int, const struct iovec *,\n-\t\t\t\t\t    int, off_t) internal_function;\n+\t\t\t\t\t    int, off_t);\n ssize_t\n preadv (int fd, const struct iovec *vector, int count, off_t offset)\n {\n@@ -45,7 +45,7 @@ preadv (int fd, const struct iovec *vector, int count, off_t offset)\n #  endif\n   return __atomic_preadv_replacement (fd, vector, count, offset);\n }\n-#  define PREADV static internal_function __atomic_preadv_replacement\n+#  define PREADV static __atomic_preadv_replacement\n #  define PREAD __pread\n #  define OFF_T off_t\n #  include <sysdeps/posix/preadv_common.c>\ndiff --git a/sysdeps/unix/sysv/linux/preadv64.c b/sysdeps/unix/sysv/linux/preadv64.c\nindex c96b2142e3..00997da99c 100644\n--- a/sysdeps/unix/sysv/linux/preadv64.c\n+++ b/sysdeps/unix/sysv/linux/preadv64.c\n@@ -31,7 +31,7 @@ preadv64 (int fd, const struct iovec *vector, int count, off64_t offset)\n }\n #else\n static ssize_t __atomic_preadv64_replacement (int, const struct iovec *,\n-\t\t\t\t\t      int, off64_t) internal_function;\n+\t\t\t\t\t      int, off64_t);\n ssize_t\n preadv64 (int fd, const struct iovec *vector, int count, off64_t offset)\n {\n@@ -43,7 +43,7 @@ preadv64 (int fd, const struct iovec *vector, int count, off64_t offset)\n #endif\n   return __atomic_preadv64_replacement (fd, vector, count, offset);\n }\n-# define PREADV static internal_function __atomic_preadv64_replacement\n+# define PREADV static __atomic_preadv64_replacement\n # define PREAD __pread64\n # define OFF_T off64_t\n # include <sysdeps/posix/preadv_common.c>\ndiff --git a/sysdeps/unix/sysv/linux/pwritev.c b/sysdeps/unix/sysv/linux/pwritev.c\nindex 7545cb3e1e..cfe65068ae 100644\n--- a/sysdeps/unix/sysv/linux/pwritev.c\n+++ b/sysdeps/unix/sysv/linux/pwritev.c\n@@ -33,7 +33,7 @@ pwritev (int fd, const struct iovec *vector, int count, off_t offset)\n }\n # else\n static ssize_t __atomic_pwritev_replacement (int, const struct iovec *,\n-\t\t\t\t\t     int, off_t) internal_function;\n+\t\t\t\t\t     int, off_t);\n ssize_t\n pwritev (int fd, const struct iovec *vector, int count, off_t offset)\n {\n@@ -45,7 +45,7 @@ pwritev (int fd, const struct iovec *vector, int count, off_t offset)\n #  endif\n   return __atomic_pwritev_replacement (fd, vector, count, offset);\n }\n-#  define PWRITEV static internal_function __atomic_pwritev_replacement\n+#  define PWRITEV static __atomic_pwritev_replacement\n #  define PWRITE __pwrite\n #  define OFF_T off_t\n #  include <sysdeps/posix/pwritev_common.c>\ndiff --git a/sysdeps/unix/sysv/linux/pwritev64.c b/sysdeps/unix/sysv/linux/pwritev64.c\nindex 9dc4e55f96..a7cec4e144 100644\n--- a/sysdeps/unix/sysv/linux/pwritev64.c\n+++ b/sysdeps/unix/sysv/linux/pwritev64.c\n@@ -31,7 +31,7 @@ pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset)\n }\n #else\n static ssize_t __atomic_pwritev64_replacement (int, const struct iovec *,\n-\t\t\t\t\t       int, off64_t) internal_function;\n+\t\t\t\t\t       int, off64_t);\n ssize_t\n pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset)\n {\n@@ -43,7 +43,7 @@ pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset)\n #endif\n   return __atomic_pwritev64_replacement (fd, vector, count, offset);\n }\n-# define PWRITEV static internal_function __atomic_pwritev64_replacement\n+# define PWRITEV static __atomic_pwritev64_replacement\n # define PWRITE __pwrite64\n # define OFF_T off64_t\n # include <sysdeps/posix/pwritev_common.c>\ndiff --git a/sysdeps/unix/sysv/linux/ttyname.c b/sysdeps/unix/sysv/linux/ttyname.c\nindex 5909cb765f..116cf350e5 100644\n--- a/sysdeps/unix/sysv/linux/ttyname.c\n+++ b/sysdeps/unix/sysv/linux/ttyname.c\n@@ -36,14 +36,12 @@ char *__ttyname;\n #endif\n \n static char *getttyname (const char *dev, dev_t mydev,\n-\t\t\t ino64_t myino, int save, int *dostat)\n-     internal_function;\n-\n+\t\t\t ino64_t myino, int save, int *dostat);\n \n libc_freeres_ptr (static char *getttyname_name);\n \n static char *\n-internal_function attribute_compat_text_section\n+attribute_compat_text_section\n getttyname (const char *dev, dev_t mydev, ino64_t myino, int save, int *dostat)\n {\n   static size_t namelen;\ndiff --git a/sysdeps/unix/sysv/linux/ttyname_r.c b/sysdeps/unix/sysv/linux/ttyname_r.c\nindex dc863526ba..18f35ef2b7 100644\n--- a/sysdeps/unix/sysv/linux/ttyname_r.c\n+++ b/sysdeps/unix/sysv/linux/ttyname_r.c\n@@ -32,10 +32,10 @@\n \n static int getttyname_r (char *buf, size_t buflen,\n \t\t\t dev_t mydev, ino64_t myino, int save,\n-\t\t\t int *dostat) internal_function;\n+\t\t\t int *dostat);\n \n static int\n-internal_function attribute_compat_text_section\n+attribute_compat_text_section\n getttyname_r (char *buf, size_t buflen, dev_t mydev, ino64_t myino,\n \t      int save, int *dostat)\n {\n",
    "prefixes": [
        "COMMITTED"
    ]
}