From 373f8df79edce496b9d64294dfbb2504f930411b Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Mon, 14 Jul 2003 20:12:07 +0000 Subject: [PATCH] elf.h (OBJECT_FORMAT_COFF, [...]): Remove undefs. * config/mips/elf.h (OBJECT_FORMAT_COFF, EXTENDED_COFF): Remove undefs. * config/mips/elf64.h: Likewise. * config/mips/openbsd.h: Likewise. * config/mips/iris5.h (OBJECT_FORMAT_COFF): Remove undefs. * config/mips/linux.h: Likewise. * config/mips/mips.h (OBJECT_FORMAT_COFF, EXTENDED_COFF): Delete. (CODE_MASK, MIPS_IS_STAB, MIPS_MARK_STAB, MIPS_UNMARK_STAB): Delete. From-SVN: r69346 --- gcc/ChangeLog | 8 ++++++++ gcc/config/mips/elf.h | 3 --- gcc/config/mips/elf64.h | 3 --- gcc/config/mips/iris5.h | 3 --- gcc/config/mips/linux.h | 3 --- gcc/config/mips/mips.h | 17 ----------------- gcc/config/mips/openbsd.h | 6 ------ 7 files changed, 8 insertions(+), 35 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 11d26a841f9..40d305bfd46 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,13 @@ 2003-07-14 Richard Sandiford + * config/mips/elf.h (OBJECT_FORMAT_COFF, EXTENDED_COFF): Remove undefs. + * config/mips/elf64.h: Likewise. + * config/mips/openbsd.h: Likewise. + * config/mips/iris5.h (OBJECT_FORMAT_COFF): Remove undefs. + * config/mips/linux.h: Likewise. + * config/mips/mips.h (OBJECT_FORMAT_COFF, EXTENDED_COFF): Delete. + (CODE_MASK, MIPS_IS_STAB, MIPS_MARK_STAB, MIPS_UNMARK_STAB): Delete. + * config.gcc (mips-sgi-irix6*o32, mips-sgi-irix5*): Add mips/sdb.h to the list of include files when using gas. (mips*el-*-openbsd*, mips*-*-openbsd*): Add mips/sdb.h unconditionally. diff --git a/gcc/config/mips/elf.h b/gcc/config/mips/elf.h index dc4590da168..a50024342f9 100644 --- a/gcc/config/mips/elf.h +++ b/gcc/config/mips/elf.h @@ -21,9 +21,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Use ELF. */ -#undef OBJECT_FORMAT_COFF -#undef EXTENDED_COFF - #define DBX_DEBUGGING_INFO 1 #define DWARF2_DEBUGGING_INFO 1 diff --git a/gcc/config/mips/elf64.h b/gcc/config/mips/elf64.h index 40863aaf1a9..697212817fa 100644 --- a/gcc/config/mips/elf64.h +++ b/gcc/config/mips/elf64.h @@ -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. */ -#undef OBJECT_FORMAT_COFF -#undef EXTENDED_COFF - #define DBX_DEBUGGING_INFO 1 #define DWARF2_DEBUGGING_INFO 1 diff --git a/gcc/config/mips/iris5.h b/gcc/config/mips/iris5.h index d8c31d46dfb..5eac628b024 100644 --- a/gcc/config/mips/iris5.h +++ b/gcc/config/mips/iris5.h @@ -23,9 +23,6 @@ Boston, MA 02111-1307, USA. */ #define ABICALLS_ASM_OP "\t.option pic2" -/* IRIX 5 doesn't use COFF, so disable special COFF handling in collect2.c. */ -#undef OBJECT_FORMAT_COFF - /* ??? This is correct, but not very useful, because there is no file that uses this macro. */ /* ??? The best way to handle global constructors under ELF is to use .init diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h index 75e252051d8..6fc24285d4d 100644 --- a/gcc/config/mips/linux.h +++ b/gcc/config/mips/linux.h @@ -88,9 +88,6 @@ do { \ #undef MD_EXEC_PREFIX #undef MD_STARTFILE_PREFIX -/* Required to keep collect2.c happy */ -#undef OBJECT_FORMAT_COFF - /* If we don't set MASK_ABICALLS, we can't default to PIC. */ #undef TARGET_DEFAULT #define TARGET_DEFAULT (MASK_ABICALLS|MASK_GAS) diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h index eac1388ebae..ace3a16f48f 100644 --- a/gcc/config/mips/mips.h +++ b/gcc/config/mips/mips.h @@ -1328,10 +1328,6 @@ extern int mips_abi; mips_debugger_offset (X, (HOST_WIDE_INT) 0) #define DEBUGGER_ARG_OFFSET(OFFSET, X) \ mips_debugger_offset (X, (HOST_WIDE_INT) OFFSET) - -/* Tell collect that the object format is ECOFF */ -#define OBJECT_FORMAT_COFF /* Object file looks like COFF */ -#define EXTENDED_COFF /* ECOFF, not normal coff */ /* Target machine storage layout */ @@ -3831,19 +3827,6 @@ while (0) #ifndef ASM_COMMENT_START #define ASM_COMMENT_START " #" #endif - - -/* Macros for mips-tfile.c to encapsulate stabs in ECOFF, and for - and mips-tdump.c to print them out. - - These must match the corresponding definitions in gdb/mipsread.c. - Unfortunately, gcc and gdb do not currently share any directories. */ - -#define CODE_MASK 0x8F300 -#define MIPS_IS_STAB(sym) (((sym)->index & 0xFFF00) == CODE_MASK) -#define MIPS_MARK_STAB(code) ((code)+CODE_MASK) -#define MIPS_UNMARK_STAB(code) ((code)-CODE_MASK) - /* Default definitions for size_t and ptrdiff_t. We must override the definitions from ../svr4.h on mips-*-linux-gnu. */ diff --git a/gcc/config/mips/openbsd.h b/gcc/config/mips/openbsd.h index a61aac0d438..03cc6484c30 100644 --- a/gcc/config/mips/openbsd.h +++ b/gcc/config/mips/openbsd.h @@ -109,9 +109,3 @@ Boston, MA 02111-1307, USA. */ /* Switch into a generic section. */ #undef TARGET_ASM_NAMED_SECTION #define TARGET_ASM_NAMED_SECTION default_elf_asm_named_section - -/* collect2 support (Macros for initialization). */ - -/* Mips default configuration is COFF-only, and confuses collect2. */ -#undef OBJECT_FORMAT_COFF -#undef EXTENDED_COFF -- 2.30.2