* mpw-config.in: Add wildcards for config matching, add mips-*-*

	case, forward-include bfd/elf-bfd.h.

diff --git a/gas/mpw-config.in b/gas/mpw-config.in
index 3d3eb6f169fd3db3540ba6a324f24b7a750dc3b2..9a583409cd323f94e0e0e84bbe2d07d9e0e1b9f2 100644 (file)
--- 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'
 
-# 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
+       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