From 32fb7c9d6c75fdb918a1d1b0f30f79fa41423025 Mon Sep 17 00:00:00 2001 From: Franz Sirl Date: Fri, 19 Oct 2001 22:27:41 +0000 Subject: config.gcc (i[34567]86-*-gnu*, [...]): Delete superflous ${cpu_type} setting. 2001-10-19 Franz Sirl * config.gcc (i[34567]86-*-gnu*, arc-*-elf*, d30v-*, fr30-*-elf, hppa*64*-*-linux*, parisc*64*-*-linux*, hppa*-*-linux*, parisc*-*-linux*, i370-*-linux*, i[34567]86-*-chorusos*, i[34567]86-*-elf*, i[34567]86-ncr-sysv4*, i[34567]86-*-netware, i[34567]86-sequent-ptx4*, i[34567]86-sequent-sysv4*, i[34567]86-*-beoself*, i[34567]86-*-beos*, i[34567]86-*-freebsd*, i[34567]86-*-netbsdelf*, i[34567]86-*-linux*libc1, i[34567]86-*-linux*, i[34567]86-moss-msdos*, i[34567]86-*-moss*, i[34567]86-go32-rtems*, i[34567]86-*-rtems*, i[34567]86-*-rtemself*, i[34567]86-*-solaris2*, i[34567]86-*-sysv5*, i[34567]86-*-sysv4*, i[34567]86-*-udk*, i[34567]86-*-osf1*, i[34567]86-dg-dgux*, i860-alliant-*, i860-*-sysv4*, ia64*-*-aix*, ia64*-*-linux*, ia64*-*-hpux*, m32r-*-elf*, m88k-dg-dgux*, m88k-*-sysv4*, mcore-*-elf, mips*-*-linux*, mn10200-*-*, mn10300-*-*, pj*-linux*, pjl-*, powerpc64-*-linux*, powerpc-*-sysv*, powerpc-*-netbsd*, powerpc-*-chorusos*, powerpc-*-eabiaix*, powerpc-*-eabisim*, powerpc-*-elf*, powerpc-*-eabi*, powerpc-*-rtems*, powerpc-*-linux*libc1, powerpc-*-linux*, powerpc-wrs-vxworks*, powerpcle-wrs-vxworks*, powerpcle-*-sysv*, powerpcle-*-elf*, powerpcle-*-eabisim*, powerpcle-*-eabi*, powerpcle-*-solaris2*, rs6000-*-mach*, s390-*-linux*, s390x-*-linux*, sh-*-elf*, sh-*-rtemself*, sh-*-rtems*, sh-*-linux*, stormy16-*-elf, v850-*-rtems*, v850-*-*, x86_64-*-linux*), cris-*-aout, cris-*-elf, cris-*-none, cris-*-linux*: Update ${tmfile} list. (c4x-*-rtems*, c4x-*, i[34567]86-go32-rtems*, i[34567]86-*-rtemscoff*, i[34567]86-*-rtems*, i[34567]86-*-rtemself*, i[34567]86-*-osf1*, mn10200-*-*, mn10300-*-*, powerpc-*-beos*, powerpc-*-darwin*, powerpc-wrs-vxworks*, powerpcle-wrs-vxworks*, v850-*-rtems*, v850-*-*): Delete superflous ${cpu_type} setting. * config/linux.h: Delete svr4.h include. (SET_ASM_OP): Delete. * config/netware.h (INT_ASM_OP): Undef before define. * config/ptx4.h: Delete elfos.h include. (PREFERRED_DEBUGGING_TYPE): Undef instead of wrapping. * config/svr4.h: Delete elfos.h include. Update commentary. * config/arc/arc.h, config/d30v/d30v.h, config/fr30/fr30.h, config/m32r/m32r.h, config/m88k/sysv4.h, config/mn10200/mn10200.h, config/mn10200/mn10300.h, config/stormy16/stormy16.h, config/v850/v850.h: Delete svr4.h include. * config/i370/linux.h, config/i386/osf1elf.h, config/m68k/linux.h, config/m68k/m68kv4.h, config/m88k/sysv4.h, config/sparc/sysv4.h: Update includes. * config/i386/beos-elf.h, config/i386/netware.h, config/i386/ptx4-i.h, config/i386/rtemself.h, config/i386/sol2.h, config/i386/sysv4.h, config/i386/sysv5.h, config/i386/udk.h, config/ia64/linux.h, config/m88k/dguxbcs.h: Delete includes. * config/i386/dgux.h, config/i386/osf1elfgdb.h: Delete include. (PREFERRED_DEBUGGING_TYPE): Undef before defining it. * config/i860/fx2800.h (ASM_OUTPUT_SOURCE_LINE): Undef before defining it. * config/m88k/dgux.h: Delete include. (SDB_DEBUGGING_INFO, PREFERRED_DEBUGGING_TYPE): Undef before defining it. * config/pj/pj.h (ASM_GENERATE_INTERNAL_LABEL, ASM_OUTPUT_INTERNAL_LABEL, ASM_OUTPUT_SKIP): Undef before defining it. * config/sh/elf.h: Update include. (SDB_DEBUGGING_INFO, DWARF2_DEBUGGING_INFO, PREFERRED_DEBUGGING_TYPE, DWARF2_ASM_LINE_DEBUG_INFO): Move behind includes. From-SVN: r46366 --- gcc/config/arc/arc.h | 2 -- gcc/config/d30v/d30v.h | 4 ---- gcc/config/fr30/fr30.h | 6 ------ gcc/config/i370/linux.h | 5 ++--- gcc/config/i386/beos-elf.h | 5 +---- gcc/config/i386/dgux.h | 7 +++---- gcc/config/i386/netware.h | 3 --- gcc/config/i386/osf1elf.h | 1 - gcc/config/i386/osf1elfgdb.h | 2 +- gcc/config/i386/ptx4-i.h | 3 --- gcc/config/i386/rtemself.h | 10 ---------- gcc/config/i386/sol2.h | 1 - gcc/config/i386/sysv4.h | 5 +---- gcc/config/i386/sysv5.h | 2 -- gcc/config/i386/udk.h | 2 -- gcc/config/i860/fx2800.h | 1 + gcc/config/ia64/elf.h | 1 + gcc/config/ia64/linux.h | 3 --- gcc/config/linux.h | 3 --- gcc/config/m32r/m32r.h | 3 --- gcc/config/m68k/linux.h | 5 ++++- gcc/config/m68k/m68kv4.h | 2 ++ gcc/config/m88k/dgux.h | 6 ++++-- gcc/config/m88k/dguxbcs.h | 3 +-- gcc/config/m88k/sysv4.h | 4 ++-- gcc/config/mcore/mcore-elf.h | 5 +---- gcc/config/mn10200/mn10200.h | 1 - gcc/config/mn10300/mn10300.h | 1 - gcc/config/netware.h | 3 ++- gcc/config/pj/pj.h | 3 +++ gcc/config/ptx4.h | 4 +--- gcc/config/sh/elf.h | 29 ++++++++++++++++------------- gcc/config/sparc/sysv4.h | 2 ++ gcc/config/stormy16/stormy16.h | 4 ---- gcc/config/svr4.h | 29 +++++++++++------------------ gcc/config/v850/v850.h | 2 -- 36 files changed, 59 insertions(+), 113 deletions(-) (limited to 'gcc/config') diff --git a/gcc/config/arc/arc.h b/gcc/config/arc/arc.h index 07507a1..7e1191e 100644 --- a/gcc/config/arc/arc.h +++ b/gcc/config/arc/arc.h @@ -28,8 +28,6 @@ Boston, MA 02111-1307, USA. */ - print active compiler options in assembler output */ -/* ??? Create elf.h and have svr4.h include it. */ -#include "svr4.h" #undef ASM_SPEC #undef LINK_SPEC diff --git a/gcc/config/d30v/d30v.h b/gcc/config/d30v/d30v.h index 1ab9dc7..f7e743e 100644 --- a/gcc/config/d30v/d30v.h +++ b/gcc/config/d30v/d30v.h @@ -28,10 +28,6 @@ #define D30V_ALIGN(addr,align) (((addr) + (align) - 1) & ~((align) - 1)) -/* Set up System V.4 (aka ELF) defaults. */ -#include "svr4.h" - - /* Driver configuration */ /* A C expression which determines whether the option `-CHAR' takes arguments. diff --git a/gcc/config/fr30/fr30.h b/gcc/config/fr30/fr30.h index e94902c..4e947b3 100644 --- a/gcc/config/fr30/fr30.h +++ b/gcc/config/fr30/fr30.h @@ -22,12 +22,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /*}}}*/ -/*{{{ Includes. */ - -/* Set up System V.4 (aka ELF) defaults. */ -#include "svr4.h" - -/*}}}*/ /*{{{ Driver configuration. */ /* A C expression which determines whether the option `-CHAR' takes arguments. diff --git a/gcc/config/i370/linux.h b/gcc/config/i370/linux.h index 6c69c81..842ae6e 100644 --- a/gcc/config/i370/linux.h +++ b/gcc/config/i370/linux.h @@ -37,9 +37,8 @@ Boston, MA 02111-1307, USA. */ #define REAL_ARITHMETIC /* Include system common definitions */ - -#include "config/linux.h" -#include "config/i370/i370.h" +/* TODO: convert include to ${tm_file} list in config.gcc. */ +#include "i370/i370.h" /* Names to predefine in the preprocessor for this target machine. */ diff --git a/gcc/config/i386/beos-elf.h b/gcc/config/i386/beos-elf.h index d4c0de4..1a91fbc 100644 --- a/gcc/config/i386/beos-elf.h +++ b/gcc/config/i386/beos-elf.h @@ -1,5 +1,5 @@ /* Definitions for Intel x86 running BeOS - Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of GNU CC. @@ -18,9 +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. */ -#include /* Base i386 target machine definitions */ -#include /* Use the i386 AT&T assembler syntax */ -#include /* some common stuff */ #undef TARGET_VERSION #define TARGET_VERSION fprintf (stderr, " (i386 BeOS/ELF)"); diff --git a/gcc/config/i386/dgux.h b/gcc/config/i386/dgux.h index 5d7a6aa..a9f9593 100644 --- a/gcc/config/i386/dgux.h +++ b/gcc/config/i386/dgux.h @@ -1,5 +1,5 @@ /* Target definitions for GNU compiler for Intel 80x86 running DG/ux - Copyright (C) 1993, 1995, 1996, 1997, 1998, 2000 + Copyright (C) 1993, 1995, 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. Currently maintained by gcc@dg-rtp.dg.com. @@ -24,10 +24,8 @@ Boston, MA 02111-1307, USA. */ few hacks */ -#include "i386/sysv4.h" - #ifndef VERSION_INFO2 -#define VERSION_INFO2 "$Revision: 1.13 $" +#define VERSION_INFO2 "$Revision: 1.14 $" #endif #ifndef VERSION_STRING @@ -80,6 +78,7 @@ Boston, MA 02111-1307, USA. */ #undef DBX_DEBUGGING_INFO #define DBX_DEBUGGING_INFO +#undef PREFERRED_DEBUGGING_TYPE #define PREFERRED_DEBUGGING_TYPE DWARF_DEBUG /* Override svr[34].h. */ diff --git a/gcc/config/i386/netware.h b/gcc/config/i386/netware.h index bcea0de..8a51cf3 100644 --- a/gcc/config/i386/netware.h +++ b/gcc/config/i386/netware.h @@ -21,9 +21,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. */ -#include "i386/sysv4.h" /* Build on the base i386 SVR4 configuration */ -#include "netware.h" /* Then add netware-specific goo. */ - #undef TARGET_VERSION #define TARGET_VERSION fprintf (stderr, " (i386 Netware 4)"); diff --git a/gcc/config/i386/osf1elf.h b/gcc/config/i386/osf1elf.h index 4c52389..c3a2e1b 100644 --- a/gcc/config/i386/osf1elf.h +++ b/gcc/config/i386/osf1elf.h @@ -3,7 +3,6 @@ Copyright (C) 2000 Free Software Foundation, Inc. */ #include -#include "i386/sysv4.h" /* Base i386 target machine definitions */ #undef TARGET_VERSION #define TARGET_VERSION fprintf (stderr, " (i386 OSF/1)"); diff --git a/gcc/config/i386/osf1elfgdb.h b/gcc/config/i386/osf1elfgdb.h index af6efa2..4071c66 100644 --- a/gcc/config/i386/osf1elfgdb.h +++ b/gcc/config/i386/osf1elfgdb.h @@ -2,6 +2,6 @@ with gas and gdb. */ /* Use stabs instead of DWARF debug format. */ +#undef PREFERRED_DEBUGGING_TYPE #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG -#include "i386/osf1elf.h" diff --git a/gcc/config/i386/ptx4-i.h b/gcc/config/i386/ptx4-i.h index ad2df8e..a888d81 100644 --- a/gcc/config/i386/ptx4-i.h +++ b/gcc/config/i386/ptx4-i.h @@ -22,9 +22,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. */ -#include "i386/i386.h" /* Base i386 target machine definitions */ -#include "i386/att.h" /* Use the i386 AT&T assembler syntax */ -#include "ptx4.h" /* Rest of definitions (non architecture dependent) */ #undef TARGET_VERSION #define TARGET_VERSION fprintf (stderr, " (i386 Sequent Dynix/ptx Version 4)"); diff --git a/gcc/config/i386/rtemself.h b/gcc/config/i386/rtemself.h index ce59e7f..6e31f56 100644 --- a/gcc/config/i386/rtemself.h +++ b/gcc/config/i386/rtemself.h @@ -23,13 +23,6 @@ Boston, MA 02111-1307, USA. */ #define LINUX_DEFAULT_ELF -/* A lie, I guess, but the general idea behind linux/ELF is that we are - supposed to be outputting something that will assemble under SVr4. - This gets us pretty close. */ -#include /* Base i386 target machine definitions */ -#include /* Use the i386 AT&T assembler syntax */ -#include /* some common stuff */ - #undef TARGET_VERSION #define TARGET_VERSION fprintf (stderr, " (i386 RTEMS with ELF)"); @@ -89,7 +82,4 @@ Boston, MA 02111-1307, USA. */ #undef ENDFILE_SPEC #define ENDFILE_SPEC "crtend.o%s crtn.o%s" -/* Get machine-independent configuration parameters for RTEMS. */ -#include - /* end of i386/rtemself.h */ diff --git a/gcc/config/i386/sol2.h b/gcc/config/i386/sol2.h index 890e2e2..85e2aa8 100644 --- a/gcc/config/i386/sol2.h +++ b/gcc/config/i386/sol2.h @@ -20,7 +20,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. */ -#include "i386/sysv4.h" /* We use stabs-in-elf for debugging, because that is what the native toolchain uses. */ diff --git a/gcc/config/i386/sysv4.h b/gcc/config/i386/sysv4.h index 56cd238..b2540b7 100644 --- a/gcc/config/i386/sysv4.h +++ b/gcc/config/i386/sysv4.h @@ -1,5 +1,5 @@ /* Target definitions for GNU compiler for Intel 80386 running System V.4 - Copyright (C) 1991 Free Software Foundation, Inc. + Copyright (C) 1991, 2001 Free Software Foundation, Inc. Written by Ron Guilmette (rfg@netcom.com). @@ -20,9 +20,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. */ -#include "i386/i386.h" /* Base i386 target machine definitions */ -#include "i386/att.h" /* Use the i386 AT&T assembler syntax */ -#include "svr4.h" /* Definitions common to all SVR4 targets */ #undef TARGET_VERSION #define TARGET_VERSION fprintf (stderr, " (i386 System V Release 4)"); diff --git a/gcc/config/i386/sysv5.h b/gcc/config/i386/sysv5.h index e7e283e..87d6b9c 100644 --- a/gcc/config/i386/sysv5.h +++ b/gcc/config/i386/sysv5.h @@ -20,8 +20,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "i386/sysv4.h" - /* Dwarf2 is supported by native debuggers */ #undef PREFERRED_DEBUGGING_TYPE diff --git a/gcc/config/i386/udk.h b/gcc/config/i386/udk.h index 8e03abf..66f5b87 100644 --- a/gcc/config/i386/udk.h +++ b/gcc/config/i386/udk.h @@ -6,8 +6,6 @@ /* We're very much the SVR4 target with "/udk" prepended to everything that's interesting */ -#include "i386/sysv5.h" - #undef MD_EXEC_PREFIX #define MD_EXEC_PREFIX "/udk/usr/ccs/bin/" diff --git a/gcc/config/i860/fx2800.h b/gcc/config/i860/fx2800.h index 1ace6e8..3031611 100644 --- a/gcc/config/i860/fx2800.h +++ b/gcc/config/i860/fx2800.h @@ -157,6 +157,7 @@ Boston, MA 02111-1307, USA. */ #define DBX_MEMPARM_STABS_LETTER 'k' #define DBX_REGPARM_STABS_LETTER 'r' +#undef ASM_OUTPUT_SOURCE_LINE #define ASM_OUTPUT_SOURCE_LINE(file,num) \ fprintf (file, "\t.stab \"\",.,0x%x,0,%d\n", \ N_SLINE,num) diff --git a/gcc/config/ia64/elf.h b/gcc/config/ia64/elf.h index b6c4198..a3b851c 100644 --- a/gcc/config/ia64/elf.h +++ b/gcc/config/ia64/elf.h @@ -1,5 +1,6 @@ /* Definitions for embedded ia64-elf target. */ +/* TODO: convert includes to ${tm_file} list in config.gcc. */ #include "ia64/ia64.h" #include "elfos.h" #include "sysv4.h" diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h index 70a5ab0..a78130a 100644 --- a/gcc/config/ia64/linux.h +++ b/gcc/config/ia64/linux.h @@ -1,7 +1,4 @@ /* Definitions for ia64-linux target. */ -#include "ia64/ia64.h" -#include -#include "sysv4.h" /* This is for -profile to use -lc_p instead of -lc. */ #undef CC1_SPEC diff --git a/gcc/config/linux.h b/gcc/config/linux.h index b6ade99..4743ffe 100644 --- a/gcc/config/linux.h +++ b/gcc/config/linux.h @@ -37,12 +37,9 @@ Boston, MA 02111-1307, USA. */ #undef ASM_APP_OFF #define ASM_APP_OFF "#NO_APP\n" -#define SET_ASM_OP "\t.set\t" - /* Use stabs instead of DWARF debug format. */ #undef PREFERRED_DEBUGGING_TYPE #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG -#include "svr4.h" #undef MD_EXEC_PREFIX #undef MD_STARTFILE_PREFIX diff --git a/gcc/config/m32r/m32r.h b/gcc/config/m32r/m32r.h index 4cb379e..7a810ae 100644 --- a/gcc/config/m32r/m32r.h +++ b/gcc/config/m32r/m32r.h @@ -23,9 +23,6 @@ Boston, MA 02111-1307, USA. */ - longlong.h? */ -/* ??? Create elf.h and have svr4.h include it. */ -#include "svr4.h" - #undef SWITCH_TAKES_ARG #undef WORD_SWITCH_TAKES_ARG #undef HANDLE_SYSV_PRAGMA diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h index bf42091..8acb707 100644 --- a/gcc/config/m68k/linux.h +++ b/gcc/config/m68k/linux.h @@ -23,12 +23,15 @@ Boston, MA 02111-1307, USA. */ #define MOTOROLA /* Use Motorola syntax */ #define USE_GAS /* But GAS wants jbsr instead of jsr */ +/* TODO: convert includes to ${tm_file} list in config.gcc. */ #include /* Make sure CC1 is undefined. */ #undef CC1_SPEC -#include /* some common stuff */ +#include "elfos.h" +#include "svr4.h" +#include "linux.h" /* some common stuff */ #undef TARGET_VERSION #define TARGET_VERSION fprintf (stderr, " (68k GNU/Linux with ELF)"); diff --git a/gcc/config/m68k/m68kv4.h b/gcc/config/m68k/m68kv4.h index 9bdc487..199caac 100644 --- a/gcc/config/m68k/m68kv4.h +++ b/gcc/config/m68k/m68kv4.h @@ -25,8 +25,10 @@ Boston, MA 02111-1307, USA. */ #define SGS_SWITCH_TABLES /* Different switch table handling */ +/* TODO: convert includes to ${tm_file} list in config.gcc. */ #include "m68k/sgs.h" /* The m68k/SVR4 assembler is SGS based */ +#include "elfos.h" #include "svr4.h" /* Pick up the generic SVR4 macros */ /* See m68k.h. 7 means 68020 with 68881. */ diff --git a/gcc/config/m88k/dgux.h b/gcc/config/m88k/dgux.h index 1d91168..380f336 100644 --- a/gcc/config/m88k/dgux.h +++ b/gcc/config/m88k/dgux.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler. Motorola m88100 running DG/UX. - Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 2000 + Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 2000, 2001 Free Software Foundation, Inc. Contributed by Michael Tiemann (tiemann@mcc.com) Currently maintained by (gcc@dg-rtp.dg.com) @@ -26,7 +26,9 @@ Boston, MA 02111-1307, USA. */ supported. The option -msvr4 specifies elf. With these combinations, -g means dwarf. */ /* DWARF_DEBUGGING_INFO defined in svr4.h. */ +#undef SDB_DEBUGGING_INFO #define SDB_DEBUGGING_INFO +#undef PREFERRED_DEBUGGING_TYPE #define PREFERRED_DEBUGGING_TYPE \ (TARGET_SVR4 ? DWARF_DEBUG : SDB_DEBUG) @@ -36,7 +38,7 @@ Boston, MA 02111-1307, USA. */ #define AS_BUG_FLDCR #endif -#include "svr4.h" +/* TODO: convert includes to ${tm_file} list in config.gcc. */ #include "m88k/m88k.h" /* Augment TARGET_SWITCHES with the MXDB options. */ diff --git a/gcc/config/m88k/dguxbcs.h b/gcc/config/m88k/dguxbcs.h index 04a09b5..a7b5060 100644 --- a/gcc/config/m88k/dguxbcs.h +++ b/gcc/config/m88k/dguxbcs.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler. Motorola m88100 running DG/UX. - Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996 + Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 2001 Free Software Foundation, Inc. Contributed by Michael Tiemann (tiemann@mcc.com) Currently maintained by (gcc@dg-rtp.dg.com) @@ -22,7 +22,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. */ -#include "m88k/dgux.h" /* dgux.h builds an elf gcc which compiles elf objects by default. dguxbcs.h builds a bcs gcc which compiles bcs objects by default. diff --git a/gcc/config/m88k/sysv4.h b/gcc/config/m88k/sysv4.h index fdd66ee..64695d1 100644 --- a/gcc/config/m88k/sysv4.h +++ b/gcc/config/m88k/sysv4.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler. Motorola 88100 in an 88open ABI environment. - Copyright (C) 1990, 1991, 2000 Free Software Foundation, Inc. + Copyright (C) 1990, 1991, 2000, 2001 Free Software Foundation, Inc. Written by Ron Guilmette (rfg@netcom.com). Contributed to FSF by Network Computing Devices. @@ -33,7 +33,7 @@ Boston, MA 02111-1307, USA. */ #define AS_BUG_POUND_TYPE #endif -#include "svr4.h" +/* TODO: convert includes to ${tm_file} list in config.gcc. */ #include "m88k/m88k.h" /* Identify the compiler. */ diff --git a/gcc/config/mcore/mcore-elf.h b/gcc/config/mcore/mcore-elf.h index 6058d27..ca2c56d75 100644 --- a/gcc/config/mcore/mcore-elf.h +++ b/gcc/config/mcore/mcore-elf.h @@ -1,5 +1,5 @@ /* Definitions of MCore target. - Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. Contributed by Cygnus Solutions. This file is part of GNU CC. @@ -27,9 +27,6 @@ Boston, MA 02111-1307, USA. */ #define SUBTARGET_CPP_PREDEFINES " -D__ELF__" -#include "svr4.h" -#include "mcore/mcore.h" - /* Use DWARF2 debugging info. */ #ifndef DWARF2_DEBUGGING_INFO #define DWARF2_DEBUGGING_INFO 1 diff --git a/gcc/config/mn10200/mn10200.h b/gcc/config/mn10200/mn10200.h index 10b76f1..d6288b8 100644 --- a/gcc/config/mn10200/mn10200.h +++ b/gcc/config/mn10200/mn10200.h @@ -21,7 +21,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. */ -#include "svr4.h" /* Get rid of svr4.h stuff we don't want/need. */ #undef ASM_SPEC diff --git a/gcc/config/mn10300/mn10300.h b/gcc/config/mn10300/mn10300.h index 63fef60..481f524 100644 --- a/gcc/config/mn10300/mn10300.h +++ b/gcc/config/mn10300/mn10300.h @@ -21,7 +21,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. */ -#include "svr4.h" #undef ASM_SPEC #undef ASM_FINAL_SPEC diff --git a/gcc/config/netware.h b/gcc/config/netware.h index 509b797..42b2285 100644 --- a/gcc/config/netware.h +++ b/gcc/config/netware.h @@ -1,6 +1,6 @@ /* netware.h -- operating system specific defines to be used when targeting GCC for some generic NetWare 4 system. - Copyright (C) 1993, 1994, 2000 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2000, 2001 Free Software Foundation, Inc. Written by David V. Henkel-Wallace (gumby@cygnus.com) @@ -101,4 +101,5 @@ const_section () \ } \ } +#undef INT_ASM_OP #define INT_ASM_OP ".long" diff --git a/gcc/config/pj/pj.h b/gcc/config/pj/pj.h index 320d57a..115062d 100644 --- a/gcc/config/pj/pj.h +++ b/gcc/config/pj/pj.h @@ -1162,10 +1162,12 @@ do { fputs (current_function_varargs || current_function_stdarg \ #define LOCAL_LABEL_PREFIX "." /* Make an internal label into a string. */ +#undef ASM_GENERATE_INTERNAL_LABEL #define ASM_GENERATE_INTERNAL_LABEL(STRING, PREFIX, NUM) \ sprintf ((STRING), "*%s%s%ld", LOCAL_LABEL_PREFIX, (PREFIX), (long)(NUM)) /* Output an internal label definition. */ +#undef ASM_OUTPUT_INTERNAL_LABEL #define ASM_OUTPUT_INTERNAL_LABEL(FILE,PREFIX,NUM) \ asm_fprintf ((FILE), "%L%s%d:\n", (PREFIX), (NUM)) @@ -1220,6 +1222,7 @@ do { char dstr[30]; \ /* This is how to output an assembler line that says to advance the location counter by SIZE bytes. */ +#undef ASM_OUTPUT_SKIP #define ASM_OUTPUT_SKIP(FILE,SIZE) \ fprintf ((FILE), "\t.space %d\n", (SIZE)) diff --git a/gcc/config/ptx4.h b/gcc/config/ptx4.h index 57b0464..c934c1c 100644 --- a/gcc/config/ptx4.h +++ b/gcc/config/ptx4.h @@ -30,11 +30,9 @@ Boston, MA 02111-1307, USA. /* Use DWARF debugging info by default. */ -#ifndef PREFERRED_DEBUGGING_TYPE +#undef PREFERRED_DEBUGGING_TYPE #define PREFERRED_DEBUGGING_TYPE DWARF_DEBUG -#endif -#include "elfos.h" /* Cpp, assembler, linker, library, and startfile spec's. */ diff --git a/gcc/config/sh/elf.h b/gcc/config/sh/elf.h index 761b1fb..7d392dc 100644 --- a/gcc/config/sh/elf.h +++ b/gcc/config/sh/elf.h @@ -1,5 +1,5 @@ /* Definitions of target machine for gcc for Hitachi Super-H using ELF. - Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 2000, 2001 Free Software Foundation, Inc. Contributed by Ian Lance Taylor . This file is part of GNU CC. @@ -19,18 +19,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. */ -/* No SDB debugging info. */ -#undef SDB_DEBUGGING_INFO - -/* Generate DWARF2 debugging information and make it the default */ -#define DWARF2_DEBUGGING_INFO - -#undef PREFERRED_DEBUGGING_TYPE -#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG - -/* use a more compact format for line information */ -#define DWARF2_ASM_LINE_DEBUG_INFO 1 - /* Undefine some macros defined in both sh.h and svr4.h. */ #undef IDENT_ASM_OP #undef ASM_FILE_END @@ -41,8 +29,23 @@ Boston, MA 02111-1307, USA. */ #undef MAX_OFILE_ALIGNMENT /* Be ELF-like. */ +/* TODO: convert includes to ${tm_file} list in config.gcc. */ +#include "elfos.h" #include "svr4.h" +/* No SDB debugging info. */ +#undef SDB_DEBUGGING_INFO + +/* Generate DWARF2 debugging information and make it the default */ +#undef DWARF2_DEBUGGING_INFO +#define DWARF2_DEBUGGING_INFO 1 + +#undef PREFERRED_DEBUGGING_TYPE +#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG + +/* use a more compact format for line information */ +#define DWARF2_ASM_LINE_DEBUG_INFO 1 + /* The prefix to add to user-visible assembler symbols. Note that svr4.h redefined it from the original value (that we want) in sh.h */ diff --git a/gcc/config/sparc/sysv4.h b/gcc/config/sparc/sysv4.h index 6a0a680..ecff5b5 100644 --- a/gcc/config/sparc/sysv4.h +++ b/gcc/config/sparc/sysv4.h @@ -20,6 +20,7 @@ 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. */ +/* TODO: convert includes to ${tm_file} list in config.gcc. */ #include "sparc/sparc.h" /* Undefine some symbols which are defined in "sparc.h" but which are @@ -32,6 +33,7 @@ Boston, MA 02111-1307, USA. */ #undef TEXT_SECTION_ASM_OP #undef DATA_SECTION_ASM_OP +#include "elfos.h" #include "svr4.h" /* ??? Put back the SIZE_TYPE/PTRDIFF_TYPE definitions set by sparc.h. diff --git a/gcc/config/stormy16/stormy16.h b/gcc/config/stormy16/stormy16.h index 0372d1c..f6d3848 100644 --- a/gcc/config/stormy16/stormy16.h +++ b/gcc/config/stormy16/stormy16.h @@ -21,10 +21,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Set up System V.4 (aka ELF) defaults. */ -#include "svr4.h" - - /* Driver configuration */ /* A C expression which determines whether the option `-CHAR' takes arguments. diff --git a/gcc/config/svr4.h b/gcc/config/svr4.h index 4e59767..5f74453 100644 --- a/gcc/config/svr4.h +++ b/gcc/config/svr4.h @@ -1,7 +1,7 @@ /* Operating system specific defines to be used when targeting GCC for some generic System V Release 4 system. Copyright (C) 1991, 1994, 1995, 1996, 1997, 1998, 1999, - 2000 Free Software Foundation, Inc. + 2000, 2001 Free Software Foundation, Inc. Contributed by Ron Guilmette (rfg@monkeys.com). This file is part of GNU CC. @@ -21,30 +21,23 @@ 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. - To use this file, make up a file with a name like: + To use this file, make up a line like that in config.gcc: - ?????svr4.h + tm_file="$tm_file elfos.h svr4.h MACHINE/svr4.h" - where ????? is replaced by the name of the basic hardware that you - are targeting for. Then, in the file ?????svr4.h, put something - like: - - #include "?????.h" - #include "svr4.h" - - followed by any really system-specific defines (or overrides of - defines) which you find that you need. For example, CPP_PREDEFINES - is defined here with only the defined -Dunix and -DSVR4. You should - probably override that in your target-specific ?????svr4.h file - with a set of defines that includes these, but also contains an - appropriate define for the type of hardware that you are targeting. + where MACHINE is replaced by the name of the basic hardware that you + are targeting for. Then, in the file MACHINE/svr4.h, put any really + system-specific defines (or overrides of defines) which you find that + you need. For example, CPP_PREDEFINES is defined here with only the + defined -Dunix and -DSVR4. You should probably override that in your + target-specific MACHINE/svr4.h file with a set of defines that + includes these, but also contains an appropriate define for the type + of hardware that you are targeting. */ /* Define a symbol indicating that we are using svr4.h. */ #define USING_SVR4_H -#include "elfos.h" - /* Cpp, assembler, linker, library, and startfile spec's. */ /* This defines which switch letters take arguments. On svr4, most of diff --git a/gcc/config/v850/v850.h b/gcc/config/v850/v850.h index 42f3c31..dc71c7a 100644 --- a/gcc/config/v850/v850.h +++ b/gcc/config/v850/v850.h @@ -22,8 +22,6 @@ Boston, MA 02111-1307, USA. */ #ifndef GCC_V850_H #define GCC_V850_H -#include "svr4.h" /* Automatically does #undef CPP_PREDEFINES */ - /* These are defiend in svr4.h but we want to override them. */ #undef ASM_FINAL_SPEC #undef LIB_SPEC -- cgit v1.1