about summary refs log tree commit diff
path: root/string/argz-next.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2018-02-15 21:00:02 +0000
committerJoseph Myers <joseph@codesourcery.com>2018-02-15 21:00:02 +0000
commit055ac2a7eeb14755e946440af3d2cdfe95f18f8e (patch)
treef1ff1cbd4cb3a5d5514b52ed7e0b86132f72c99a /string/argz-next.c
parente4452a2d19279d4c90bcafe09ec3cbfd3efe9b6a (diff)
downloadglibc-055ac2a7eeb14755e946440af3d2cdfe95f18f8e.tar.gz
glibc-055ac2a7eeb14755e946440af3d2cdfe95f18f8e.tar.xz
glibc-055ac2a7eeb14755e946440af3d2cdfe95f18f8e.zip
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.
Diffstat (limited to 'string/argz-next.c')
-rw-r--r--string/argz-next.c2
1 files changed, 2 insertions, 0 deletions
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)