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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 11d26a841f98490fc3f3e900548d2a85ae1d2906..40d305bfd4692307d34da4bc2ea2296ab6cbc75b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,13 @@
 2003-07-14  Richard Sandiford  <rsandifo@redhat.com>
 
+       * 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 dc4590da168cc77a5e78aa883ed28441ac4fed19..a50024342f98f586c5c79d14a98f8179c53508d1 100644 (file)
--- 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 40863aaf1a987b50f6b7e78a4c0ced13464771df..697212817fa4346e6192134a0786fc0918d10f4c 100644 (file)
--- 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 d8c31d46dfb5edf301adf111d08507bbfa5a0cf8..5eac628b024baaa744e60f674a466d5d9402f045 100644 (file)
--- 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 75e252051d8e036e2d7b35b7d451dea75db014c4..6fc24285d4dab545dc0a65689393af16060fa3e2 100644 (file)
--- 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 eac1388ebaef1f78456aa77534d679450f9fb653..ace3a16f48f04dec4f07d0aadd9415ab0cba6cd3 100644 (file)
--- 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 */
 \f
 /* Target machine storage layout */
 
@@ -3831,19 +3827,6 @@ while (0)
 #ifndef ASM_COMMENT_START
 #define ASM_COMMENT_START " #"
 #endif
-\f
-
-/* 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)
-
 \f
 /* 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 a61aac0d43829c14b75516cb5ba6b61bf93a0cf9..03cc6484c30299b0f601ea3ee26a0b7573446f26 100644 (file)
--- 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