[glibc/google/grte/v5-2.27/master] Use libc_hidden_* for argz_next, __argz_next (bug 15105).

[Fangrui Song <maskray@sourceware.org>]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=14cb6e06ebc50572b34f4a22b132875674440a19

commit 14cb6e06ebc50572b34f4a22b132875674440a19
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Thu Feb 15 21:00:02 2018 +0000

    Use libc_hidden_* for argz_next, __argz_next (bug 15105).
    
    Among other localplt test failures when building with -Os, there are
    libc.so PLT references for argz_next and __argz_next.  This is a
    simple case of functions that are inlined for -O2 but not for -Os;
    this patch adds libc_hidden_proto / libc_hidden_def for them to avoid
    localplt failures even when not inlined.
    
    Tested for x86_64 (both that it removes these particular localplt
    failures for -Os - but other such failures remain so the bug can't yet
    be closed - and that the testsuite continues to pass without -Os).
    
            [BZ #15105]
            * include/argz.h (argz_next): Use libc_hidden_proto.
            (__argz_next): Likewise.
            * string-argz-next.c (__argz_next): Use libc_hidden_def.
            (argz_next): Use libc_hidden_weak.
    
    (cherry picked from commit 055ac2a7eeb14755e946440af3d2cdfe95f18f8e)

Diff:
---
 include/argz.h     | 2 ++
 string/argz-next.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/include/argz.h b/include/argz.h
index 770f02eefb..e081b2aceb 100644
--- a/include/argz.h
+++ b/include/argz.h
@@ -39,6 +39,8 @@ extern error_t __argz_replace (char **__restrict __argz,
 libc_hidden_proto (argz_delete)
 libc_hidden_proto (__argz_count)
 libc_hidden_proto (__argz_stringify)
+libc_hidden_proto (argz_next)
+libc_hidden_proto (__argz_next)
 
 # endif /* !_ISOMAC */
 #endif
diff --git a/string/argz-next.c b/string/argz-next.c
index abce45151a..9200eda4d9 100644
--- a/string/argz-next.c
+++ b/string/argz-next.c
@@ -36,4 +36,6 @@ __argz_next (const char *argz, size_t argz_len, const char *entry)
     else
       return NULL;
 }
+libc_hidden_def (__argz_next)
 weak_alias (__argz_next, argz_next)
+libc_hidden_weak (argz_next)