gas/testsuite/

	* gas/mips/mips.exp: Set has_newabi for all Linux targets.
	* gas/mips/cfi-n64-1.d: Adjust for targets that do not infer the
	ISA from the ABI.
	* gas/mips/elf-rel-got-n32.d: Likewise.
	* gas/mips/elf-rel-got-n64.d: Likewise.
	* gas/mips/elf-rel-xgot-n32.d: Likewise.
	* gas/mips/elf-rel-xgot-n64.d: Likewise.
	* gas/mips/elf-rel18.d: Likewise.
	* gas/mips/elf-rel28-n32.d: Likewise.
	* gas/mips/elf-rel28-n64.d: Likewise.
	* gas/mips/jal-newabi.d: Likewise.
	* gas/mips/ldstla-n64-shared.d: Likewise.
	* gas/mips/ldstla-n64-sym32.d: Likewise.
	* gas/mips/ldstla-n64.d: Likewise.
	* gas/mips/macro-warn-1-n32.d: Likewise.
	* gas/mips/macro-warn-2-n32.d: Likewise.
	* gas/mips/n32-consec.d: Likewise.

	ld/testsuite/
	* ld-mips-elf/mips-elf.exp: Set has_newabi for all Linux targets.
	Adjust abi_asflags for targets that do not infer the ISA from the
	ABI.
	* ld-mips-elf/eh-frame1-n32.d: Adjust for targets that do not
	infer the ISA from the ABI.
	* ld-mips-elf/eh-frame1-n64.d: Likewise.
	* ld-mips-elf/eh-frame2-n32.d: Likewise.
	* ld-mips-elf/eh-frame2-n64.d: Likewise.
	* ld-mips-elf/elf-rel-got-n32-embed.d: Likewise.
	* ld-mips-elf/elf-rel-got-n32.d: Likewise.
	* ld-mips-elf/elf-rel-got-n64-embed.d: Likewise.
	* ld-mips-elf/elf-rel-got-n64-linux.d: Likewise.
	* ld-mips-elf/elf-rel-got-n64.d: Likewise.
	* ld-mips-elf/elf-rel-xgot-n32-embed.d: Likewise.
	* ld-mips-elf/elf-rel-xgot-n32.d: Likewise.
	* ld-mips-elf/elf-rel-xgot-n64-embed.d: Likewise.
	* ld-mips-elf/elf-rel-xgot-n64-linux.d: Likewise.
	* ld-mips-elf/elf-rel-xgot-n64.d: Likewise.
	* ld-mips-elf/emit-relocs-1.d: Likewise.
	* ld-mips-elf/got-page-2.d: Likewise.
	* ld-mips-elf/no-shared-1-n32.d: Likewise.
	* ld-mips-elf/no-shared-1-n64.d: Likewise.
	* ld-mips-elf/rel32-n32.d: Likewise.
	* ld-mips-elf/rel64.d: Likewise.
	* ld-mips-elf/relax-jalr-n32-shared.d: Likewise.
	* ld-mips-elf/relax-jalr-n32.d: Likewise.
	* ld-mips-elf/relax-jalr-n64-shared.d: Likewise.
	* ld-mips-elf/relax-jalr-n64.d: Likewise.
	* ld-mips-elf/reloc-1-n32.d: Likewise.
	* ld-mips-elf/reloc-1-n64.d: Likewise.
	* ld-mips-elf/textrel-1.d: Likewise.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index d279b2e71993531cd877b77df981cdb3d37ae72c..80c03cfc252f70955b9b22ec47f4d9fc5720def1 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,23 @@
+2012-08-06  Maciej W. Rozycki  <macro@codesourcery.com>
+
+       * gas/mips/mips.exp: Set has_newabi for all Linux targets.
+       * gas/mips/cfi-n64-1.d: Adjust for targets that do not infer the
+       ISA from the ABI.
+       * gas/mips/elf-rel-got-n32.d: Likewise.
+       * gas/mips/elf-rel-got-n64.d: Likewise.
+       * gas/mips/elf-rel-xgot-n32.d: Likewise.
+       * gas/mips/elf-rel-xgot-n64.d: Likewise.
+       * gas/mips/elf-rel18.d: Likewise.
+       * gas/mips/elf-rel28-n32.d: Likewise.
+       * gas/mips/elf-rel28-n64.d: Likewise.
+       * gas/mips/jal-newabi.d: Likewise.
+       * gas/mips/ldstla-n64-shared.d: Likewise.
+       * gas/mips/ldstla-n64-sym32.d: Likewise.
+       * gas/mips/ldstla-n64.d: Likewise.
+       * gas/mips/macro-warn-1-n32.d: Likewise.
+       * gas/mips/macro-warn-2-n32.d: Likewise.
+       * gas/mips/n32-consec.d: Likewise.
+
 2012-08-06  Maciej W. Rozycki  <macro@codesourcery.com>
 
        * gas/mips/mips.exp: Set has_newabi for mips*-sde-elf* too.

diff --git a/gas/testsuite/gas/mips/cfi-n64-1.d b/gas/testsuite/gas/mips/cfi-n64-1.d
index 808b3dae809f1581392ec4e7f3b96d5e070d583d..29d58ffb82b1226f6dced2cceb7f413047bb7db0 100644 (file)
--- a/gas/testsuite/gas/mips/cfi-n64-1.d
+++ b/gas/testsuite/gas/mips/cfi-n64-1.d
@@ -1,4 +1,4 @@
-#as: -64 -EB
+#as: -march=from-abi -64 -EB
 #objdump: -sj.eh_frame
 
 .*

diff --git a/gas/testsuite/gas/mips/elf-rel-got-n32.d b/gas/testsuite/gas/mips/elf-rel-got-n32.d
index 41c2c3ea2fc760d9bce248e33034b112c773b841..45584444205a828d602f4f27abaa84cdd60a5ca3 100644 (file)
--- a/gas/testsuite/gas/mips/elf-rel-got-n32.d
+++ b/gas/testsuite/gas/mips/elf-rel-got-n32.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS ELF got reloc n32
-#as: -n32 -KPIC
+#as: -march=from-abi -n32 -KPIC
 
 .*: +file format elf32-n.*mips.*
 

diff --git a/gas/testsuite/gas/mips/elf-rel-got-n64.d b/gas/testsuite/gas/mips/elf-rel-got-n64.d
index 9b971c011fd8f657bc93250baf980ed2b45228df..0a6c7e4118f1f89df0c6f61ae27a14b8d3416b46 100644 (file)
--- a/gas/testsuite/gas/mips/elf-rel-got-n64.d
+++ b/gas/testsuite/gas/mips/elf-rel-got-n64.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS ELF got reloc n64
-#as: -64 -KPIC
+#as: -march=from-abi -64 -KPIC
 
 .*: +file format elf64-.*mips.*
 

diff --git a/gas/testsuite/gas/mips/elf-rel-xgot-n32.d b/gas/testsuite/gas/mips/elf-rel-xgot-n32.d
index b40e802ca391565de5966ce079b739155f775449..cec8fc4e69dbc07449c61f7a28a3e010035b9922 100644 (file)
--- a/gas/testsuite/gas/mips/elf-rel-xgot-n32.d
+++ b/gas/testsuite/gas/mips/elf-rel-xgot-n32.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS ELF xgot reloc n32
-#as: -n32 -KPIC -xgot
+#as: -march=from-abi -n32 -KPIC -xgot
 #source: elf-rel-got-n32.s
 
 .*: +file format elf32-n.*mips.*

diff --git a/gas/testsuite/gas/mips/elf-rel-xgot-n64.d b/gas/testsuite/gas/mips/elf-rel-xgot-n64.d
index fd98c9c342819405cf145d73041fc8a3d52a9b56..9c4ecd3a3f7333207d5ff694c247c927512cf9b5 100644 (file)
--- a/gas/testsuite/gas/mips/elf-rel-xgot-n64.d
+++ b/gas/testsuite/gas/mips/elf-rel-xgot-n64.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS ELF xgot reloc n64
-#as: -64 -KPIC -xgot
+#as: -march=from-abi -64 -KPIC -xgot
 #source: elf-rel-got-n64.s
 
 .*: +file format elf64-.*mips.*

diff --git a/gas/testsuite/gas/mips/elf-rel18.d b/gas/testsuite/gas/mips/elf-rel18.d
index fa467a42cd4aa51e05bb1f428fc22be9be4ed8b9..87b9d92400e6c63beb850c5d1a6414a641b14140 100644 (file)
--- a/gas/testsuite/gas/mips/elf-rel18.d
+++ b/gas/testsuite/gas/mips/elf-rel18.d
@@ -1,5 +1,5 @@
 #readelf: --relocs
-#as: -mabi=n32 -KPIC
+#as: -march=from-abi -mabi=n32 -KPIC
 
 Relocation section '\.rela\.text' at offset .* contains 4 entries:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend

diff --git a/gas/testsuite/gas/mips/elf-rel28-n32.d b/gas/testsuite/gas/mips/elf-rel28-n32.d
index dbca20bf6e9e949197d99c918a09a8c13220b5eb..b8ac5206c376bccb5ca20e681c158f2a58885f4e 100644 (file)
--- a/gas/testsuite/gas/mips/elf-rel28-n32.d
+++ b/gas/testsuite/gas/mips/elf-rel28-n32.d
@@ -1,5 +1,5 @@
 #source: elf-rel28.s
-#as: -n32
+#as: -march=from-abi -n32
 #objdump: -dr
 #name: MIPS ELF reloc 28 (n32)
 

diff --git a/gas/testsuite/gas/mips/elf-rel28-n64.d b/gas/testsuite/gas/mips/elf-rel28-n64.d
index be38e7d9cd1f4acbbd23bb2b498f97fac70d59c3..dd647ed56ac8ef1041d216a14861d166acd6ae8f 100644 (file)
--- a/gas/testsuite/gas/mips/elf-rel28-n64.d
+++ b/gas/testsuite/gas/mips/elf-rel28-n64.d
@@ -1,5 +1,5 @@
 #source: elf-rel28.s
-#as: -64
+#as: -march=from-abi -64
 #objdump: -dr
 #name: MIPS ELF reloc 28 (n64)
 

diff --git a/gas/testsuite/gas/mips/jal-newabi.d b/gas/testsuite/gas/mips/jal-newabi.d
index 77a0b2b71c1cdf497b5c192ff68ec29026aeab56..c49abc4f3d4ec0855920ae873b0aeac1724476b4 100644 (file)
--- a/gas/testsuite/gas/mips/jal-newabi.d
+++ b/gas/testsuite/gas/mips/jal-newabi.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS ELF NewABI jal
-#as: -n32 -KPIC -xgot
+#as: -march=from-abi -n32 -KPIC -xgot
 
 .*: +file format elf32-n.*mips.*
 

diff --git a/gas/testsuite/gas/mips/ldstla-n64-shared.d b/gas/testsuite/gas/mips/ldstla-n64-shared.d
index ede34a5bc77c7bb8ecf6da0c90743407bbc8038c..43ec0fd667a5a068eda628ee547494dbbbca6602 100644 (file)
--- a/gas/testsuite/gas/mips/ldstla-n64-shared.d
+++ b/gas/testsuite/gas/mips/ldstla-n64-shared.d
@@ -1,5 +1,5 @@
 #objdump: -d
-#as: -KPIC -64
+#as: -march=from-abi -KPIC -64
 #name: MIPS ld-st-la constants (ABI n64, shared)
 #source: ldstla-n64.s
 

diff --git a/gas/testsuite/gas/mips/ldstla-n64-sym32.d b/gas/testsuite/gas/mips/ldstla-n64-sym32.d
index 066d7499055bde9f45b165ac724fdefbdddc7724..3f547dbccc6e59055be0df0e53e79cfad12d3864 100644 (file)
--- a/gas/testsuite/gas/mips/ldstla-n64-sym32.d
+++ b/gas/testsuite/gas/mips/ldstla-n64-sym32.d
@@ -1,5 +1,5 @@
 #objdump: -dr
-#as: -64 -msym32 -G8 -EB
+#as: -march=from-abi -64 -msym32 -G8 -EB
 #name: MIPS ld-st-la with sym32
 #source: ldstla-sym32.s
 

diff --git a/gas/testsuite/gas/mips/ldstla-n64.d b/gas/testsuite/gas/mips/ldstla-n64.d
index dd028fce00ac56db6c5ebd0514bdd84bc7788822..99c903359e6e5ccddab951a9bf4bd41fec061195 100644 (file)
--- a/gas/testsuite/gas/mips/ldstla-n64.d
+++ b/gas/testsuite/gas/mips/ldstla-n64.d
@@ -1,5 +1,5 @@
 #objdump: -d
-#as: -64
+#as: -march=from-abi -64
 #name: MIPS ld-st-la constants (ABI n64)
 #source: ldstla-n64.s
 

diff --git a/gas/testsuite/gas/mips/macro-warn-1-n32.d b/gas/testsuite/gas/mips/macro-warn-1-n32.d
index 08ea8d8694a77c0965b476d388d345ec003ba27e..60c10d1f8fff5f249d20d3abe6facd083a4ae833 100644 (file)
--- a/gas/testsuite/gas/mips/macro-warn-1-n32.d
+++ b/gas/testsuite/gas/mips/macro-warn-1-n32.d
@@ -1,4 +1,4 @@
-#as: -n32 -KPIC
+#as: -march=from-abi -n32 -KPIC
 #source: macro-warn-1.s
 #stderr: macro-warn-1-n32.l
 #objdump: -p

diff --git a/gas/testsuite/gas/mips/macro-warn-2-n32.d b/gas/testsuite/gas/mips/macro-warn-2-n32.d
index 7a8c20638bfcd5f445abdc1e38976793670312e6..49454d022c28794079d6e51911f877b492f150f5 100644 (file)
--- a/gas/testsuite/gas/mips/macro-warn-2-n32.d
+++ b/gas/testsuite/gas/mips/macro-warn-2-n32.d
@@ -1,4 +1,4 @@
-#as: -n32 -KPIC
+#as: -march=from-abi -n32 -KPIC
 #source: macro-warn-2.s
 #objdump: -p
 #pass

diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index f2b585c5d8635f9cd4e1e17a990c34169083d159..1cc4b6fb28c5ecd1484b593a7dc55f112e211cb7 100644 (file)
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -458,7 +458,7 @@ if { [istarget mips*-*-vxworks*] } {
     set ecoff [expr [istarget *-*-ecoff*] || [istarget *-*-ultrix*] || [istarget *-*-irix\[1-4\]*] ]
     set aout [expr [istarget *-*-bsd*] || [istarget *-*-openbsd*] ]
     set addr32 [expr [istarget mipstx39*-*-*] || [istarget mips-*-linux*] || [istarget mipsel-*-linux*] || [istarget mips*-*-ecoff]]
-    set has_newabi [expr [istarget *-*-irix6*] || [istarget mips64*-*-linux*] || [istarget mips*-sde-elf*]]
+    set has_newabi [expr [istarget *-*-irix6*] || [istarget mips*-*-linux*] || [istarget mips*-sde-elf*]]
     set no_mips16 [expr !$elf]
     set no_micromips [expr !$elf]
 

diff --git a/gas/testsuite/gas/mips/n32-consec.d b/gas/testsuite/gas/mips/n32-consec.d
index 355d92e3b194a6232ae9407b319b5b954f348423..806857e8162e927114c3b8026dfab97bb8cce00f 100644 (file)
--- a/gas/testsuite/gas/mips/n32-consec.d
+++ b/gas/testsuite/gas/mips/n32-consec.d
@@ -1,4 +1,4 @@
-#as: -n32
+#as: -march=from-abi -n32
 #objdump: -Dr --prefix-addresses
 #name: n32 consecutive unrelated relocations
 

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 49bcaf9f97f7ceebcc682c32a2a8c3e8cf22a65d..7f93d4dbdd0d6f5a35a436c9fe46bb23111c8e21 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,37 @@
+2012-08-06  Maciej W. Rozycki  <macro@codesourcery.com>
+
+       * ld-mips-elf/mips-elf.exp: Set has_newabi for all Linux targets.
+       Adjust abi_asflags for targets that do not infer the ISA from the
+       ABI.
+       * ld-mips-elf/eh-frame1-n32.d: Adjust for targets that do not
+       infer the ISA from the ABI.
+       * ld-mips-elf/eh-frame1-n64.d: Likewise.
+       * ld-mips-elf/eh-frame2-n32.d: Likewise.
+       * ld-mips-elf/eh-frame2-n64.d: Likewise.
+       * ld-mips-elf/elf-rel-got-n32-embed.d: Likewise.
+       * ld-mips-elf/elf-rel-got-n32.d: Likewise.
+       * ld-mips-elf/elf-rel-got-n64-embed.d: Likewise.
+       * ld-mips-elf/elf-rel-got-n64-linux.d: Likewise.
+       * ld-mips-elf/elf-rel-got-n64.d: Likewise.
+       * ld-mips-elf/elf-rel-xgot-n32-embed.d: Likewise.
+       * ld-mips-elf/elf-rel-xgot-n32.d: Likewise.
+       * ld-mips-elf/elf-rel-xgot-n64-embed.d: Likewise.
+       * ld-mips-elf/elf-rel-xgot-n64-linux.d: Likewise.
+       * ld-mips-elf/elf-rel-xgot-n64.d: Likewise.
+       * ld-mips-elf/emit-relocs-1.d: Likewise.
+       * ld-mips-elf/got-page-2.d: Likewise.
+       * ld-mips-elf/no-shared-1-n32.d: Likewise.
+       * ld-mips-elf/no-shared-1-n64.d: Likewise.
+       * ld-mips-elf/rel32-n32.d: Likewise.
+       * ld-mips-elf/rel64.d: Likewise.
+       * ld-mips-elf/relax-jalr-n32-shared.d: Likewise.
+       * ld-mips-elf/relax-jalr-n32.d: Likewise.
+       * ld-mips-elf/relax-jalr-n64-shared.d: Likewise.
+       * ld-mips-elf/relax-jalr-n64.d: Likewise.
+       * ld-mips-elf/reloc-1-n32.d: Likewise.
+       * ld-mips-elf/reloc-1-n64.d: Likewise.
+       * ld-mips-elf/textrel-1.d: Likewise.
+
 2012-08-06  Maciej W. Rozycki  <macro@codesourcery.com>
 
        * ld-mips-elf/reloc-1-n32.d: Add -EB to GAS flags.

diff --git a/ld/testsuite/ld-mips-elf/eh-frame1-n32.d b/ld/testsuite/ld-mips-elf/eh-frame1-n32.d
index a460512a978757d4c2faa2268904244f83b5123f..0542ebd6978e6ebd0c46d5250759a2092ced3283 100644 (file)
--- a/ld/testsuite/ld-mips-elf/eh-frame1-n32.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame1-n32.d
@@ -1,7 +1,7 @@
 #name: MIPS eh-frame 1, n32
 #source: eh-frame1.s
 #source: eh-frame1.s
-#as: -EB -n32 --defsym alignment=2 --defsym fill=0x40
+#as: -march=from-abi -EB -n32 --defsym alignment=2 --defsym fill=0x40
 #readelf: --relocs -wf
 #ld: -shared -melf32btsmipn32 -Teh-frame1.ld
 #warning: fde encoding in.*prevents \.eh_frame_hdr table being created.

diff --git a/ld/testsuite/ld-mips-elf/eh-frame1-n64.d b/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
index c77315f9cb44a9e1ae56d9265cc60f70926045a7..f0c4dcdbf7e5aa451d1aa7d7aabb67dd184c60b4 100644 (file)
--- a/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
@@ -1,7 +1,7 @@
 #name: MIPS eh-frame 1, n64
 #source: eh-frame1.s
 #source: eh-frame1.s
-#as: -EB -64 --defsym alignment=3 --defsym fill=0x40
+#as: -march=from-abi -EB -64 --defsym alignment=3 --defsym fill=0x40
 #readelf: --relocs -wf
 #ld: -shared -melf64btsmip -Teh-frame1.ld
 #warning: fde encoding in.*prevents \.eh_frame_hdr table being created.

diff --git a/ld/testsuite/ld-mips-elf/eh-frame2-n32.d b/ld/testsuite/ld-mips-elf/eh-frame2-n32.d
index e2649559153b171e84c89e1d0063b056f1286555..cda44097f7b2147667eb0029be627946b1a9db84 100644 (file)
--- a/ld/testsuite/ld-mips-elf/eh-frame2-n32.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame2-n32.d
@@ -1,7 +1,7 @@
 #name: MIPS eh-frame 2, n32
 #source: eh-frame1.s
 #source: eh-frame1.s
-#as: -EB -n32 --defsym alignment=2 --defsym fill=0
+#as: -march=from-abi -EB -n32 --defsym alignment=2 --defsym fill=0
 #readelf: --relocs -wf
 #ld: -shared -melf32btsmipn32 -Teh-frame1.ld
 #warning: fde encoding in.*prevents \.eh_frame_hdr table being created.

diff --git a/ld/testsuite/ld-mips-elf/eh-frame2-n64.d b/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
index 237c3d46f9ca682de16ebeab780b49e953bc3877..80a092cc55d93a7028801b36cc5976e2025e70a7 100644 (file)
--- a/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
@@ -1,7 +1,7 @@
 #name: MIPS eh-frame 2, n64
 #source: eh-frame1.s
 #source: eh-frame1.s
-#as: -EB -64 --defsym alignment=3 --defsym fill=0
+#as: -march=from-abi -EB -64 --defsym alignment=3 --defsym fill=0
 #readelf: --relocs -wf
 #ld: -shared -melf64btsmip -Teh-frame1.ld
 #warning: fde encoding in.*prevents \.eh_frame_hdr table being created.

diff --git a/ld/testsuite/ld-mips-elf/elf-rel-got-n32-embed.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n32-embed.d
index 69c8b7fe29ac8b9fc2dc47398cb1e4e71f2e0068..d492998be81f5dc19d86236a4124725d98446f23 100644 (file)
--- a/ld/testsuite/ld-mips-elf/elf-rel-got-n32-embed.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-got-n32-embed.d
@@ -1,5 +1,5 @@
 #name: MIPS ELF got reloc n32
-#as: -EB -n32 -KPIC
+#as: -march=from-abi -EB -n32 -KPIC
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n32.s
 #ld:
 #objdump: -D --show-raw-insn

diff --git a/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d
index 1b21726d130040ef49b3badb8d6501efaa7bc8b5..535a538e7125d63694b419d499260b9f2b79fdad 100644 (file)
--- a/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d
@@ -1,5 +1,5 @@
 #name: MIPS ELF got reloc n32
-#as: -EB -n32 -KPIC
+#as: -march=from-abi -EB -n32 -KPIC
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n32.s
 #ld:
 #objdump: -D --show-raw-insn

diff --git a/ld/testsuite/ld-mips-elf/elf-rel-got-n64-embed.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n64-embed.d
index 07a97f905f6ea4a63a15256f91b38393f63344a4..f2719f071406058d5628fba6809303dea0c38595 100644 (file)
--- a/ld/testsuite/ld-mips-elf/elf-rel-got-n64-embed.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-got-n64-embed.d
@@ -1,5 +1,5 @@
 #name: MIPS ELF got reloc n64
-#as: -EB -64 -KPIC
+#as: -march=from-abi -EB -64 -KPIC
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s
 #ld:
 #objdump: -D --show-raw-insn

diff --git a/ld/testsuite/ld-mips-elf/elf-rel-got-n64-linux.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n64-linux.d
index c8d59098d2d05528f76c3d9cb049c7178701bf39..c1c332645fcff3f31739c61d5e5dbc55c3c1de27 100644 (file)
--- a/ld/testsuite/ld-mips-elf/elf-rel-got-n64-linux.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-got-n64-linux.d
@@ -1,5 +1,5 @@
 #name: MIPS ELF got reloc n64
-#as: -EB -64 -KPIC
+#as: -march=from-abi -EB -64 -KPIC
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s
 #ld:
 #objdump: -D --show-raw-insn

diff --git a/ld/testsuite/ld-mips-elf/elf-rel-got-n64.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n64.d
index 32589fb9114e42b09558a1f46d150a7fa23f4f7b..55dd7ae65ef4ceed13b654e5b470b6724ffadf64 100644 (file)
--- a/ld/testsuite/ld-mips-elf/elf-rel-got-n64.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-got-n64.d
@@ -1,5 +1,5 @@
 #name: MIPS ELF got reloc n64
-#as: -EB -64 -KPIC
+#as: -march=from-abi -EB -64 -KPIC
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s
 #ld:
 #objdump: -D --show-raw-insn

diff --git a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32-embed.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32-embed.d
index edcbbf07ab6dbc82c3c32f82cd7a5f1090b1a8ee..1d0c045d0411092c7e6c68e6e94916af7c3ad402 100644 (file)
--- a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32-embed.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32-embed.d
@@ -1,5 +1,5 @@
 #name: MIPS ELF xgot reloc n32
-#as: -EB -n32 -KPIC -xgot
+#as: -march=from-abi -EB -n32 -KPIC -xgot
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n32.s
 #ld:
 #objdump: -D --show-raw-insn

diff --git a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d
index e8a3aec17eeacc06f3fe5636b9e3f27fc67a4455..4e105aa0ab04a7b4e88d21d019101ffcd7ab74e6 100644 (file)
--- a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d
@@ -1,5 +1,5 @@
 #name: MIPS ELF xgot reloc n32
-#as: -EB -n32 -KPIC -xgot
+#as: -march=from-abi -EB -n32 -KPIC -xgot
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n32.s
 #ld:
 #objdump: -D --show-raw-insn

diff --git a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-embed.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-embed.d
index 4c5a07d6d5e59fa6e13be37707f89a71912ef9f2..6da691c575fdf2bf0fa80f60be6a2cca08c6614e 100644 (file)
--- a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-embed.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-embed.d
@@ -1,5 +1,5 @@
 #name: MIPS ELF xgot reloc n64
-#as: -EB -64 -KPIC -xgot
+#as: -march=from-abi -EB -64 -KPIC -xgot
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s
 #ld:
 #objdump: -D --show-raw-insn

diff --git a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-linux.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-linux.d
index 58e496f696f57da5e82464b4bbc364ff3cceebba..be446f0579e1448c0f8fa7ddc208bea8f64532a3 100644 (file)
--- a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-linux.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-linux.d
@@ -1,5 +1,5 @@
 #name: MIPS ELF xgot reloc n64
-#as: -EB -64 -KPIC -xgot
+#as: -march=from-abi -EB -64 -KPIC -xgot
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s
 #ld:
 #objdump: -D --show-raw-insn

diff --git a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d
index 5e6a7f9fc046460bda1d52614da460e5aec5189f..6a9ea40513ba9f6ea68b2791900ddc4c2175695e 100644 (file)
--- a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d
@@ -1,5 +1,5 @@
 #name: MIPS ELF xgot reloc n64
-#as: -EB -64 -KPIC -xgot
+#as: -march=from-abi -EB -64 -KPIC -xgot
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s
 #ld:
 #objdump: -D --show-raw-insn

diff --git a/ld/testsuite/ld-mips-elf/emit-relocs-1.d b/ld/testsuite/ld-mips-elf/emit-relocs-1.d
index 520d40181d31b1eda48f06fa2b1f6146c19534a3..bff7c70e83d431d1856f1d7e983b3c10f45b6708 100644 (file)
--- a/ld/testsuite/ld-mips-elf/emit-relocs-1.d
+++ b/ld/testsuite/ld-mips-elf/emit-relocs-1.d
@@ -1,6 +1,6 @@
 #name: Emit relocs 1
-#source: emit-relocs-1a.s -mabi=n32 -EB
-#source: emit-relocs-1b.s -mabi=n32 -EB
+#source: emit-relocs-1a.s -march=from-abi -mabi=n32 -EB
+#source: emit-relocs-1b.s -march=from-abi -mabi=n32 -EB
 #ld: -q -T emit-relocs-1.ld -melf32btsmipn32
 #objdump: -sr
 

diff --git a/ld/testsuite/ld-mips-elf/got-page-2.d b/ld/testsuite/ld-mips-elf/got-page-2.d
index ad198d0219c750e747800f6e31f2742647d63b59..9cdefeb594973d7b45316cd1ce04ec6eef2a67d4 100644 (file)
--- a/ld/testsuite/ld-mips-elf/got-page-2.d
+++ b/ld/testsuite/ld-mips-elf/got-page-2.d
@@ -1,6 +1,6 @@
 #name: GOT page test 2
 #source: got-page-2.s
-#as: -EB -n32
+#as: -march=from-abi -EB -n32
 #ld: -T got-page-1.ld -shared -melf32btsmipn32
 #readelf: -d
 #

diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index dc4554df16fb7744afba114f57e4db0c2702512f..d9430fffaa883bdcf17ab1508d580fb506fb7146 100644 (file)
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -54,15 +54,15 @@ if {![istarget mips*-*-*] || ![is_elf_format]} {
 }
 
 set has_newabi [expr [istarget *-*-irix6*] \
-                    || [istarget mips64*-*-linux*] \
+                    || [istarget mips*-*-linux*] \
                     || [istarget mips*-sde-elf*]]
 set linux_gnu [expr [istarget mips*-*-linux*]]
 set embedded_elf [expr [istarget mips*-*-elf]]
 
 # Set defaults.
 set abi_asflags(o32) ""
-set abi_asflags(n32) "-n32 -EB"
-set abi_asflags(n64) "-64 -EB"
+set abi_asflags(n32) "-march=from-abi -n32 -EB"
+set abi_asflags(n64) "-march=from-abi -64 -EB"
 set abi_ldflags(o32) ""
 set abi_ldflags(n32) -melf32bmipn32
 set abi_ldflags(n64) -melf64bmip

diff --git a/ld/testsuite/ld-mips-elf/no-shared-1-n32.d b/ld/testsuite/ld-mips-elf/no-shared-1-n32.d
index a28b22e8aa77b45b39af7a2c69da0fa65b7819b5..04c466ea431d5d11ddd77db3eff17fcd76c3ff35 100644 (file)
--- a/ld/testsuite/ld-mips-elf/no-shared-1-n32.d
+++ b/ld/testsuite/ld-mips-elf/no-shared-1-n32.d
@@ -1,4 +1,4 @@
-#as: -mabi=n32 -EB
+#as: -march=from-abi -mabi=n32 -EB
 #source: no-shared-1-o32.s
 #ld: -melf32btsmipn32 -T no-shared-1.ld
 #objdump: -dr -j.text -j.data -j.got

diff --git a/ld/testsuite/ld-mips-elf/no-shared-1-n64.d b/ld/testsuite/ld-mips-elf/no-shared-1-n64.d
index ea74ebb07fb784ce019e22ee62844add2a6f34cc..0c919217f3cb7606a1226464f344be61ef8a456f 100644 (file)
--- a/ld/testsuite/ld-mips-elf/no-shared-1-n64.d
+++ b/ld/testsuite/ld-mips-elf/no-shared-1-n64.d
@@ -1,4 +1,4 @@
-#as: -mabi=64 -EB
+#as: -march=from-abi -mabi=64 -EB
 #ld: -melf64btsmip -T no-shared-1.ld
 #objdump: -dr -j.text -j.data -j.got
 

diff --git a/ld/testsuite/ld-mips-elf/rel32-n32.d b/ld/testsuite/ld-mips-elf/rel32-n32.d
index aae33b3575e13f3729bf416058bf410bfbb40036..995161561a0de1fa16a602ddffeb48fa97b1f479 100644 (file)
--- a/ld/testsuite/ld-mips-elf/rel32-n32.d
+++ b/ld/testsuite/ld-mips-elf/rel32-n32.d
@@ -1,6 +1,6 @@
 #name: MIPS rel32 n32
 #source: rel32.s
-#as: -KPIC -EB -n32
+#as: -march=from-abi -KPIC -EB -n32
 #readelf: -x .text -r
 #ld: -shared -melf32btsmipn32
 

diff --git a/ld/testsuite/ld-mips-elf/rel64.d b/ld/testsuite/ld-mips-elf/rel64.d
index 4279e2820445ce3518b98a762181837734762625..01bffa39084cad3a731adda0972c25ee8472ffe1 100644 (file)
--- a/ld/testsuite/ld-mips-elf/rel64.d
+++ b/ld/testsuite/ld-mips-elf/rel64.d
@@ -1,6 +1,6 @@
 #name: MIPS rel64 n64
 #source: rel64.s
-#as: -KPIC -EB -64
+#as: -march=from-abi -KPIC -EB -64
 #readelf: -x .text -r
 #ld: -shared -melf64btsmip
 

diff --git a/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d b/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d
index c9288c1d1adc1594b1b3c6fa84bcd272f6115065..3b564412d5cd06088f396e2bfc1978df602d870c 100644 (file)
--- a/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d
+++ b/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d
@@ -1,6 +1,6 @@
 #name: MIPS relax-jalr-shared n32
 #source: relax-jalr.s
-#as: -KPIC -n32 -EB
+#as: -march=from-abi -KPIC -n32 -EB
 #objdump: --prefix-addresses -d --show-raw-insn
 #ld: --relax -shared -melf32btsmipn32
 

diff --git a/ld/testsuite/ld-mips-elf/relax-jalr-n32.d b/ld/testsuite/ld-mips-elf/relax-jalr-n32.d
index 2478b5211bd8e2bc11832c3bf34c5e253eb3831e..3a4b0b6bb9d859ffa63260504dbef06256c47b62 100644 (file)
--- a/ld/testsuite/ld-mips-elf/relax-jalr-n32.d
+++ b/ld/testsuite/ld-mips-elf/relax-jalr-n32.d
@@ -1,6 +1,6 @@
 #name: MIPS relax-jalr n32
 #source: relax-jalr.s
-#as: -KPIC -n32 -EB
+#as: -march=from-abi -KPIC -n32 -EB
 #objdump: --prefix-addresses -d --show-raw-insn
 #ld: --relax -melf32btsmipn32
 

diff --git a/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d b/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d
index e26d5f15466a700d631e4751611348cde3124de9..c0138ea06f9f2582cdf9d350024fac528f6e7460 100644 (file)
--- a/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d
+++ b/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d
@@ -1,6 +1,6 @@
 #name: MIPS relax-jalr-shared n64
 #source: relax-jalr.s
-#as: -KPIC -64 -EB
+#as: -march=from-abi -KPIC -64 -EB
 #objdump: --prefix-addresses -d --show-raw-insn
 #ld: --relax -shared -melf64btsmip
 

diff --git a/ld/testsuite/ld-mips-elf/relax-jalr-n64.d b/ld/testsuite/ld-mips-elf/relax-jalr-n64.d
index 9e169747e884bd88119ec8ffad6c92e01316485e..6b4f3f5992bb41a21f0d6fa1d375a670d1675c21 100644 (file)
--- a/ld/testsuite/ld-mips-elf/relax-jalr-n64.d
+++ b/ld/testsuite/ld-mips-elf/relax-jalr-n64.d
@@ -1,6 +1,6 @@
 #name: MIPS relax-jalr n64
 #source: relax-jalr.s
-#as: -KPIC -64 -EB
+#as: -march=from-abi -KPIC -64 -EB
 #objdump: --prefix-addresses -d --show-raw-insn
 #ld: --relax -melf64btsmip
 

diff --git a/ld/testsuite/ld-mips-elf/reloc-1-n32.d b/ld/testsuite/ld-mips-elf/reloc-1-n32.d
index 57773bb067b154358520f35330799398bf596a1d..e9f38e5576b4f0f39eef723b8e23f6b696c91b7b 100644 (file)
--- a/ld/testsuite/ld-mips-elf/reloc-1-n32.d
+++ b/ld/testsuite/ld-mips-elf/reloc-1-n32.d
@@ -1,5 +1,5 @@
-#source: reloc-1a.s -mabi=n32 -EB
-#source: reloc-1b.s -mabi=n32 -EB
+#source: reloc-1a.s -march=from-abi -mabi=n32 -EB
+#source: reloc-1b.s -march=from-abi -mabi=n32 -EB
 #ld: -r
 #readelf: --relocs
 

diff --git a/ld/testsuite/ld-mips-elf/reloc-1-n64.d b/ld/testsuite/ld-mips-elf/reloc-1-n64.d
index 6057c833777a18e602a9d2411c8de9886a1815d9..b76f818822ad7c0c88ce3b9e4d92d41abd3978b5 100644 (file)
--- a/ld/testsuite/ld-mips-elf/reloc-1-n64.d
+++ b/ld/testsuite/ld-mips-elf/reloc-1-n64.d
@@ -1,5 +1,5 @@
-#source: reloc-1a.s -mabi=64 -EB
-#source: reloc-1b.s -mabi=64 -EB
+#source: reloc-1a.s -march=from-abi -mabi=64 -EB
+#source: reloc-1b.s -march=from-abi -mabi=64 -EB
 #ld: -r
 #readelf: --relocs
 

diff --git a/ld/testsuite/ld-mips-elf/textrel-1.d b/ld/testsuite/ld-mips-elf/textrel-1.d
index b0615b57125614b6a57a2bcb32951e3810636cfb..801c5861e3e3e2cda8b42fac89fd246b1198f836 100644 (file)
--- a/ld/testsuite/ld-mips-elf/textrel-1.d
+++ b/ld/testsuite/ld-mips-elf/textrel-1.d
@@ -1,6 +1,6 @@
 #name: MIPS textrel-1
 #source: textrel-1.s
-#as: -EB -n32
+#as: -march=from-abi -EB -n32
 #ld: -shared -melf32btsmipn32
 #readelf: -d