diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-07-06 14:58:51 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-07-06 14:58:51 -0500 |
| commit | 79e419de6261c4e04785908828096cb4d56b8680 (patch) | |
| tree | 72f17165f0acb9ad42eb45c801acfd7624570c5c | |
| parent | f9b87aaf109366342777521fe93fe9f795e8f1fa (diff) | |
| download | cygnal-79e419de6261c4e04785908828096cb4d56b8680.tar.gz cygnal-79e419de6261c4e04785908828096cb4d56b8680.tar.bz2 cygnal-79e419de6261c4e04785908828096cb4d56b8680.zip | |
Rework handling of basename variants
As a commonly-included header, the #define basename in <string.h> can
affect code which uses "basename" for its own purposes (e.g. struct
members or C++ namespaced functions). When such cases occur and some
code includes <string.h> and some not, then errors result. OTOH,
<libgen.h> is rarely used, and that's where the renaming occurs in
glibc, so code using <libgen.h> should already be safe.
* libc/include/libgen.h (basename): Define as __xpg_basename
for source compatibility with glibc.
Declare with __ASMNAME("basename") for ABI compatibility.
* libc/include/string.h (basename): Define as basename for
source compatibility with glibc.
Declare with __ASMNAME("__gnu_basename") for ABI compatibility.
| -rw-r--r-- | newlib/ChangeLog | 9 | ||||
| -rw-r--r-- | newlib/libc/include/libgen.h | 5 | ||||
| -rw-r--r-- | newlib/libc/include/string.h | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 994f1ca0e..24a6c9c58 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,12 @@ +2015-07-06 Yaakov Selkowitz <yselkowi@redhat.com> + + * libc/include/libgen.h (basename): Define as __xpg_basename + for source compatibility with glibc. + Declare with __ASMNAME("basename") for ABI compatibility. + * libc/include/string.h (basename): Define as basename for + source compatibility with glibc. + Declare with __ASMNAME("__gnu_basename") for ABI compatibility. + 2015-07-06 Corinna Vinschen <corinna@vinschen.de> * libc/include/sys/time.h: Explicitely include sys/cdefs.h. diff --git a/newlib/libc/include/libgen.h b/newlib/libc/include/libgen.h index de70b5b2f..3c717c5b0 100644 --- a/newlib/libc/include/libgen.h +++ b/newlib/libc/include/libgen.h @@ -6,6 +6,7 @@ #define _LIBGEN_H_ #include "_ansi.h" +#include <sys/cdefs.h> #include <sys/reent.h> #ifdef __cplusplus @@ -24,8 +25,8 @@ extern "C" { this also implies that the POSIX version is used in this case. That's made sure here. */ #undef basename -#define basename basename -char *_EXFUN(basename, (char *)); +#define basename __xpg_basename +char *_EXFUN(basename, (char *)) __asm__(__ASMNAME("basename")); char *_EXFUN(dirname, (char *)); #ifdef __cplusplus diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h index 92e08aebc..84dd6b0ce 100644 --- a/newlib/libc/include/string.h +++ b/newlib/libc/include/string.h @@ -175,8 +175,8 @@ int _EXFUN(strtosigno, (const char *__name)); this also implies that the POSIX version is used in this case. That's made sure here. */ #if __GNU_VISIBLE && !defined(basename) -char *_EXFUN(__nonnull (1) __gnu_basename,(const char *)); -# define basename __gnu_basename +# define basename basename +char *_EXFUN(__nonnull (1) basename,(const char *)) __asm__(__ASMNAME("__gnu_basename")); #endif #include <sys/string.h> |