From 2cb3d06cd5646265ca86923337491bb496c9f221 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Wed, 25 Aug 1999 15:40:16 -0700 Subject: [PATCH] m88k.h (VERSION_INFO2): Kill. * m88k.h (VERSION_INFO2): Kill. (VERSION_STRING): Kill. (TM_RCS_ID): Kill. (VERSION_INFO1): Tidy. (TARGET_VERSION): Update. * m88k/dgux.h (VERSION_INFO2): Kill. (ASM_FIRST_LINE): Adjust for death of VERSION_STRING. * m88k/luna.h (VERSION_INFO1): Tidy. * m88k/sysv4.h (VERSION_INFO1): Likewise. * m88k.c (out_rcs_id, tm_rcs_id): Kill. (output_file_start): Adjust for death of VERSION_STRING. From-SVN: r28881 --- gcc/ChangeLog | 14 ++++++++++++++ gcc/config/m88k/dgux.h | 5 +---- gcc/config/m88k/luna.h | 2 +- gcc/config/m88k/m88k.c | 5 +---- gcc/config/m88k/m88k.h | 21 +++------------------ gcc/config/m88k/sysv4.h | 2 +- 6 files changed, 21 insertions(+), 28 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9e58e55861b6..a15299724ace 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,17 @@ +Wed Aug 25 15:35:55 1999 Richard Henderson + + * m88k.h (VERSION_INFO2): Kill. + (VERSION_STRING): Kill. + (TM_RCS_ID): Kill. + (VERSION_INFO1): Tidy. + (TARGET_VERSION): Update. + * m88k/dgux.h (VERSION_INFO2): Kill. + (ASM_FIRST_LINE): Adjust for death of VERSION_STRING. + * m88k/luna.h (VERSION_INFO1): Tidy. + * m88k/sysv4.h (VERSION_INFO1): Likewise. + * m88k.c (out_rcs_id, tm_rcs_id): Kill. + (output_file_start): Adjust for death of VERSION_STRING. + 1999-08-25 13:51 -0700 Jim Meyering * cpplib.c (detect_if_not_defined): New function. diff --git a/gcc/config/m88k/dgux.h b/gcc/config/m88k/dgux.h index 3e4c66ea90c8..5df23d55e235 100644 --- a/gcc/config/m88k/dgux.h +++ b/gcc/config/m88k/dgux.h @@ -29,9 +29,6 @@ Boston, MA 02111-1307, USA. */ #define PREFERRED_DEBUGGING_TYPE \ (TARGET_SVR4 ? DWARF_DEBUG : SDB_DEBUG) -#ifndef VERSION_INFO2 -#define VERSION_INFO2 "$Revision: 1.3 $" -#endif #ifndef NO_BUGS #define AS_BUG_IMMEDIATE_LABEL /* The DG/UX 4.30 assembler doesn't accept the symbol `fcr63'. */ @@ -188,7 +185,7 @@ Boston, MA 02111-1307, USA. */ if (write_symbols != NO_DEBUG && !TARGET_NOLEGEND) \ { \ fprintf (FILE, ";legend_info -fix-bb -h\"gcc-%s\" -s\"%s\"", \ - VERSION_STRING, main_input_filename); \ + version_string, main_input_filename); \ fputs (flag_traditional ? " -lc" : " -lansi-c", FILE); \ if (TARGET_STANDARD) \ fputs (" -keep-std", FILE); \ diff --git a/gcc/config/m88k/luna.h b/gcc/config/m88k/luna.h index ab6dbded1092..ecfb3f502a00 100644 --- a/gcc/config/m88k/luna.h +++ b/gcc/config/m88k/luna.h @@ -32,7 +32,7 @@ Boston, MA 02111-1307, USA. */ /* Identify the compiler. */ #undef VERSION_INFO1 -#define VERSION_INFO1 "Omron Luna/88k, " +#define VERSION_INFO1 "Omron Luna/88k" /* Macros to be automatically defined. */ #undef CPP_PREDEFINES diff --git a/gcc/config/m88k/m88k.c b/gcc/config/m88k/m88k.c index b8452169af37..df3010e1f1ce 100644 --- a/gcc/config/m88k/m88k.c +++ b/gcc/config/m88k/m88k.c @@ -49,9 +49,6 @@ extern char *ctime (); extern int flag_traditional; extern FILE *asm_out_file; -static char out_rcs_id[] = "$What: <@(#) m88k.c,v 1.8> $"; -static char tm_rcs_id [] = TM_RCS_ID; - char *m88k_pound_sign = ""; /* Either # for SVR4 or empty for SVR3 */ char *m88k_short_data; char *m88k_version; @@ -1580,7 +1577,7 @@ output_file_start (file, f_options, f_len, W_options, W_len) time_t now = time ((time_t *)0); sprintf (indent, "]\"\n\t%s\t \"@(#)%s [", IDENT_ASM_OP, main_input_filename); fprintf (file, indent+3); - pos = fprintf (file, "gcc %s, %.24s,", VERSION_STRING, ctime (&now)); + pos = fprintf (file, "gcc %s, %.24s,", version_string, ctime (&now)); #if 1 /* ??? It would be nice to call print_switch_values here (and thereby let us delete output_options) but this is kept in until it is known diff --git a/gcc/config/m88k/m88k.h b/gcc/config/m88k/m88k.h index 9c377c491584..068db8498e9c 100644 --- a/gcc/config/m88k/m88k.h +++ b/gcc/config/m88k/m88k.h @@ -190,27 +190,12 @@ extern char * reg_names[]; Redefined in sysv3.h, sysv4.h, dgux.h, and luna.h. */ #define CPP_PREDEFINES "-Dm88000 -Dm88k -Dunix -D__CLASSIFY_TYPE__=2" -#define TARGET_VERSION fprintf (stderr, " (%s%s)", \ - VERSION_INFO1, VERSION_INFO2) +#define TARGET_VERSION fprintf (stderr, " (%s)", VERSION_INFO1) -/* Print subsidiary information on the compiler version in use. - Redefined in sysv4.h, and luna.h. */ -#define VERSION_INFO1 "m88k, " -#ifndef VERSION_INFO2 -#define VERSION_INFO2 "$Revision: 1.15 $" +#ifndef VERSION_INFO1 +#define VERSION_INFO1 "m88k" #endif -#ifndef VERSION_STRING -#define VERSION_STRING version_string -#ifdef __STDC__ -#define TM_RCS_ID "@(#)" __FILE__ " $Revision: 1.15 $ " __DATE__ -#else -#define TM_RCS_ID "$What: <@(#) m88k.h,v 1.1.1.2.2.2> $" -#endif /* __STDC__ */ -#else -#define TM_RCS_ID "@(#)" __FILE__ " " VERSION_INFO2 " " __DATE__ -#endif /* VERSION_STRING */ - /* Run-time compilation parameters selecting different hardware subsets. */ /* Macro to define tables used to set the flags. diff --git a/gcc/config/m88k/sysv4.h b/gcc/config/m88k/sysv4.h index ff6dc7813529..7b8987b5e3c8 100644 --- a/gcc/config/m88k/sysv4.h +++ b/gcc/config/m88k/sysv4.h @@ -38,7 +38,7 @@ Boston, MA 02111-1307, USA. */ /* Identify the compiler. */ #undef VERSION_INFO1 -#define VERSION_INFO1 "88open ABI, " +#define VERSION_INFO1 "88open ABI" /* Default switches */ #undef TARGET_DEFAULT