From 9974098acc28f657f5c8d7de8948a37ee821e4be Mon Sep 17 00:00:00 2001 From: Richard Kenner Date: Wed, 9 Oct 1996 16:26:20 -0400 Subject: [PATCH] (DOLLARS_IN_IDENTIFIERS): Remove. From-SVN: r12936 --- gcc/config/i386/dgux.h | 14 +++----------- gcc/config/m68k/apollo68.h | 4 ---- gcc/config/m88k/m88k.h | 8 ++------ gcc/config/mips/mips.h | 11 ----------- gcc/config/nextstep.h | 5 ----- gcc/config/pa/pa.h | 3 --- gcc/config/vax/ultrix.h | 3 --- gcc/config/vax/vms.h | 3 --- gcc/cpplib.h | 15 ++++----------- 9 files changed, 9 insertions(+), 57 deletions(-) diff --git a/gcc/config/i386/dgux.h b/gcc/config/i386/dgux.h index 7df0dbff9f0..92ba17617e0 100644 --- a/gcc/config/i386/dgux.h +++ b/gcc/config/i386/dgux.h @@ -1,7 +1,6 @@ /* Target definitions for GNU compiler for Intel 80x86 running DG/ux - Copyright (C) 1993, 1995 Free Software Foundation, Inc. - - Currently maintained by (gcc@dg-rtp.dg.com) + Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc. + Currently maintained by gcc@dg-rtp.dg.com. This file is part of GNU CC. @@ -26,7 +25,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "i386/sysv4.h" #ifndef VERSION_INFO2 -#define VERSION_INFO2 "$Revision: 1.3 $" +#define VERSION_INFO2 "$Revision: 1.4 $" #endif #ifndef VERSION_STRING @@ -91,13 +90,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #define WCHAR_TYPE_SIZE BITS_PER_WORD -/* Define this to be nonzero if the character `$' should be allowed - by default in identifier names. DG/ux does this differently than - standard i386 */ - -#undef DOLLARS_IN_IDENTIFIERS -#define DOLLARS_IN_IDENTIFIERS 1 - /* Some machines may desire to change what optimizations are performed for various optimization levels. This macro, if defined, is executed once just after the optimization level is determined and before the remainder diff --git a/gcc/config/m68k/apollo68.h b/gcc/config/m68k/apollo68.h index caaaeff4313..2e43dbd6637 100644 --- a/gcc/config/m68k/apollo68.h +++ b/gcc/config/m68k/apollo68.h @@ -87,10 +87,6 @@ Boston, MA 02111-1307, USA. */ #define IDENT_DIRECTIVE #define ASM_OUTPUT_IDENT(FILE, NAME) -/* Allow dollarsigns in identifiers */ - -#define DOLLARS_IN_IDENTIFIERS 2 - /* -m68000 requires special flags to the assembler. */ #define ASM_SPEC \ diff --git a/gcc/config/m88k/m88k.h b/gcc/config/m88k/m88k.h index 9f08f73f414..600ca6355a1 100644 --- a/gcc/config/m88k/m88k.h +++ b/gcc/config/m88k/m88k.h @@ -198,13 +198,13 @@ extern char * reg_names[]; Redefined in sysv4.h, and luna.h. */ #define VERSION_INFO1 "m88k, " #ifndef VERSION_INFO2 -#define VERSION_INFO2 "$Revision: 1.70 $" +#define VERSION_INFO2 "$Revision: 1.71 $" #endif #ifndef VERSION_STRING #define VERSION_STRING version_string #ifdef __STDC__ -#define TM_RCS_ID "@(#)" __FILE__ " $Revision: 1.70 $ " __DATE__ +#define TM_RCS_ID "@(#)" __FILE__ " $Revision: 1.71 $ " __DATE__ #else #define TM_RCS_ID "$What: <@(#) m88k.h,v 1.1.1.2.2.2> $" #endif /* __STDC__ */ @@ -1708,10 +1708,6 @@ enum reg_class { NO_REGS, AP_REG, XRF_REGS, GENERAL_REGS, AGRF_REGS, (COST) -= 4; /* 88110 store reservation station. */ \ } while (0) -/* Define this to be nonzero if the character `$' should be allowed - by default in identifier names. */ -#define DOLLARS_IN_IDENTIFIERS 1 - /* Do not break .stabs pseudos into continuations. */ #define DBX_CONTIN_LENGTH 0 diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h index e2c5883cd25..1b360c8f671 100644 --- a/gcc/config/mips/mips.h +++ b/gcc/config/mips/mips.h @@ -2723,17 +2723,6 @@ while (0) #define TRULY_NOOP_TRUNCATION(OUTPREC, INPREC) \ (TARGET_64BIT ? ((INPREC) <= 32 || (OUTPREC) > 32) : 1) -/* Define this macro to control use of the character `$' in - identifier names. The value should be 0, 1, or 2. 0 means `$' - is not allowed by default; 1 means it is allowed by default if - `-traditional' is used; 2 means it is allowed by default provided - `-ansi' is not used. 1 is the default; there is no need to - define this macro in that case. */ - -#ifndef DOLLARS_IN_IDENTIFIERS -#define DOLLARS_IN_IDENTIFIERS 1 -#endif - /* Specify the machine mode that pointers have. After generation of rtl, the compiler makes no further distinction between pointers and any other objects of this machine mode. */ diff --git a/gcc/config/nextstep.h b/gcc/config/nextstep.h index 8ef3001ec7f..ca995514d7e 100644 --- a/gcc/config/nextstep.h +++ b/gcc/config/nextstep.h @@ -152,11 +152,6 @@ Boston, MA 02111-1307, USA. */ %{p:%e-p profiling is no longer supported. Use -pg instead.} \ %{!p:-lposixcrt0.o}}}" -/* Why not? */ - -#undef DOLLARS_IN_IDENTIFIERS -#define DOLLARS_IN_IDENTIFIERS 2 - /* Allow #sscs (but don't do anything). */ #define SCCS_DIRECTIVE diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h index f6910254927..0755df08862 100644 --- a/gcc/config/pa/pa.h +++ b/gcc/config/pa/pa.h @@ -246,9 +246,6 @@ extern int target_flags; #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}" #endif -/* Allow $ in identifiers. */ -#define DOLLARS_IN_IDENTIFIERS 2 - /* Make gcc agree with */ #define SIZE_TYPE "unsigned int" diff --git a/gcc/config/vax/ultrix.h b/gcc/config/vax/ultrix.h index 753e0f8e233..7181e5b0019 100644 --- a/gcc/config/vax/ultrix.h +++ b/gcc/config/vax/ultrix.h @@ -1,9 +1,6 @@ #undef CPP_PREDEFINES #define CPP_PREDEFINES " -Dvax -Dunix -Dultrix -Dbsd4_2 -D__vax -D__unix -D__ultrix -D__bsd4_2 -Asystem(unix) -Asystem(bsd) -Acpu(vax) -Amachine(vax)" -/* By default, allow $ to be part of an identifier. */ -#define DOLLARS_IN_IDENTIFIERS 1 - /* These are as defined in /usr/include/sys/stdtypes.h. These values are for ultrix 4.2 on the vax. */ #define SIZE_TYPE "unsigned int" diff --git a/gcc/config/vax/vms.h b/gcc/config/vax/vms.h index be47b3676f9..b9a242b27fe 100644 --- a/gcc/config/vax/vms.h +++ b/gcc/config/vax/vms.h @@ -59,9 +59,6 @@ Boston, MA 02111-1307, USA. */ #define DEFAULT_GDB_EXTENSIONS 0 -/* By default, allow $ to be part of an identifier. */ -#define DOLLARS_IN_IDENTIFIERS 2 - #define TARGET_DEFAULT 1 #define TARGET_NAME "vax/vms" diff --git a/gcc/cpplib.h b/gcc/cpplib.h index aa3e327e0e0..d802a4adff0 100644 --- a/gcc/cpplib.h +++ b/gcc/cpplib.h @@ -1,5 +1,5 @@ /* Definitions for CPP library. - Copyright (C) 1995 Free Software Foundation, Inc. + Copyright (C) 1995, 1996 Free Software Foundation, Inc. Written by Per Bothner, 1994-95. This program is free software; you can redistribute it and/or modify it @@ -423,17 +423,10 @@ struct cpp_options { so don't look for #include "foo" the source-file directory. */ char ignore_srcdir; -/* Zero means dollar signs are punctuation. - -$ stores 0; -traditional may store 1. Default is 1 for VMS, 0 otherwise. - This must be 0 for correct processing of this ANSI C program: - #define foo(a) #a - #define lose(b) foo (b) - #define test$ - lose (test) */ + /* Zero means dollar signs are punctuation. + This used to be needed for conformance to the C Standard, + before the C Standard was corrected. */ char dollars_in_ident; -#ifndef DOLLARS_IN_IDENTIFIERS -#define DOLLARS_IN_IDENTIFIERS 1 -#endif /* Nonzero means try to imitate old fashioned non-ANSI preprocessor. */ char traditional;