mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 08:30:00 +00:00
055ac2a7ee
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.
42 lines
1.3 KiB
C
42 lines
1.3 KiB
C
/* Iterate through the elements of an argz block.
|
|
Copyright (C) 1995-2018 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Written by Miles Bader <miles@gnu.org>
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <argz.h>
|
|
#include <string.h>
|
|
|
|
char *
|
|
__argz_next (const char *argz, size_t argz_len, const char *entry)
|
|
{
|
|
if (entry)
|
|
{
|
|
if (entry < argz + argz_len)
|
|
entry = strchr (entry, '\0') + 1;
|
|
|
|
return entry >= argz + argz_len ? NULL : (char *) entry;
|
|
}
|
|
else
|
|
if (argz_len > 0)
|
|
return (char *) argz;
|
|
else
|
|
return NULL;
|
|
}
|
|
libc_hidden_def (__argz_next)
|
|
weak_alias (__argz_next, argz_next)
|
|
libc_hidden_weak (argz_next)
|