config.gcc (mips*-*-*): Add OBJECT_FORMAT_ELF to $tm_defines if using mips/elf.h...

	* config.gcc (mips*-*-*): Add OBJECT_FORMAT_ELF to $tm_defines
	if using mips/elf.h or mips/elf64.h.
	* config/mips/elf.h (OBJECT_FORMAT_ELF): Remove.
	* config/mips/elf64.h (OBJECT_FORMAT_ELF): Remove.

From-SVN: r58237

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 76ac7276ea0da9710e1dc55bdfd617c0e30483bf..5fb61e0c1fae309a11c3a41fc093b744d8cfae67 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-17  Richard Sandiford  <rsandifo@redhat.com>
+
+       * config.gcc (mips*-*-*): Add OBJECT_FORMAT_ELF to $tm_defines
+       if using mips/elf.h or mips/elf64.h.
+       * config/mips/elf.h (OBJECT_FORMAT_ELF): Remove.
+       * config/mips/elf64.h (OBJECT_FORMAT_ELF): Remove.
+
 2002-10-16  Aldy Hernandez  <aldyh@redhat.com>
 
        * config/rs6000/rs6000.c (function_arg): Set inner mode of V1DI to

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 8085d6598d06aeb453840d3996784b94266d8da6..683ec138f7957cf7771f21b6b02b2939578416b2 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2840,6 +2840,11 @@ mips*-*-*)
                        tm_defines="TARGET_ENDIAN_DEFAULT=0 $tm_defines"
                        ;;
        esac
+       case $tm_file in
+               *mips/elf.h* | *mips/elf64.h*)
+                       tm_defines="OBJECT_FORMAT_ELF $tm_defines"
+                       ;;
+       esac
        if test "x$enable_gofast" = xyes
        then
                tm_defines="INIT_SUBTARGET_OPTABS=INIT_GOFAST_OPTABS $tm_defines"

diff --git a/gcc/config/mips/elf.h b/gcc/config/mips/elf.h
index bc3ca69ff3696313ea283d1fff1cdb3fa43f13c5..c64bb46b62183cf1943cd028be32283aa463b6ed 100644 (file)
--- a/gcc/config/mips/elf.h
+++ b/gcc/config/mips/elf.h
@@ -22,7 +22,6 @@ Boston, MA 02111-1307, USA.  */
 /* Use ELF.  */
 #undef  OBJECT_FORMAT_COFF
 #undef  EXTENDED_COFF
-#define OBJECT_FORMAT_ELF
 
 /* ??? Move all SDB stuff into separate header file.  */
 #undef  SDB_DEBUGGING_INFO

diff --git a/gcc/config/mips/elf64.h b/gcc/config/mips/elf64.h
index 07973cbd0eaed9d31217c8aea139104d2f425ccc..e9bed21da10bb6ce471cd3e2ce2c8c4df3519437 100644 (file)
--- a/gcc/config/mips/elf64.h
+++ b/gcc/config/mips/elf64.h
@@ -22,7 +22,6 @@ Boston, MA 02111-1307, USA.  */
 
 #undef  OBJECT_FORMAT_COFF
 #undef  EXTENDED_COFF
-#define OBJECT_FORMAT_ELF
 
 #undef  SDB_DEBUGGING_INFO
 #define DBX_DEBUGGING_INFO 1