X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fmpw-config.in;h=9e29b1d945cf1376d5254701c4f17d7a08310c6a;hb=3c0b1a5c8a5ac7d830d3ea8945cb7caaa1e5c1ed;hp=3d3eb6f169fd3db3540ba6a324f24b7a750dc3b2;hpb=c611cd82fc0b6ed67111d927cdcdd0debc56b687;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/mpw-config.in b/gas/mpw-config.in
index 3d3eb6f169..9e29b1d945 100644
--- a/gas/mpw-config.in
+++ b/gas/mpw-config.in
@@ -34,25 +34,25 @@ Else If "{target_canonical}" =~ /powerpc-apple-macos/
 	Set bfd_gas yes
 	Set em macos
 
-Else If "{target_canonical}" =~ /i386-unknown-go32/
+Else If "{target_canonical}" =~ /i386-\Option-x-go32/
 	Set obj_format "coff"
 	Set TDEFINES '-d I386COFF'
 
-Else If "{target_canonical}" =~ /m68k-unknown-coff/
+Else If "{target_canonical}" =~ /m68k-\Option-x-coff/
 	Set TDEFINES '-d M68KCOFF'
 
 Else If "{target_canonical}" =~ /mips-idt-ecoff/
 	Set bfd_gas yes
-	Set TDEFINES '-d TARGET_BYTES_BIG_ENDIAN'
+	Set TDEFINES '-d TARGET_BYTES_BIG_ENDIAN=1'
 
-# start-sanitize-gm
-Else If "{target_canonical}" =~ /mips-gm-magic/
-	Set obj_format "ecoff"
+Else If "{target_canonical}" =~ /mips-\Option-x-\Option-x/
+	# Assume other OSes etc use ELF
+	Set obj_format "elf"
 	Set bfd_gas yes
-	Set TDEFINES '-d TARGET_BYTES_BIG_ENDIAN'
-# end-sanitize-gm
+	Set TDEFINES '-d TARGET_BYTES_BIG_ENDIAN=1'
+	forward-include "{srcroot}"bfd:elf-bfd.h 'bfd/elf-bfd.h'
 
-Else If "{target_canonical}" =~ /sh-hitachi-hms/
+Else If "{target_canonical}" =~ /sh-\Option-x-hms/
 	Set obj_format "coff"
 	forward-include "{srcroot}"opcodes:sh-opc.h 'opcodes/sh-opc.h'
 End If