From 4bc5fbd480352653d10d4056d77750750fd5e0f3 Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Tue, 27 Mar 2001 15:31:46 +0000 Subject: [PATCH] system.h: Include symcat.h. * system.h: Include symcat.h. (STRINGIFY): Don't define. * configure.in: Adjust comment. * builtins.c: Use STRINGX, not STRINGIFY. * gencheck.c: Likewise. * gengenrtl.c: Likewise. * protoize.c: Likewise. * cpplex.c: Don't include symcat.h. * cpplib.c: Likewise. * gansidecl.h (HAVE_STRINGIZE): Don't define. From-SVN: r40875 --- gcc/ChangeLog | 17 +++++++++++++++++ gcc/builtins.c | 2 +- gcc/configure | 4 ++-- gcc/configure.in | 2 +- gcc/cpplex.c | 1 - gcc/cpplib.c | 1 - gcc/gansidecl.h | 5 ----- gcc/gencheck.c | 2 +- gcc/gengenrtl.c | 2 +- gcc/protoize.c | 2 +- gcc/system.h | 16 +--------------- 11 files changed, 25 insertions(+), 29 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 17590b26fe8..b67ace66a55 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,20 @@ +2001-03-27 Kaveh R. Ghazi + + * system.h: Include symcat.h. + (STRINGIFY): Don't define. + + * configure.in: Adjust comment. + + * builtins.c: Use STRINGX, not STRINGIFY. + * gencheck.c: Likewise. + * gengenrtl.c: Likewise. + * protoize.c: Likewise. + + * cpplex.c: Don't include symcat.h. + * cpplib.c: Likewise. + + * gansidecl.h (HAVE_STRINGIZE): Don't define. + 2001-03-27 Alan Modra * c-typeck.c (digest_init): Fold init expression. diff --git a/gcc/builtins.c b/gcc/builtins.c index 27804e2b8bf..88127ca7366 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -57,7 +57,7 @@ Boston, MA 02111-1307, USA. */ const char *const built_in_class_names[4] = {"NOT_BUILT_IN", "BUILT_IN_FRONTEND", "BUILT_IN_MD", "BUILT_IN_NORMAL"}; -#define DEF_BUILTIN(x) STRINGIFY(x), +#define DEF_BUILTIN(x) STRINGX(x), const char *const built_in_names[(int) END_BUILTINS] = { #include "builtins.def" diff --git a/gcc/configure b/gcc/configure index 87562fae71d..4e8e33c939d 100755 --- a/gcc/configure +++ b/gcc/configure @@ -2016,7 +2016,7 @@ EOF fi # Find some useful tools -for ac_prog in gawk mawk nawk awk +for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -3021,7 +3021,7 @@ fi fi # See if the stage1 system preprocessor understands the ANSI C -# preprocessor stringification operator. +# preprocessor stringification operator. (Used by symcat.h.) echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6 diff --git a/gcc/configure.in b/gcc/configure.in index a53bd4d71e5..a891a050421 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -522,7 +522,7 @@ else fi # See if the stage1 system preprocessor understands the ANSI C -# preprocessor stringification operator. +# preprocessor stringification operator. (Used by symcat.h.) AC_C_STRINGIZE # Use only if it exists, diff --git a/gcc/cpplex.c b/gcc/cpplex.c index d1b90764a43..efc0aa570c7 100644 --- a/gcc/cpplex.c +++ b/gcc/cpplex.c @@ -38,7 +38,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "system.h" #include "cpplib.h" #include "cpphash.h" -#include "symcat.h" /* Tokens with SPELL_STRING store their spelling in the token list, and it's length in the token->val.name.len. */ diff --git a/gcc/cpplib.c b/gcc/cpplib.c index 00fb1483cc0..5a523e034a1 100644 --- a/gcc/cpplib.c +++ b/gcc/cpplib.c @@ -26,7 +26,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "cpphash.h" #include "intl.h" #include "obstack.h" -#include "symcat.h" /* Chained list of answers to an assertion. */ struct answer diff --git a/gcc/gansidecl.h b/gcc/gansidecl.h index c64cee5bc2e..57d71a664d2 100644 --- a/gcc/gansidecl.h +++ b/gcc/gansidecl.h @@ -43,11 +43,6 @@ Boston, MA 02111-1307, USA. */ # ifndef HAVE_LONG_DOUBLE # define HAVE_LONG_DOUBLE 1 # endif -/* Assume that (non-traditional) gcc used in stage2 or later has the - stringize feature. */ -# if !defined (HAVE_STRINGIZE) && __STDC__ -# define HAVE_STRINGIZE 1 -# endif /* ! HAVE_STRINGIZE && __STDC__ */ #endif /* GCC >= 2.7 */ #ifndef NULL_PTR diff --git a/gcc/gencheck.c b/gcc/gencheck.c index df6238bcf96..bfd8c366d66 100644 --- a/gcc/gencheck.c +++ b/gcc/gencheck.c @@ -21,7 +21,7 @@ Boston, MA 02111-1307, USA. */ #include "hconfig.h" #include "system.h" -#define DEFTREECODE(SYM, NAME, TYPE, LEN) STRINGIFY(SYM), +#define DEFTREECODE(SYM, NAME, TYPE, LEN) STRINGX(SYM), const char *tree_codes[] = { #include "tree.def" diff --git a/gcc/gengenrtl.c b/gcc/gengenrtl.c index b04d08118e7..d656b4aca3c 100644 --- a/gcc/gengenrtl.c +++ b/gcc/gengenrtl.c @@ -98,7 +98,7 @@ struct rtx_definition const char *enumname, *name, *format; }; -#define DEF_RTL_EXPR(ENUM, NAME, FORMAT, CLASS) { STRINGIFY(ENUM), NAME, FORMAT }, +#define DEF_RTL_EXPR(ENUM, NAME, FORMAT, CLASS) { STRINGX(ENUM), NAME, FORMAT }, struct rtx_definition defs[] = { diff --git a/gcc/protoize.c b/gcc/protoize.c index aa03edf233f..08ec7525678 100644 --- a/gcc/protoize.c +++ b/gcc/protoize.c @@ -278,7 +278,7 @@ static const char * const other_var_style = "stdarg"; static const char * const other_var_style = "varargs"; /* Note that this is a string containing the expansion of va_alist. But in `main' we discard all but the first token. */ -static const char *varargs_style_indicator = STRINGIFY (va_alist); +static const char *varargs_style_indicator = STRINGX (va_alist); #endif /* !defined (UNPROTOIZE) */ /* The following two types are used to create hash tables. In this program, diff --git a/gcc/system.h b/gcc/system.h index da9046a7fe4..516ad5c3025 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -355,21 +355,6 @@ extern void abort PARAMS ((void)); #endif - -/* Define a STRINGIFY macro that's right for ANSI or traditional C. - Note: if the argument passed to STRINGIFY is itself a macro, eg - #define foo bar, STRINGIFY(foo) will produce "foo", not "bar". - Although the __STDC__ case could be made to expand this via a layer - of indirection, the traditional C case can not do so. Therefore - this behavior is not supported. */ -#ifndef STRINGIFY -# ifdef HAVE_STRINGIZE -# define STRINGIFY(STRING) #STRING -# else -# define STRINGIFY(STRING) "STRING" -# endif -#endif /* ! STRINGIFY */ - #if HAVE_SYS_STAT_H # include #endif @@ -481,6 +466,7 @@ extern void abort PARAMS ((void)); /* Get libiberty declarations. */ #include "libiberty.h" +#include "symcat.h" /* Provide a default for the HOST_BIT_BUCKET. This suffices for POSIX-like hosts. */ -- 2.30.2