Index: gas/ChangeLog
from  Alexandre Oliva  <aoliva@redhat.com>

	* configure.in (MIPS_DEFAULT_ABI): Match mips*64*-linux*.
	* configure: Rebuilt.

Index: gas/configure.in
===================================================================
RCS file: /cvs/uberbaum/gas/configure.in,v
retrieving revision 1.130
diff -u -p -r1.130 configure.in
--- gas/configure.in 7 May 2003 05:10:45 -0000 1.130
+++ gas/configure.in 7 May 2003 05:26:30 -0000
@@ -582,7 +582,7 @@ changequote([,])dnl
 	esac
 	# Decide which ABI to target by default.
 	case ${target} in
-	  mips64*-linux* | mips-sgi-irix6*)
+	  mips*64*-linux* | mips-sgi-irix6*)
 	    mips_default_abi=N32_ABI
 	    ;;
 	  mips*-linux*)
Index: gas/testsuite/ChangeLog
from  Alexandre Oliva  <aoliva@redhat.com>

	* gas/vtable/vtable.exp (vtable_setup_xfails): Match
	mips*64*-*-linux*.

Index: gas/testsuite/gas/vtable/vtable.exp
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/vtable/vtable.exp,v
retrieving revision 1.17
diff -u -p -r1.17 vtable.exp
--- gas/testsuite/gas/vtable/vtable.exp 7 May 2003 05:08:20 -0000 1.17
+++ gas/testsuite/gas/vtable/vtable.exp 7 May 2003 05:26:35 -0000
@@ -43,7 +43,7 @@ if { (   [istarget "*-*-elf*"] || [istar
 	|| [istarget "i*86-*"] 
 	|| [istarget "m32r-*"] 
 	|| ([istarget "mips*-*"]
-	    && ! [istarget "mips64*-*-linux*"]
+	    && ! [istarget "mips*64*-*-linux*"]
 	    && ! [istarget "mips*-*-irix6*"])
 	|| [istarget "m68hc*-*"] 
 	|| [istarget "or32-*"] 
Index: ld/testsuite/ChangeLog
from  Alexandre Oliva  <aoliva@redhat.com>

	* config/default.exp (gcc_gas_flags): Match mips*64*-linux*.
	* ld-elf/merge.d: Likewise.

Index: ld/testsuite/config/default.exp
===================================================================
RCS file: /cvs/uberbaum/ld/testsuite/config/default.exp,v
retrieving revision 1.5
diff -u -p -r1.5 default.exp
--- ld/testsuite/config/default.exp 7 May 2003 05:08:02 -0000 1.5
+++ ld/testsuite/config/default.exp 7 May 2003 05:26:37 -0000
@@ -64,7 +64,7 @@ set gcc_gas_flag "-B[pwd]/tmpdir/gas/"
 # installed, but to the O32 ABI in the build tree, because of some
 # specs-file hacks.  Make sure we use an ABI that is compatible with
 # the one we expect.
-if {[istarget mips64*-*-linux*] &&
+if {[istarget mips*64*-*-linux*] &&
     (![board_info [target_info name] exists multilib_flags] ||
      ![string match "*-mabi" [board_info [target_info name] multilib_flags]])
    } {
Index: ld/testsuite/ld-elf/merge.d
===================================================================
RCS file: /cvs/uberbaum/ld/testsuite/ld-elf/merge.d,v
retrieving revision 1.3
diff -u -p -r1.3 merge.d
--- ld/testsuite/ld-elf/merge.d 7 May 2003 05:08:02 -0000 1.3
+++ ld/testsuite/ld-elf/merge.d 7 May 2003 05:26:37 -0000
@@ -3,7 +3,7 @@
 #objdump: -s
 #xfail: "arc-*-*" "avr-*-*" "cris-*-*" "dlx-*-*" "fr30-*-*" "frv-*-*"
 #xfail: "hppa*-*-*" "h8300-*-*" "i960-*-*" "ip2k-*-*" "m32r-*-*" "mcore-*-*"
-#xfail: "mn10*-*-*" "mips64*-*-linux*" "openrisc-*-*" "pj-*-*" "sparc*-*-*"
+#xfail: "mn10*-*-*" "mips*64*-*-linux*" "openrisc-*-*" "pj-*-*" "sparc*-*-*"
 #xfail: "xtensa-*-*"
 
 .*:     file format .*elf.*