From 74d06cf221682acc2ce3f55b52020e63c88f5a68 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Wed, 17 Jul 2002 21:31:42 +0000 Subject: cpplib.c (do_sccs): Handle #sccs on all systems. * cpplib.c (do_sccs): Handle #sccs on all systems. * system.h (SCCS_DIRECTIVE): Poison. * config/darwin.h, config/freebsd.h, config/netbsd.h, config/ptx4.h, config/svr3.h, config/svr4.h, config/alpha/elf.h, config/arm/linux-elf.h, config/c4x/c4x.h, config/d30v/d30v.h, config/i370/i370.h, config/i386/gas.h, config/i386/sco5.h, config/i960/i960.h, config/m68hc11/m68hc11.h, config/m68k/3b1.h, config/m68k/3b1g.h, config/m68k/crds.h, config/m68k/mot3300.h, config/m68k/pbb.h, config/m88k/m88k.h, config/mips/mips.h, config/sparc/pbd.h, config/stormy16/stormy16.h, config/vax/vaxv.h: Remove all references to SCCS_DIRECTIVE. * doc/cpp.texi, doc/tm.texi: Update. From-SVN: r55542 --- gcc/ChangeLog | 15 +++++++++++++++ gcc/config/alpha/elf.h | 3 --- gcc/config/arm/linux-elf.h | 3 --- gcc/config/c4x/c4x.h | 4 ---- gcc/config/d30v/d30v.h | 6 ------ gcc/config/darwin.h | 4 ---- gcc/config/freebsd.h | 4 ---- gcc/config/i370/i370.h | 3 --- gcc/config/i386/gas.h | 4 ---- gcc/config/i386/sco5.h | 3 --- gcc/config/i960/i960.h | 3 --- gcc/config/m68hc11/m68hc11.h | 3 --- gcc/config/m68k/3b1.h | 4 ---- gcc/config/m68k/3b1g.h | 3 --- gcc/config/m68k/crds.h | 4 ---- gcc/config/m68k/mot3300.h | 4 ---- gcc/config/m68k/pbb.h | 4 ---- gcc/config/m88k/m88k.h | 3 --- gcc/config/mips/mips.h | 3 --- gcc/config/netbsd.h | 5 ----- gcc/config/ptx4.h | 4 ---- gcc/config/sparc/pbd.h | 4 ---- gcc/config/stormy16/stormy16.h | 6 ------ gcc/config/svr3.h | 4 ---- gcc/config/svr4.h | 4 ---- gcc/config/vax/vaxv.h | 4 ---- gcc/cpplib.c | 13 ++----------- gcc/doc/cpp.texi | 4 ++-- gcc/doc/tm.texi | 5 ----- gcc/system.h | 2 +- 30 files changed, 20 insertions(+), 115 deletions(-) (limited to 'gcc') diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 57d6846..01b605f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,18 @@ +2002-07-17 Neil Booth + + * cpplib.c (do_sccs): Handle #sccs on all systems. + * system.h (SCCS_DIRECTIVE): Poison. + * config/darwin.h, config/freebsd.h, config/netbsd.h, + config/ptx4.h, config/svr3.h, config/svr4.h, config/alpha/elf.h, + config/arm/linux-elf.h, config/c4x/c4x.h, config/d30v/d30v.h, + config/i370/i370.h, config/i386/gas.h, config/i386/sco5.h, + config/i960/i960.h, config/m68hc11/m68hc11.h, config/m68k/3b1.h, + config/m68k/3b1g.h, config/m68k/crds.h, config/m68k/mot3300.h, + config/m68k/pbb.h, config/m88k/m88k.h, config/mips/mips.h, + config/sparc/pbd.h, config/stormy16/stormy16.h, config/vax/vaxv.h: + Remove all references to SCCS_DIRECTIVE. + * doc/cpp.texi, doc/tm.texi: Update. + Wed Jul 17 19:23:32 2002 J"orn Rennecke * regrename.c (maybe_mode_change): New function. diff --git a/gcc/config/alpha/elf.h b/gcc/config/alpha/elf.h index 486124a..180fbcb 100644 --- a/gcc/config/alpha/elf.h +++ b/gcc/config/alpha/elf.h @@ -68,9 +68,6 @@ do { \ #undef IDENT_ASM_OP #define IDENT_ASM_OP "\t.ident\t" -/* Allow #sccs in preprocessor. */ -#define SCCS_DIRECTIVE - /* Output #ident as a .ident. */ #undef ASM_OUTPUT_IDENT #define ASM_OUTPUT_IDENT(FILE, NAME) \ diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h index 6733564..792ea73 100644 --- a/gcc/config/arm/linux-elf.h +++ b/gcc/config/arm/linux-elf.h @@ -99,9 +99,6 @@ Boston, MA 02111-1307, USA. */ builtin_assert ("system=posix"); \ } while (0) -/* Allow #sccs in preprocessor. */ -#define SCCS_DIRECTIVE - /* This is how we tell the assembler that two symbols have the same value. */ #define ASM_OUTPUT_DEF(FILE, NAME1, NAME2) \ do \ diff --git a/gcc/config/c4x/c4x.h b/gcc/config/c4x/c4x.h index 3115677..63d80b2 100644 --- a/gcc/config/c4x/c4x.h +++ b/gcc/config/c4x/c4x.h @@ -1793,10 +1793,6 @@ do { \ #define DOUBLE_TYPE_SIZE 32 #define LONG_DOUBLE_TYPE_SIZE 64 /* Actually only 40. */ -/* Allow #sccs in preprocessor. */ - -#define SCCS_DIRECTIVE - /* Output #ident as a .ident. */ #define ASM_OUTPUT_IDENT(FILE, NAME) \ diff --git a/gcc/config/d30v/d30v.h b/gcc/config/d30v/d30v.h index 45b9e7b..44d70fb 100644 --- a/gcc/config/d30v/d30v.h +++ b/gcc/config/d30v/d30v.h @@ -4286,12 +4286,6 @@ fprintf (STREAM, "\t.word .L%d\n", VALUE) should be used on RISC machines. */ /* #define INTEGRATE_THRESHOLD(DECL) */ -/* Define this if the preprocessor should ignore `#sccs' directives and print - no error message. - - Defined in svr4.h. */ -/* #define SCCS_DIRECTIVE */ - /* Define this macro if the system header files support C++ as well as C. This macro inhibits the usual method of using system header files in C++, which is to pretend that the file's contents are enclosed in `extern "C" {...}'. */ diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index 44d69d4..339fb6b 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -103,10 +103,6 @@ Boston, MA 02111-1307, USA. */ #undef DOLLARS_IN_IDENTIFIERS #define DOLLARS_IN_IDENTIFIERS 2 -/* Allow #sccs (but don't do anything). */ - -#define SCCS_DIRECTIVE - /* We use Dbx symbol format. */ #define DBX_DEBUGGING_INFO diff --git a/gcc/config/freebsd.h b/gcc/config/freebsd.h index 99ee6ae..285f5bf 100644 --- a/gcc/config/freebsd.h +++ b/gcc/config/freebsd.h @@ -67,10 +67,6 @@ Boston, MA 02111-1307, USA. */ #undef NO_IMPLICIT_EXTERN_C #define NO_IMPLICIT_EXTERN_C 1 -/* Allow #sccs in preprocessor. */ -#undef SCCS_DIRECTIVE -#define SCCS_DIRECTIVE 1 - /* Make gcc agree with FreeBSD's standard headers (, etc...) */ #undef WCHAR_TYPE diff --git a/gcc/config/i370/i370.h b/gcc/config/i370/i370.h index f29fae7..3b7a798 100644 --- a/gcc/config/i370/i370.h +++ b/gcc/config/i370/i370.h @@ -1905,9 +1905,6 @@ abort(); \ ( (OUTPUT) = (char *) alloca (strlen ((NAME)) + 10), \ sprintf ((OUTPUT), "%s.%d", (NAME), (LABELNO))) -/* Allow #sccs in preprocessor. */ -#define SCCS_DIRECTIVE - /* Implicit library calls should use memcpy, not bcopy, etc. */ #define TARGET_MEM_FUNCTIONS diff --git a/gcc/config/i386/gas.h b/gcc/config/i386/gas.h index 1f9de01..7c15e0b 100644 --- a/gcc/config/i386/gas.h +++ b/gcc/config/i386/gas.h @@ -45,10 +45,6 @@ Boston, MA 02111-1307, USA. */ #define SDB_DEBUGGING_INFO -/* Allow #sccs in preprocessor. */ - -#define SCCS_DIRECTIVE - /* Output #ident as a .ident. */ #define ASM_OUTPUT_IDENT(FILE, NAME) fprintf (FILE, "\t.ident \"%s\"\n", NAME); diff --git a/gcc/config/i386/sco5.h b/gcc/config/i386/sco5.h index f1f34f9..53b1a18 100644 --- a/gcc/config/i386/sco5.h +++ b/gcc/config/i386/sco5.h @@ -541,9 +541,6 @@ init_section () \ do { fputs ("\t.weak\t", FILE); assemble_name (FILE, NAME); \ fputc ('\n', FILE); } while (0) -#undef SCCS_DIRECTIVE -#define SCCS_DIRECTIVE 1 - /* * Define sizes and types */ diff --git a/gcc/config/i960/i960.h b/gcc/config/i960/i960.h index ee1c606..b048d99 100644 --- a/gcc/config/i960/i960.h +++ b/gcc/config/i960/i960.h @@ -1151,9 +1151,6 @@ struct cum_args { int ca_nregparms; int ca_nstackparms; }; /* Define this as 1 if `char' should by default be signed; else as 0. */ #define DEFAULT_SIGNED_CHAR 0 -/* Allow and ignore #sccs directives. */ -#define SCCS_DIRECTIVE - /* Max number of bytes we can move from memory to memory in one reasonably fast instruction. */ #define MOVE_MAX 16 diff --git a/gcc/config/m68hc11/m68hc11.h b/gcc/config/m68hc11/m68hc11.h index 18a5ae5..0dec6e6 100644 --- a/gcc/config/m68hc11/m68hc11.h +++ b/gcc/config/m68hc11/m68hc11.h @@ -1706,9 +1706,6 @@ do { \ purposes) so give the MEM rtx a byte's mode. */ #define FUNCTION_MODE QImode -/* define SCCS_DIRECTIVE if SCCS directives should be ignored */ -#define SCCS_DIRECTIVE 1 - /* Allow $ in identifiers */ #define DOLLARS_IN_IDENTIFIERS 1 diff --git a/gcc/config/m68k/3b1.h b/gcc/config/m68k/3b1.h index 74aec11..898ece1 100644 --- a/gcc/config/m68k/3b1.h +++ b/gcc/config/m68k/3b1.h @@ -50,10 +50,6 @@ Boston, MA 02111-1307, USA. */ "%{!shlib:%{pg:mcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}}\ %{shlib:crt0s.o%s shlib.ifile%s} " -/* cpp has to support a #sccs directive for the /usr/include files */ - -#define SCCS_DIRECTIVE - /* Make output for SDB. */ #define SDB_DEBUGGING_INFO diff --git a/gcc/config/m68k/3b1g.h b/gcc/config/m68k/3b1g.h index f13d263..5aecd46 100644 --- a/gcc/config/m68k/3b1g.h +++ b/gcc/config/m68k/3b1g.h @@ -43,9 +43,6 @@ Boston, MA 02111-1307, USA. */ /* This is (not really) BSD, so (but) it wants DBX format. */ #define DBX_DEBUGGING_INFO -/* Brain damage. */ -#define SCCS_DIRECTIVE - /* Specify how to pad function arguments. Value should be `upward', `downward' or `none'. Same as the default, except no padding for large or variable-size args. */ diff --git a/gcc/config/m68k/crds.h b/gcc/config/m68k/crds.h index 03faa9f..563234c 100644 --- a/gcc/config/m68k/crds.h +++ b/gcc/config/m68k/crds.h @@ -68,10 +68,6 @@ Boston, MA 02111-1307, USA. */ #undef CC1_SPEC #define CC1_SPEC "%{O2:-fstrength-reduce}" -/* cpp has to support a #sccs directive for the /usr/include files */ - -#define SCCS_DIRECTIVE - /* Make output for SDB. */ /* #define SDB_DEBUGGING_INFO UNOS casm has no debugging :-( */ diff --git a/gcc/config/m68k/mot3300.h b/gcc/config/m68k/mot3300.h index 88e41fa..8868e6e 100644 --- a/gcc/config/m68k/mot3300.h +++ b/gcc/config/m68k/mot3300.h @@ -118,10 +118,6 @@ Boston, MA 02111-1307, USA. */ #undef PARM_BOUNDARY #define PARM_BOUNDARY 16 -/* cpp has to support a #sccs directive for the /usr/include files */ - -#define SCCS_DIRECTIVE - /* Make output for SDB. */ #define SDB_DEBUGGING_INFO diff --git a/gcc/config/m68k/pbb.h b/gcc/config/m68k/pbb.h index 37e3e23..01d96bc 100644 --- a/gcc/config/m68k/pbb.h +++ b/gcc/config/m68k/pbb.h @@ -83,10 +83,6 @@ Boston, MA 02111-1307, USA. */ #define ENDFILE_SPEC "crtn.o%s" -/* cpp has to support a #sccs directive for the /usr/include files */ - -#define SCCS_DIRECTIVE - /* GAS register prefix assembly syntax: */ /* User labels have no prefix */ diff --git a/gcc/config/m88k/m88k.h b/gcc/config/m88k/m88k.h index a4aba85..abfca76 100644 --- a/gcc/config/m88k/m88k.h +++ b/gcc/config/m88k/m88k.h @@ -1446,9 +1446,6 @@ enum reg_class { NO_REGS, AP_REG, XRF_REGS, GENERAL_REGS, AGRF_REGS, /* The 88open ABI says size_t is unsigned int. */ #define SIZE_TYPE "unsigned int" -/* Allow and ignore #sccs directives */ -#define SCCS_DIRECTIVE - /* Handle #pragma pack and sometimes #pragma weak. */ #define HANDLE_SYSV_PRAGMA diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h index 238f2b7..f57199c 100644 --- a/gcc/config/mips/mips.h +++ b/gcc/config/mips/mips.h @@ -4350,9 +4350,6 @@ do { \ #define ASM_OUTPUT_ASCII(STREAM, STRING, LEN) \ mips_output_ascii (STREAM, STRING, LEN) -/* Handle certain cpp directives used in header files on sysV. */ -#define SCCS_DIRECTIVE - /* Output #ident as a in the read-only data section. */ #undef ASM_OUTPUT_IDENT #define ASM_OUTPUT_IDENT(FILE, STRING) \ diff --git a/gcc/config/netbsd.h b/gcc/config/netbsd.h index 3f5d183..38eb749 100644 --- a/gcc/config/netbsd.h +++ b/gcc/config/netbsd.h @@ -128,11 +128,6 @@ Boston, MA 02111-1307, USA. */ fprintf ((STREAM), "void __fini() {\n\t%s();\n}\n", (FUNC)); \ } while (0) -/* Allow #sccs in preprocessor. */ - -#undef SCCS_DIRECTIVE -#define SCCS_DIRECTIVE - #undef TARGET_HAS_F_SETLKW #define TARGET_HAS_F_SETLKW diff --git a/gcc/config/ptx4.h b/gcc/config/ptx4.h index c30f3a5..d4a61de 100644 --- a/gcc/config/ptx4.h +++ b/gcc/config/ptx4.h @@ -180,10 +180,6 @@ Boston, MA 02111-1307, USA. %{!ansi:values-Xa.o%s} \ crtbegin.o%s" -/* Allow #sccs in preprocessor. */ - -#define SCCS_DIRECTIVE - /* Don't use bcopy, which doesn't handle overlaps before DYNIX/ptx 4.6. */ #undef HAVE_BCOPY diff --git a/gcc/config/sparc/pbd.h b/gcc/config/sparc/pbd.h index 9d267a5..18391ab 100644 --- a/gcc/config/sparc/pbd.h +++ b/gcc/config/sparc/pbd.h @@ -59,10 +59,6 @@ Boston, MA 02111-1307, USA. */ #define ENDFILE_SPEC "crtn.o%s" -/* cpp has to support a #sccs directive for the /usr/include files */ - -#define SCCS_DIRECTIVE - /* LINK_SPEC is needed only for SunOS 4. */ #undef LINK_SPEC diff --git a/gcc/config/stormy16/stormy16.h b/gcc/config/stormy16/stormy16.h index 3155997..8fe1892 100644 --- a/gcc/config/stormy16/stormy16.h +++ b/gcc/config/stormy16/stormy16.h @@ -3923,12 +3923,6 @@ do { \ should be used on RISC machines. */ /* #define INTEGRATE_THRESHOLD(DECL) */ -/* Define this if the preprocessor should ignore `#sccs' directives and print - no error message. - - Defined in svr4.h. */ -/* #define SCCS_DIRECTIVE */ - /* Define this macro if the system header files support C++ as well as C. This macro inhibits the usual method of using system header files in C++, which is to pretend that the file's contents are enclosed in `extern "C" {...}'. */ diff --git a/gcc/config/svr3.h b/gcc/config/svr3.h index 5a6f640..13e46b2 100644 --- a/gcc/config/svr3.h +++ b/gcc/config/svr3.h @@ -113,10 +113,6 @@ Boston, MA 02111-1307, USA. #define LINK_SPEC "%{T*} %{z:-lm}" #endif -/* Allow #sccs in preprocessor. */ - -#define SCCS_DIRECTIVE - /* Output #ident as a .ident. */ #undef ASM_OUTPUT_IDENT diff --git a/gcc/config/svr4.h b/gcc/config/svr4.h index 0964677..bc6a3b8 100644 --- a/gcc/config/svr4.h +++ b/gcc/config/svr4.h @@ -192,10 +192,6 @@ Boston, MA 02111-1307, USA. %{!ansi:values-Xa.o%s} \ crtbegin.o%s" -/* Allow #sccs in preprocessor. */ - -#define SCCS_DIRECTIVE - /* The numbers used to denote specific machine registers in the System V Release 4 DWARF debugging information are quite likely to be totally different from the numbers used in BSD stabs debugging information diff --git a/gcc/config/vax/vaxv.h b/gcc/config/vax/vaxv.h index a866152..7b8e7ff 100644 --- a/gcc/config/vax/vaxv.h +++ b/gcc/config/vax/vaxv.h @@ -18,10 +18,6 @@ along with GNU CC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Cope with these under SysV */ - -#define SCCS_DIRECTIVE - #define TARGET_OS_CPP_BUILTINS() \ do \ { \ diff --git a/gcc/cpplib.c b/gcc/cpplib.c index f61f7e6..c87572a 100644 --- a/gcc/cpplib.c +++ b/gcc/cpplib.c @@ -162,14 +162,7 @@ D(ident, T_IDENT, EXTENSION, IN_I) /* 11 */ \ D(import, T_IMPORT, EXTENSION, INCL | EXPAND) /* 0 ObjC */ \ D(assert, T_ASSERT, EXTENSION, 0) /* 0 SVR4 */ \ D(unassert, T_UNASSERT, EXTENSION, 0) /* 0 SVR4 */ \ -SCCS_ENTRY /* 0 SVR4? */ - -/* #sccs is not always recognized. */ -#ifdef SCCS_DIRECTIVE -# define SCCS_ENTRY D(sccs, T_SCCS, EXTENSION, 0) -#else -# define SCCS_ENTRY /* nothing */ -#endif +D(sccs, T_SCCS, EXTENSION, 0) /* 0 SVR4? */ /* Use the table to generate a series of prototypes, an enum for the directive names, and an array of directive handlers. */ @@ -1319,14 +1312,12 @@ _cpp_do__Pragma (pfile) } } -/* Just ignore #sccs, on systems where we define it at all. */ -#ifdef SCCS_DIRECTIVE +/* Just ignore #sccs on all systems. */ static void do_sccs (pfile) cpp_reader *pfile ATTRIBUTE_UNUSED; { } -#endif /* Handle #ifdef. */ static void diff --git a/gcc/doc/cpp.texi b/gcc/doc/cpp.texi index 22f4953..28e7800 100644 --- a/gcc/doc/cpp.texi +++ b/gcc/doc/cpp.texi @@ -3252,8 +3252,8 @@ This directive is not part of the C standard, but it is not an official GNU extension either. We believe it came from System V@. @findex #sccs -The @samp{#sccs} directive is recognized on some systems, because it -appears in their header files. It is a very old, obscure, extension +The @samp{#sccs} directive is recognized, because it appears in the +header files of some systems. It is a very old, obscure, extension which we did not invent, and we have been unable to find any documentation of what it should do, so GCC simply ignores it. diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi index d60f438..17d0d13 100644 --- a/gcc/doc/tm.texi +++ b/gcc/doc/tm.texi @@ -8584,11 +8584,6 @@ Defining @code{STDC_0_IN_SYSTEM_HEADERS} makes GNU CPP follows the host convention when processing system header files, but when processing user files @code{__STDC__} will always expand to 1. -@findex SCCS_DIRECTIVE -@item SCCS_DIRECTIVE -Define this if the preprocessor should ignore @code{#sccs} directives -and print no error message. - @findex NO_IMPLICIT_EXTERN_C @item NO_IMPLICIT_EXTERN_C Define this macro if the system header files support C++ as well as C@. diff --git a/gcc/system.h b/gcc/system.h index e028df1..47cabcf 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -620,7 +620,7 @@ typedef char _Bool; NO_BUILTIN_PTRDIFF_TYPE NO_BUILTIN_WCHAR_TYPE NO_BUILTIN_WINT_TYPE \ BLOCK_PROFILER BLOCK_PROFILER_CODE FUNCTION_BLOCK_PROFILER \ FUNCTION_BLOCK_PROFILER_EXIT MACHINE_STATE_SAVE \ - MACHINE_STATE_RESTORE + MACHINE_STATE_RESTORE SCCS_DIRECTIVE /* Hooks that are no longer used. */ #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE \ -- cgit v1.1