diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | catgets/Makefile | 3 | ||||
| -rw-r--r-- | include/libc-symbols.h | 13 | ||||
| -rw-r--r-- | locale/Makefile | 2 | ||||
| -rw-r--r-- | stdlib/strtol_l.c | 1 |
5 files changed, 20 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 8998b856d9..99243fbe29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2014-06-20 Roland McGrath <roland@hack.frob.com> + * include/libc-symbols.h (HAVE_CONFIG_H, STDC_HEADERS): New macros. + * catgets/Makefile (catgets-CPPFLAGS): Remove -DHAVE_CONFIG_H. + * locale/Makefile (CPPFLAGS-locale-programs): Likewise. + * stdlib/strtol_l.c [_LIBC] (STDC_HEADERS): Don't define it. + * nptl/allocatestack.c: Include <stack-aliasing.h>. * nptl/stack-aliasing.h: New file. * sysdeps/i386/i686/stack-aliasing.h: New file. diff --git a/catgets/Makefile b/catgets/Makefile index 50d972e65d..4a03eba377 100644 --- a/catgets/Makefile +++ b/catgets/Makefile @@ -46,8 +46,7 @@ include ../Rules $(objpfx)gencat: $(gencat-modules:%=$(objpfx)%.o) -catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"' \ - -DHAVE_CONFIG_H +catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"' CPPFLAGS-gencat = -DNOT_IN_libc diff --git a/include/libc-symbols.h b/include/libc-symbols.h index 4b233be0bd..03061aed9d 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -48,6 +48,19 @@ #include <config.h> +/* Define this for the benefit of portable GNU code that wants to check it. + Code that checks with #if will not #include <config.h> again, since we've + already done it (and this file is implicitly included in every compile, + via -include). Code that checks with #ifdef will #include <config.h>, + but that file should always be idempotent (i.e., it's just #define/#undef + and nothing else anywhere should be changing the macro state it touches), + so it's harmless. */ +#define HAVE_CONFIG_H 0 + +/* Define this for the benefit of portable GNU code that wants to check it. + Of course, it's never false when building libc! */ +#define STDC_HEADERS 1 + /* The symbols in all the user (non-_) macros are C symbols. */ #if !defined HAVE_ASM_WEAK_DIRECTIVE && !defined HAVE_ASM_WEAKEXT_DIRECTIVE diff --git a/locale/Makefile b/locale/Makefile index eeff2cbd78..e4c387836c 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -89,7 +89,7 @@ CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \ -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \ -DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \ -DLOCSRCDIR='"$(i18ndir)/locales"' \ - -DHAVE_CONFIG_H -DNOT_IN_libc + -DNOT_IN_libc CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts diff --git a/stdlib/strtol_l.c b/stdlib/strtol_l.c index c77b43dc0c..97351c5d3e 100644 --- a/stdlib/strtol_l.c +++ b/stdlib/strtol_l.c @@ -24,7 +24,6 @@ #ifdef _LIBC # define USE_NUMBER_GROUPING -# define STDC_HEADERS # define HAVE_LIMITS_H #endif |