AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 23:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use libc_hidden_* for argz_next, __argz_next (bug 15105).

Browse Source 
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 055ac2a7ee)
This commit is contained in:
Joseph Myers 2018-02-15 21:00:02 +00:00 committed by Fangrui Song
parent 633d14073f
commit bf291348a7
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/argz.h
View File

@ -39,6 +39,8 @@ extern error_t __argz_replace (char **__restrict __argz,
libc_hidden_proto (argz_delete) libc_hidden_proto (argz_delete)
libc_hidden_proto (__argz_count) libc_hidden_proto (__argz_count)
libc_hidden_proto (__argz_stringify) libc_hidden_proto (__argz_stringify)
libc_hidden_proto (argz_next)
libc_hidden_proto (__argz_next)
# endif /* !_ISOMAC */ # endif /* !_ISOMAC */
#endif #endif

2
string/argz-next.c
View File

@ -36,4 +36,6 @@ __argz_next (const char *argz, size_t argz_len, const char *entry)
else else
return NULL; return NULL;
} }
libc_hidden_def (__argz_next)
weak_alias (__argz_next, argz_next) weak_alias (__argz_next, argz_next)
libc_hidden_weak (argz_next)