diff options
author | Joseph Myers <joseph@codesourcery.com> | 2018-02-19 17:32:34 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2018-02-19 17:32:34 +0000 |
commit | ec481ad81b0436460de417a8e0084935b3763ebb (patch) | |
tree | 528d4f8b06ffe536af6ec50afb144aff6d682bca /include | |
parent | 7d15ef84f50a80cb170f8ce3457010f59e221cb8 (diff) | |
download | glibc-ec481ad81b0436460de417a8e0084935b3763ebb.tar.gz |
Fix -Os ferror_unlocked linknamespace, localplt issues (bug 15105, bug 19463).
Continuing the fixes for linknamespace and localplt test failures with
-Os that arise from functions not being inlined in that case, this
patch fixes such failures for ferror_unlocked.
The usual approach is followed of adding __ferror_unlocked (inlined
when ferror_unlocked is), making calls use it when required for
namespace reasons (only one such call), and using libc_hidden_proto /
libc_hidden_weak for the ferror_unlocked weak alias when only localplt
but not namespace issues are involved.
Tested for x86_64 (both without -Os to make sure that case continues
to work, and with -Os to make sure all the relevant linknamespace and
localplt test failures are resolved). Because of other such failures
that remain after this patch, neither of the bugs can yet be closed.
[BZ #15105]
[BZ #19463]
* libio/ferror_u.c (ferror_unlocked): Rename to __ferror_unlocked
and define as weak alias of __ferror_unlocked. Use
libc_hidden_weak.
* include/stdio.h [!_ISOMAC] (ferror_unlocked): Use
libc_hidden_proto.
[!_ISOMAC] (__ferror_unlocked) New declaration, and inline
function if [__USE_EXTERN_INLINES].
* time/getdate.c (__getdate_r): Call __ferror_unlocked instead of
ferror_unlocked.
Diffstat (limited to 'include')
-rw-r--r-- | include/stdio.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/stdio.h b/include/stdio.h index 7871000071..1bf49a92b5 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -185,6 +185,8 @@ extern __typeof (fputs_unlocked) __fputs_unlocked; libc_hidden_proto (__fputs_unlocked) libc_hidden_proto (feof_unlocked) extern __typeof (feof_unlocked) __feof_unlocked attribute_hidden; +libc_hidden_proto (ferror_unlocked) +extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden; libc_hidden_proto (fmemopen) /* The prototype needs repeating instead of using __typeof to use __THROW in C++ tests. */ @@ -211,6 +213,12 @@ __NTH (__feof_unlocked (FILE *__stream)) { return __feof_unlocked_body (__stream); } + +__extern_inline int +__NTH (__ferror_unlocked (FILE *__stream)) +{ + return __ferror_unlocked_body (__stream); +} # endif # endif /* not _ISOMAC */ |