diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2018-02-21 18:02:24 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2018-02-21 18:02:24 +0000 |
| commit | 039c721a30392790be50dba53b4c72dbcd65be67 (patch) | |
| tree | a8be73b53e7fce5e920e40bd2ac212719441f614 /include | |
| parent | 30ac923dbe7d0c16df8a368150ecd736557508f4 (diff) | |
| download | glibc-039c721a30392790be50dba53b4c72dbcd65be67.tar.gz glibc-039c721a30392790be50dba53b4c72dbcd65be67.tar.xz glibc-039c721a30392790be50dba53b4c72dbcd65be67.zip | |
Fix -Os putc_unlocked, fputc_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 putc_unlocked and fputc_unlocked. libc_hidden_* are used for both functions, while namespace issues are addressed by making putc_unlocked a weak alias of hidden __putc_unlocked, which is called in the one place where namespace issues arise (and defined as an inline function in include/stdio.h). 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). This completes fixing the -Os linknamespace failures (at least for x86_64); localplt failures remain after this patch. 2018-02-19 Joseph Myers <joseph@codesourcery.com> [BZ #15105] [BZ #19463] * libio/fputc_u.c (fputc_unlocked): Use libc_hidden_def. * libio/putc_u.c (putc_unlocked): Rename to __putc_unlocked and define as weak alias of __putc_unlocked. Use libc_hidden_weak. * include/stdio.h [!_ISOMAC] (fputc_unlocked): Use libc_hidden_proto. [!_ISOMAC] (putc_unlocked): Likewise. [!_ISOMAC] (__putc_unlocked): Declare as hidden function, and define inline if [__USE_EXTERN_INLINES]. * misc/syslog.c (__vsyslog_chk): Call __putc_unlocked instead of putc_unlocked.
Diffstat (limited to 'include')
| -rw-r--r-- | include/stdio.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/stdio.h b/include/stdio.h index 937235f59a..aac5acdb2f 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -188,6 +188,9 @@ extern __typeof (feof_unlocked) __feof_unlocked attribute_hidden; libc_hidden_proto (ferror_unlocked) extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden; libc_hidden_proto (getc_unlocked) +libc_hidden_proto (fputc_unlocked) +libc_hidden_proto (putc_unlocked) +extern __typeof (putc_unlocked) __putc_unlocked attribute_hidden; libc_hidden_proto (fmemopen) /* The prototype needs repeating instead of using __typeof to use __THROW in C++ tests. */ @@ -226,6 +229,12 @@ __getc_unlocked (FILE *__fp) { return __getc_unlocked_body (__fp); } + +__extern_inline int +__putc_unlocked (int __c, FILE *__stream) +{ + return __putc_unlocked_body (__c, __stream); +} # endif # endif /* not _ISOMAC */ |