This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Re: check mips abi x linker emulation compatibility
- From: Alexandre Oliva <aoliva at redhat dot com>
- To: Thiemo Seufer <ica2_ts at csv dot ica dot uni-stuttgart dot de>, echristo at redhat dot com
- Cc: binutils at sources dot redhat dot com
- Date: 07 May 2003 01:12:15 -0300
- Subject: Re: check mips abi x linker emulation compatibility
- Organization: GCC Team, Red Hat
- References: <orsmtdty9d.fsf@free.redhat.lsd.ic.unicamp.br><20030324013532.GA1769@rembrandt.csv.ica.uni-stuttgart.de><or7kaklylu.fsf@free.redhat.lsd.ic.unicamp.br>
On Mar 28, 2003, Alexandre Oliva <aoliva@redhat.com> wrote:
> On Mar 23, 2003, Thiemo Seufer <ica2_ts@csv.ica.uni-stuttgart.de> wrote:
>> IMHO it's better to change the GAS default to n32 for mips64-unknown-linux
>> and mips-sgi-irix6, because that is/will be the most heavily used ABI
>> variant on NewABI capable systems.
> Ok, here's a patch that fixes a typo in my earlier bfd patch, changes
> the assembler default ABI as you suggest, adjusting the assembler and
> the linker testsuite. The assembler testsuite is currently very
> broken, because of a patch that Eric installed the other day, but I
> reverted his patch in my tree and, after the patch, got failures only
> in the empic tests, that have been broken for a while. The linker
> testsuite was a bit trickier to fix: a number of tests seem to
> actually depend on o32 behavior, and a few of the flag-compatibility
> tests go further and actually rely on the no-abi default of the
> assembler, which doesn't hold for mips64-linux-gnu. I'm thinking of
> simply disabling the 5 failing tests that depended on this behavior
> (perhaps only for mips64-linux-gnu?). They are:
> FAIL: MIPS incompatible objects: "-mips32" "-mips64"
> FAIL: MIPS incompatible objects: "-mips32r2" "-mips64"
> FAIL: MIPS compatible objects: "-mips4 -mgp32" "-mips2"
> FAIL: MIPS compatible objects: "-mips2" "-mips4 -mabi=eabi -mgp32"
> FAIL: MIPS compatible objects: "-march=sb1 -mgp32" "-march=4000 -mgp32"
It turned out I had a goof in my linker default.exp patch that caused
the failures in `incompatible' objects. As for the compatible
failures, the problem was wrong expectations. The -mips2 case
in the second `compatible' test would not have any ABI, but without a
NO_ABI as default, it would not be compatible with -mabi=eabi. The
other two failed because 32bitmode would no longer be set, given that
it is only set if mips_abi == NO_ABI in the assembler.
Here's a revised patch, that passes all tests on mips64-linux, and
doesn't introduce any regression on mips-elf. Ok?
Index: bfd/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Improve
error message for mixing different-endian files. Check for ABI
compatibility of input files with the selected emulation.
Index: bfd/elfxx-mips.c
===================================================================
RCS file: /cvs/uberbaum/bfd/elfxx-mips.c,v
retrieving revision 1.51
diff -u -p -r1.51 elfxx-mips.c
--- bfd/elfxx-mips.c 12 Apr 2003 08:50:28 -0000 1.51
+++ bfd/elfxx-mips.c 7 May 2003 03:56:28 -0000
@@ -9174,11 +9174,24 @@ _bfd_mips_elf_merge_private_bfd_data (ib
/* Check if we have the same endianess */
if (! _bfd_generic_verify_endian_match (ibfd, obfd))
- return FALSE;
+ {
+ (*_bfd_error_handler)
+ (_("%s: endianness incompatible with that of the selected emulation"),
+ bfd_archive_filename (ibfd));
+ return FALSE;
+ }
if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
|| bfd_get_flavour (obfd) != bfd_target_elf_flavour)
return TRUE;
+
+ if (strcmp (bfd_get_target (ibfd), bfd_get_target (obfd)) != 0)
+ {
+ (*_bfd_error_handler)
+ (_("%s: ABI is incompatible with that of the selected emulation"),
+ bfd_archive_filename (ibfd));
+ return FALSE;
+ }
new_flags = elf_elfheader (ibfd)->e_flags;
elf_elfheader (obfd)->e_flags |= new_flags & EF_MIPS_NOREORDER;
Index: gas/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* configure.in (MIPS_DEFAULT_ABI): AC_DEFINE.
* config/tc-mips.c (mips_after_parse_args): Set mips_abi to it.
* config.in, configure: Rebuilt.
Index: gas/configure.in
===================================================================
RCS file: /cvs/uberbaum/gas/configure.in,v
retrieving revision 1.129
diff -u -p -r1.129 configure.in
--- gas/configure.in 28 Apr 2003 23:48:42 -0000 1.129
+++ gas/configure.in 7 May 2003 03:57:08 -0000
@@ -580,12 +580,26 @@ changequote([,])dnl
mips_default_64bit=0
;;
esac
+ # Decide which ABI to target by default.
+ case ${target} in
+ mips64*-linux* | mips-sgi-irix6*)
+ mips_default_abi=N32_ABI
+ ;;
+ mips*-linux*)
+ mips_default_abi=O32_ABI
+ ;;
+ *)
+ mips_default_abi=NO_ABI
+ ;;
+ esac
AC_DEFINE_UNQUOTED(MIPS_CPU_STRING_DEFAULT, "$mips_cpu",
[Default CPU for MIPS targets. ])
AC_DEFINE_UNQUOTED(USE_E_MIPS_ABI_O32, $use_e_mips_abi_o32,
[Allow use of E_MIPS_ABI_O32 on MIPS targets. ])
AC_DEFINE_UNQUOTED(MIPS_DEFAULT_64BIT, $mips_default_64bit,
[Generate 64-bit code by default on MIPS targets. ])
+ AC_DEFINE_UNQUOTED(MIPS_DEFAULT_ABI, $mips_default_abi,
+ [Choose a default ABI for MIPS targets. ])
;;
esac
Index: gas/config/tc-mips.c
===================================================================
RCS file: /cvs/uberbaum/gas/config/tc-mips.c,v
retrieving revision 1.206
diff -u -p -r1.206 tc-mips.c
--- gas/config/tc-mips.c 6 May 2003 00:28:25 -0000 1.206
+++ gas/config/tc-mips.c 7 May 2003 03:57:15 -0000
@@ -11225,6 +11225,9 @@ mips_after_parse_args ()
g_switch_value = 0;
}
+ if (mips_abi == NO_ABI)
+ mips_abi = MIPS_DEFAULT_ABI;
+
/* The following code determines the architecture and register size.
Similar code was added to GCC 3.3 (see override_options() in
config/mips/mips.c). The GAS and GCC code should be kept in sync
Index: gas/testsuite/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* gas/mips/abs.d, gas/mips/add.d, gas/mips/and.d,
gas/mips/beq.d, gas/mips/bge.d, gas/mips/bgeu.d,
gas/mips/blt.d, gas/mips/bltu.d, gas/mips/branch-misc-1.d,
gas/mips/break20.d, gas/mips/cp0sel-names-mips32.d,
gas/mips/cp0sel-names-mips32r2.d,
gas/mips/cp0sel-names-mips64.d,
gas/mips/cp0sel-names-numeric.d, gas/mips/cp0sel-names-sb1.d,
gas/mips/elf-jal.d, gas/mips/elf-rel.d, gas/mips/elf-rel2.d,
gas/mips/elf-rel3.d, gas/mips/elf-rel4.d, gas/mips/elf-rel5.d,
gas/mips/elf-rel6.d, gas/mips/elf-rel7.d,
gas/mips/elf_arch_mips1.d, gas/mips/elf_arch_mips2.d,
gas/mips/elf_arch_mips3.d, gas/mips/elf_arch_mips32.d,
gas/mips/elf_arch_mips32r2.d, gas/mips/elf_arch_mips4.d,
gas/mips/elf_arch_mips5.d, gas/mips/elf_arch_mips64.d,
gas/mips/elf_ase_mips16.d, gas/mips/empic.d,
gas/mips/empic2.d, gas/mips/empic3_e.d, gas/mips/empic3_g1.d,
gas/mips/empic3_g2.d, gas/mips/hwr-names-mips32r2.d,
gas/mips/hwr-names-numeric.d, gas/mips/jal-empic-elf-2.d,
gas/mips/jal-empic-elf-3.d, gas/mips/jal-empic-elf.d,
gas/mips/jal-svr4pic.d, gas/mips/jal-xgot.d, gas/mips/jal.d,
gas/mips/la-empic.d, gas/mips/la-svr4pic.d,
gas/mips/la-xgot.d, gas/mips/la.d, gas/mips/lb-empic.d,
gas/mips/lb-svr4pic.d, gas/mips/lb-xgot-ilocks.d,
gas/mips/lb-xgot.d, gas/mips/lb.d, gas/mips/ld-empic.d,
gas/mips/ld-svr4pic.d, gas/mips/ld-xgot.d, gas/mips/ld.d,
gas/mips/li.d, gas/mips/lif-empic.d, gas/mips/lif-svr4pic.d,
gas/mips/lif-xgot.d, gas/mips/lifloat.d,
gas/mips/mips-gp32-fp32-pic.d, gas/mips/mips-gp32-fp32.d,
gas/mips/mips-gp32-fp64-pic.d, gas/mips/mips-gp32-fp64.d,
gas/mips/mips-gp64-fp32-pic.d, gas/mips/mips-gp64-fp32.d,
gas/mips/mips-gp64-fp64-pic.d, gas/mips/mips-gp64-fp64.d,
gas/mips/mips.exp, gas/mips/mips16-e.d, gas/mips/mips16-f.d,
gas/mips/mips32.d, gas/mips/mips32r2.d, gas/mips/mips4010.d,
gas/mips/mips4650.d, gas/mips/mips64.d, gas/mips/mipsel16-e.d,
gas/mips/mipsel16-f.d, gas/mips/rol-hw.d, gas/mips/rol.d,
gas/mips/sb.d, gas/mips/sync.d, gas/mips/tempic.d,
gas/mips/tmips16-e.d, gas/mips/tmips16-f.d,
gas/mips/tmipsel16-e.d, gas/mips/tmipsel16-f.d,
gas/mips/trunc.d, gas/mips/uld.d, gas/mips/ulh-empic.d,
gas/mips/ulh-svr4pic.d, gas/mips/ulh-xgot.d, gas/mips/ulh.d,
gas/mips/ulh2-eb.d, gas/mips/ulh2-el.d, gas/mips/ulw.d,
gas/mips/ulw2-eb.d, gas/mips/ulw2-eb-ilocks.d, gas/mips/ulw2-el.d,
gas/mips/ulw2-el-ilocks.d, gas/mips/usd.d, gas/mips/ush.d,
gas/mips/usw.d, gas/mips/vr4122.d: Added ABI specification.
gas/vtable/vtable.exp: mips64*-*-linux* and mips*-*-irix6* are
RELA.
Index: gas/testsuite/gas/mips/abs.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/abs.d,v
retrieving revision 1.4
diff -u -p -r1.4 abs.d
--- gas/testsuite/gas/mips/abs.d 27 Dec 2002 23:51:48 -0000 1.4
+++ gas/testsuite/gas/mips/abs.d 7 May 2003 03:56:40 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses
#name: MIPS abs
+#as: -32
# Test the abs macro.
Index: gas/testsuite/gas/mips/add.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/add.d,v
retrieving revision 1.3
diff -u -p -r1.3 add.d
--- gas/testsuite/gas/mips/add.d 27 Dec 2002 23:51:48 -0000 1.3
+++ gas/testsuite/gas/mips/add.d 7 May 2003 03:56:40 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses
#name: MIPS add
+#as: -32
# Test the add macro.
Index: gas/testsuite/gas/mips/and.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/and.d,v
retrieving revision 1.3
diff -u -p -r1.3 and.d
--- gas/testsuite/gas/mips/and.d 27 Dec 2002 23:51:48 -0000 1.3
+++ gas/testsuite/gas/mips/and.d 7 May 2003 03:56:40 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses
#name: MIPS and
+#as: -32
# Test the and macro.
Index: gas/testsuite/gas/mips/beq.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/beq.d,v
retrieving revision 1.5
diff -u -p -r1.5 beq.d
--- gas/testsuite/gas/mips/beq.d 12 Dec 2002 04:40:22 -0000 1.5
+++ gas/testsuite/gas/mips/beq.d 7 May 2003 03:56:40 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:4000
#name: MIPS beq
+#as: -32
# Test the beq macro.
Index: gas/testsuite/gas/mips/bge.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/bge.d,v
retrieving revision 1.7
diff -u -p -r1.7 bge.d
--- gas/testsuite/gas/mips/bge.d 12 Mar 2003 23:05:31 -0000 1.7
+++ gas/testsuite/gas/mips/bge.d 7 May 2003 03:56:40 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:4000
#name: MIPS bge
+#as: -32
# Test the bge macro.
Index: gas/testsuite/gas/mips/bgeu.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/bgeu.d,v
retrieving revision 1.7
diff -u -p -r1.7 bgeu.d
--- gas/testsuite/gas/mips/bgeu.d 12 Mar 2003 23:05:31 -0000 1.7
+++ gas/testsuite/gas/mips/bgeu.d 7 May 2003 03:56:40 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:4000
#name: MIPS bgeu
+#as: -32
# Test the bgeu macro.
Index: gas/testsuite/gas/mips/blt.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/blt.d,v
retrieving revision 1.7
diff -u -p -r1.7 blt.d
--- gas/testsuite/gas/mips/blt.d 12 Mar 2003 23:05:31 -0000 1.7
+++ gas/testsuite/gas/mips/blt.d 7 May 2003 03:56:40 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:4000
#name: MIPS blt
+#as: -32
# Test the blt macro.
Index: gas/testsuite/gas/mips/bltu.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/bltu.d,v
retrieving revision 1.7
diff -u -p -r1.7 bltu.d
--- gas/testsuite/gas/mips/bltu.d 12 Mar 2003 23:05:31 -0000 1.7
+++ gas/testsuite/gas/mips/bltu.d 7 May 2003 03:56:40 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:4000
#name: MIPS bltu
+#as: -32
# Test the bltu macro.
Index: gas/testsuite/gas/mips/branch-misc-1.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/branch-misc-1.d,v
retrieving revision 1.1
diff -u -p -r1.1 branch-misc-1.d
--- gas/testsuite/gas/mips/branch-misc-1.d 18 Sep 2002 20:50:46 -0000 1.1
+++ gas/testsuite/gas/mips/branch-misc-1.d 7 May 2003 03:56:40 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS branch-misc-1
+#as: -32
# Test the branches to local symbols in current file.
Index: gas/testsuite/gas/mips/break20.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/break20.d,v
retrieving revision 1.2
diff -u -p -r1.2 break20.d
--- gas/testsuite/gas/mips/break20.d 29 Jun 2001 21:27:43 -0000 1.2
+++ gas/testsuite/gas/mips/break20.d 7 May 2003 03:56:40 -0000
@@ -1,4 +1,4 @@
-#as: -march=r3900
+#as: -32 -march=r3900
#objdump: -dr --prefix-addresses -mmips:3900
#name: MIPS 20-bit break
Index: gas/testsuite/gas/mips/cp0sel-names-mips32.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/cp0sel-names-mips32.d,v
retrieving revision 1.1
diff -u -p -r1.1 cp0sel-names-mips32.d
--- gas/testsuite/gas/mips/cp0sel-names-mips32.d 31 Dec 2002 08:11:17 -0000 1.1
+++ gas/testsuite/gas/mips/cp0sel-names-mips32.d 7 May 2003 03:56:40 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32 -M gpr-names=numeric,cp0-names=mips32
#name: MIPS CP0 with sel register disassembly (mips32)
-#as: -march=mips32
+#as: -32 -march=mips32
#source: cp0sel-names.s
# Check objdump's handling of -M cp0-names=foo options.
Index: gas/testsuite/gas/mips/cp0sel-names-mips32r2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/cp0sel-names-mips32r2.d,v
retrieving revision 1.1
diff -u -p -r1.1 cp0sel-names-mips32r2.d
--- gas/testsuite/gas/mips/cp0sel-names-mips32r2.d 31 Dec 2002 08:11:17 -0000 1.1
+++ gas/testsuite/gas/mips/cp0sel-names-mips32r2.d 7 May 2003 03:56:40 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32 -M gpr-names=numeric,cp0-names=mips32r2
#name: MIPS CP0 with sel register disassembly (mips32r2)
-#as: -march=mips32
+#as: -32 -march=mips32
#source: cp0sel-names.s
# Check objdump's handling of -M cp0-names=foo options.
Index: gas/testsuite/gas/mips/cp0sel-names-mips64.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/cp0sel-names-mips64.d,v
retrieving revision 1.1
diff -u -p -r1.1 cp0sel-names-mips64.d
--- gas/testsuite/gas/mips/cp0sel-names-mips64.d 31 Dec 2002 08:11:17 -0000 1.1
+++ gas/testsuite/gas/mips/cp0sel-names-mips64.d 7 May 2003 03:56:40 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32 -M gpr-names=numeric,cp0-names=mips64
#name: MIPS CP0 with sel register disassembly (mips64)
-#as: -march=mips32
+#as: -32 -march=mips32
#source: cp0sel-names.s
# Check objdump's handling of -M cp0-names=foo options.
Index: gas/testsuite/gas/mips/cp0sel-names-numeric.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/cp0sel-names-numeric.d,v
retrieving revision 1.1
diff -u -p -r1.1 cp0sel-names-numeric.d
--- gas/testsuite/gas/mips/cp0sel-names-numeric.d 31 Dec 2002 08:11:17 -0000 1.1
+++ gas/testsuite/gas/mips/cp0sel-names-numeric.d 7 May 2003 03:56:40 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32 -M gpr-names=numeric,cp0-names=numeric
#name: MIPS CP0 with sel register disassembly (numeric)
-#as: -march=mips32
+#as: -32 -march=mips32
#source: cp0sel-names.s
# Check objdump's handling of -M cp0-names=foo options.
Index: gas/testsuite/gas/mips/cp0sel-names-sb1.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/cp0sel-names-sb1.d,v
retrieving revision 1.1
diff -u -p -r1.1 cp0sel-names-sb1.d
--- gas/testsuite/gas/mips/cp0sel-names-sb1.d 31 Dec 2002 08:11:17 -0000 1.1
+++ gas/testsuite/gas/mips/cp0sel-names-sb1.d 7 May 2003 03:56:40 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32 -M gpr-names=numeric,cp0-names=sb1
#name: MIPS CP0 with sel register disassembly (sb1)
-#as: -march=mips32
+#as: -32 -march=mips32
#source: cp0sel-names.s
# Check objdump's handling of -M cp0-names=foo options.
Index: gas/testsuite/gas/mips/elf-jal.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf-jal.d,v
retrieving revision 1.2
diff -u -p -r1.2 elf-jal.d
--- gas/testsuite/gas/mips/elf-jal.d 27 Dec 2002 23:51:48 -0000 1.2
+++ gas/testsuite/gas/mips/elf-jal.d 7 May 2003 03:56:40 -0000
@@ -1,6 +1,7 @@
#objdump: -dr --prefix-addresses
#name: MIPS ELF jal
#source: jal.s
+#as: -32
# Test the jal macro.
Index: gas/testsuite/gas/mips/elf-rel.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf-rel.d,v
retrieving revision 1.6
diff -u -p -r1.6 elf-rel.d
--- gas/testsuite/gas/mips/elf-rel.d 23 May 2002 17:25:21 -0000 1.6
+++ gas/testsuite/gas/mips/elf-rel.d 7 May 2003 03:56:41 -0000
@@ -1,5 +1,6 @@
#objdump: -sr -j .text
#name: MIPS ELF reloc
+#as: -32
# Test the HI16/LO16 generation.
Index: gas/testsuite/gas/mips/elf-rel2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf-rel2.d,v
retrieving revision 1.4
diff -u -p -r1.4 elf-rel2.d
--- gas/testsuite/gas/mips/elf-rel2.d 10 Aug 2001 20:38:33 -0000 1.4
+++ gas/testsuite/gas/mips/elf-rel2.d 7 May 2003 03:56:41 -0000
@@ -1,5 +1,6 @@
#objdump: -sr -j .text
#name: MIPS ELF reloc 2
+#as: -mabi=o64
# Test the GPREL and LITERAL generation.
# FIXME: really this should check that the contents of .sdata, .lit4,
Index: gas/testsuite/gas/mips/elf-rel3.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf-rel3.d,v
retrieving revision 1.3
diff -u -p -r1.3 elf-rel3.d
--- gas/testsuite/gas/mips/elf-rel3.d 10 Aug 2001 20:38:33 -0000 1.3
+++ gas/testsuite/gas/mips/elf-rel3.d 7 May 2003 03:56:41 -0000
@@ -1,5 +1,6 @@
#objdump: -sr -j .data
#name: MIPS ELF reloc 3
+#as: -32
.*: file format elf.*mips
Index: gas/testsuite/gas/mips/elf-rel4.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf-rel4.d,v
retrieving revision 1.2
diff -u -p -r1.2 elf-rel4.d
--- gas/testsuite/gas/mips/elf-rel4.d 4 Oct 2001 00:57:01 -0000 1.2
+++ gas/testsuite/gas/mips/elf-rel4.d 7 May 2003 03:56:41 -0000
@@ -1,5 +1,6 @@
#objdump: --prefix-addresses -dr
#name: MIPS ELF reloc 4
+#as: -32
.*: +file format.*
Index: gas/testsuite/gas/mips/elf-rel5.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf-rel5.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf-rel5.d
--- gas/testsuite/gas/mips/elf-rel5.d 17 Nov 2001 02:59:06 -0000 1.1
+++ gas/testsuite/gas/mips/elf-rel5.d 7 May 2003 03:56:41 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS ELF reloc 5
+#as: -32
.*: +file format elf.*mips.*
Index: gas/testsuite/gas/mips/elf-rel6.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf-rel6.d,v
retrieving revision 1.2
diff -u -p -r1.2 elf-rel6.d
--- gas/testsuite/gas/mips/elf-rel6.d 2 Aug 2002 02:33:48 -0000 1.2
+++ gas/testsuite/gas/mips/elf-rel6.d 7 May 2003 03:56:41 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses
#name: MIPS ELF reloc 6
+#as: -32
.*: +file format elf.*mips.*
Index: gas/testsuite/gas/mips/elf-rel7.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf-rel7.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf-rel7.d
--- gas/testsuite/gas/mips/elf-rel7.d 21 Oct 2002 14:59:30 -0000 1.1
+++ gas/testsuite/gas/mips/elf-rel7.d 7 May 2003 03:56:41 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses
#name: MIPS ELF reloc 7
+#as: -32
.*: +file format elf.*mips.*
Index: gas/testsuite/gas/mips/elf_arch_mips1.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_arch_mips1.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf_arch_mips1.d
--- gas/testsuite/gas/mips/elf_arch_mips1.d 31 Dec 2002 07:42:20 -0000 1.1
+++ gas/testsuite/gas/mips/elf_arch_mips1.d 7 May 2003 03:56:41 -0000
@@ -1,7 +1,7 @@
# name: ELF MIPS1 markings
# source: empty.s
# objdump: -p
-# as: -march=mips1
+# as: -32 -march=mips1
.*:.*file format.*elf.*mips.*
# Note: objdump omits leading zeros, so must check for the fact that
Index: gas/testsuite/gas/mips/elf_arch_mips2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_arch_mips2.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf_arch_mips2.d
--- gas/testsuite/gas/mips/elf_arch_mips2.d 31 Dec 2002 07:42:20 -0000 1.1
+++ gas/testsuite/gas/mips/elf_arch_mips2.d 7 May 2003 03:56:41 -0000
@@ -1,7 +1,7 @@
# name: ELF MIPS2 markings
# source: empty.s
# objdump: -p
-# as: -march=mips2
+# as: -32 -march=mips2
.*:.*file format.*elf.*mips.*
private flags = 1.......: .*\[mips2\].*
Index: gas/testsuite/gas/mips/elf_arch_mips3.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_arch_mips3.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf_arch_mips3.d
--- gas/testsuite/gas/mips/elf_arch_mips3.d 31 Dec 2002 07:42:20 -0000 1.1
+++ gas/testsuite/gas/mips/elf_arch_mips3.d 7 May 2003 03:56:41 -0000
@@ -1,7 +1,7 @@
# name: ELF MIPS3 markings
# source: empty.s
# objdump: -p
-# as: -march=mips3
+# as: -32 -march=mips3
.*:.*file format.*elf.*mips.*
private flags = 2.......: .*\[mips3\].*
Index: gas/testsuite/gas/mips/elf_arch_mips32.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_arch_mips32.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf_arch_mips32.d
--- gas/testsuite/gas/mips/elf_arch_mips32.d 31 Dec 2002 07:42:20 -0000 1.1
+++ gas/testsuite/gas/mips/elf_arch_mips32.d 7 May 2003 03:56:41 -0000
@@ -1,7 +1,7 @@
# name: ELF MIPS32 markings
# source: empty.s
# objdump: -p
-# as: -march=mips32
+# as: -32 -march=mips32
.*:.*file format.*elf.*mips.*
private flags = 5.......: .*\[mips32\].*
Index: gas/testsuite/gas/mips/elf_arch_mips32r2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_arch_mips32r2.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf_arch_mips32r2.d
--- gas/testsuite/gas/mips/elf_arch_mips32r2.d 31 Dec 2002 07:42:20 -0000 1.1
+++ gas/testsuite/gas/mips/elf_arch_mips32r2.d 7 May 2003 03:56:41 -0000
@@ -1,7 +1,7 @@
# name: ELF MIPS32r2 markings
# source: empty.s
# objdump: -p
-# as: -march=mips32r2
+# as: -32 -march=mips32r2
.*:.*file format.*elf.*mips.*
private flags = 7.......: .*\[mips32r2\].*
Index: gas/testsuite/gas/mips/elf_arch_mips4.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_arch_mips4.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf_arch_mips4.d
--- gas/testsuite/gas/mips/elf_arch_mips4.d 31 Dec 2002 07:42:20 -0000 1.1
+++ gas/testsuite/gas/mips/elf_arch_mips4.d 7 May 2003 03:56:41 -0000
@@ -1,7 +1,7 @@
# name: ELF MIPS4 markings
# source: empty.s
# objdump: -p
-# as: -march=mips4
+# as: -32 -march=mips4
.*:.*file format.*elf.*mips.*
private flags = 3.......: .*\[mips4\].*
Index: gas/testsuite/gas/mips/elf_arch_mips5.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_arch_mips5.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf_arch_mips5.d
--- gas/testsuite/gas/mips/elf_arch_mips5.d 31 Dec 2002 07:42:20 -0000 1.1
+++ gas/testsuite/gas/mips/elf_arch_mips5.d 7 May 2003 03:56:41 -0000
@@ -1,7 +1,7 @@
# name: ELF MIPS5 markings
# source: empty.s
# objdump: -p
-# as: -march=mips5
+# as: -32 -march=mips5
.*:.*file format.*elf.*mips.*
private flags = 4.......: .*\[mips5\].*
Index: gas/testsuite/gas/mips/elf_arch_mips64.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_arch_mips64.d,v
retrieving revision 1.1
diff -u -p -r1.1 elf_arch_mips64.d
--- gas/testsuite/gas/mips/elf_arch_mips64.d 31 Dec 2002 07:42:20 -0000 1.1
+++ gas/testsuite/gas/mips/elf_arch_mips64.d 7 May 2003 03:56:41 -0000
@@ -1,7 +1,7 @@
# name: ELF MIPS64 markings
# source: empty.s
# objdump: -p
-# as: -march=mips64
+# as: -32 -march=mips64
.*:.*file format.*elf.*mips.*
private flags = 6.......: .*\[mips64\].*
Index: gas/testsuite/gas/mips/elf_ase_mips16.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/elf_ase_mips16.d,v
retrieving revision 1.2
diff -u -p -r1.2 elf_ase_mips16.d
--- gas/testsuite/gas/mips/elf_ase_mips16.d 31 Dec 2002 07:42:20 -0000 1.2
+++ gas/testsuite/gas/mips/elf_ase_mips16.d 7 May 2003 03:56:41 -0000
@@ -1,7 +1,7 @@
# name: ELF MIPS16 ASE markings
# source: empty.s
# objdump: -p
-# as: -mips16
+# as: -32 -mips16
.*:.*file format.*mips.*
private flags = [0-9a-f]*[4-7c-f]......: .*[[,]mips16[],].*
Index: gas/testsuite/gas/mips/empic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/empic.d,v
retrieving revision 1.8
diff -u -p -r1.8 empic.d
--- gas/testsuite/gas/mips/empic.d 9 Aug 2002 11:07:24 -0000 1.8
+++ gas/testsuite/gas/mips/empic.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: -rst -mmips:4000
#name: MIPS empic
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
#stderr: empic.l
# Check GNU-specific embedded relocs, for ELF.
Index: gas/testsuite/gas/mips/empic2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/empic2.d,v
retrieving revision 1.2
diff -u -p -r1.2 empic2.d
--- gas/testsuite/gas/mips/empic2.d 26 Feb 2002 22:17:56 -0000 1.2
+++ gas/testsuite/gas/mips/empic2.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: --prefix-addresses -dr --show-raw-insn -mmips:4000
#name: MIPS empic2
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
# Check assembly of and relocs for -membedded-pic la, lw, ld, sw, sd macros.
Index: gas/testsuite/gas/mips/empic3_e.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/empic3_e.d,v
retrieving revision 1.1
diff -u -p -r1.1 empic3_e.d
--- gas/testsuite/gas/mips/empic3_e.d 2 Jan 2002 18:59:30 -0000 1.1
+++ gas/testsuite/gas/mips/empic3_e.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: --prefix-addresses -dr --show-raw-insn -mmips:4000
#name: MIPS empic3 (external)
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
# Check PC-relative HI/LO relocs relocs for -membedded-pic when HI and
# LO are split over a 32K boundary.
Index: gas/testsuite/gas/mips/empic3_g1.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/empic3_g1.d,v
retrieving revision 1.1
diff -u -p -r1.1 empic3_g1.d
--- gas/testsuite/gas/mips/empic3_g1.d 2 Jan 2002 18:59:30 -0000 1.1
+++ gas/testsuite/gas/mips/empic3_g1.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: --prefix-addresses -dr --show-raw-insn -mmips:4000
#name: MIPS empic3 (global, negative)
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
# Check PC-relative HI/LO relocs relocs for -membedded-pic when HI and
# LO are split over a 32K boundary.
Index: gas/testsuite/gas/mips/empic3_g2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/empic3_g2.d,v
retrieving revision 1.1
diff -u -p -r1.1 empic3_g2.d
--- gas/testsuite/gas/mips/empic3_g2.d 2 Jan 2002 18:59:30 -0000 1.1
+++ gas/testsuite/gas/mips/empic3_g2.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: --prefix-addresses -dr --show-raw-insn -mmips:4000
#name: MIPS empic3 (global, positive)
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
# Check PC-relative HI/LO relocs relocs for -membedded-pic when HI and
# LO are split over a 32K boundary.
Index: gas/testsuite/gas/mips/hwr-names-mips32r2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/hwr-names-mips32r2.d,v
retrieving revision 1.1
diff -u -p -r1.1 hwr-names-mips32r2.d
--- gas/testsuite/gas/mips/hwr-names-mips32r2.d 31 Dec 2002 07:29:28 -0000 1.1
+++ gas/testsuite/gas/mips/hwr-names-mips32r2.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32r2 -M gpr-names=numeric,hwr-names=mips32r2
#name: MIPS HWR disassembly (mips32r2)
-#as: -mips32r2
+#as: -32 -mips32r2
#source: hwr-names.s
# Check objdump's handling of -M hwr-names=foo options.
Index: gas/testsuite/gas/mips/hwr-names-numeric.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/hwr-names-numeric.d,v
retrieving revision 1.1
diff -u -p -r1.1 hwr-names-numeric.d
--- gas/testsuite/gas/mips/hwr-names-numeric.d 31 Dec 2002 07:29:28 -0000 1.1
+++ gas/testsuite/gas/mips/hwr-names-numeric.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32r2 -M gpr-names=numeric,hwr-names=numeric
#name: MIPS HWR disassembly (numeric)
-#as: -mips32r2
+#as: -32 -mips32r2
#source: hwr-names.s
# Check objdump's handling of -M hwr-names=foo options.
Index: gas/testsuite/gas/mips/jal-empic-elf-2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/jal-empic-elf-2.d,v
retrieving revision 1.2
diff -u -p -r1.2 jal-empic-elf-2.d
--- gas/testsuite/gas/mips/jal-empic-elf-2.d 27 Dec 2002 23:51:48 -0000 1.2
+++ gas/testsuite/gas/mips/jal-empic-elf-2.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS jal-empic-elf-2
-#as: -membedded-pic
+#as: -32 -membedded-pic
# Test the jal macro harder with -membedded-pic.
Index: gas/testsuite/gas/mips/jal-empic-elf-3.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/jal-empic-elf-3.d,v
retrieving revision 1.2
diff -u -p -r1.2 jal-empic-elf-3.d
--- gas/testsuite/gas/mips/jal-empic-elf-3.d 27 Dec 2002 23:51:48 -0000 1.2
+++ gas/testsuite/gas/mips/jal-empic-elf-3.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS jal-empic-elf-3
-#as: -membedded-pic
+#as: -32 -membedded-pic
# Test the jal macro harder with -membedded-pic.
Index: gas/testsuite/gas/mips/jal-empic-elf.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/jal-empic-elf.d,v
retrieving revision 1.2
diff -u -p -r1.2 jal-empic-elf.d
--- gas/testsuite/gas/mips/jal-empic-elf.d 27 Dec 2002 23:51:48 -0000 1.2
+++ gas/testsuite/gas/mips/jal-empic-elf.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS jal-empic-elf
-#as: -membedded-pic
+#as: -32 -membedded-pic
#source: jal.s
# Test the jal macro with -membedded-pic.
Index: gas/testsuite/gas/mips/jal-svr4pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/jal-svr4pic.d,v
retrieving revision 1.5
diff -u -p -r1.5 jal-svr4pic.d
--- gas/testsuite/gas/mips/jal-svr4pic.d 23 Oct 2001 19:20:28 -0000 1.5
+++ gas/testsuite/gas/mips/jal-svr4pic.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS R3000 jal-svr4pic
-#as: -mips1 -KPIC -mtune=r3000
+#as: -32 -mips1 -KPIC -mtune=r3000
# Test the jal macro with -KPIC.
Index: gas/testsuite/gas/mips/jal-xgot.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/jal-xgot.d,v
retrieving revision 1.5
diff -u -p -r1.5 jal-xgot.d
--- gas/testsuite/gas/mips/jal-xgot.d 23 Oct 2001 19:20:28 -0000 1.5
+++ gas/testsuite/gas/mips/jal-xgot.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS R3000 jal-xgot
-#as: -mips1 -KPIC -xgot -mtune=r3000
+#as: -32 -mips1 -KPIC -xgot -mtune=r3000
#source: jal-svr4pic.s
# Test the jal macro with -KPIC -xgot.
Index: gas/testsuite/gas/mips/jal.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/jal.d,v
retrieving revision 1.2
diff -u -p -r1.2 jal.d
--- gas/testsuite/gas/mips/jal.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/jal.d 7 May 2003 03:56:41 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:4000
#name: MIPS jal
+#as: -32
# Test the jal macro.
Index: gas/testsuite/gas/mips/la-empic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/la-empic.d,v
retrieving revision 1.2
diff -u -p -r1.2 la-empic.d
--- gas/testsuite/gas/mips/la-empic.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/la-empic.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS la-empic
-#as: -mips1 -membedded-pic
+#as: -32 -mips1 -membedded-pic
# Test the la macro with -membedded-pic.
Index: gas/testsuite/gas/mips/la-svr4pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/la-svr4pic.d,v
retrieving revision 1.4
diff -u -p -r1.4 la-svr4pic.d
--- gas/testsuite/gas/mips/la-svr4pic.d 15 May 2001 12:11:13 -0000 1.4
+++ gas/testsuite/gas/mips/la-svr4pic.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS la-svr4pic
-#as: -mips1 -KPIC --defsym KPIC=1
+#as: -32 -mips1 -KPIC --defsym KPIC=1
#source: la.s
# Test the la macro with -KPIC.
Index: gas/testsuite/gas/mips/la-xgot.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/la-xgot.d,v
retrieving revision 1.4
diff -u -p -r1.4 la-xgot.d
--- gas/testsuite/gas/mips/la-xgot.d 15 May 2001 12:11:13 -0000 1.4
+++ gas/testsuite/gas/mips/la-xgot.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS la-xgot
-#as: -mips1 -KPIC -xgot --defsym KPIC=1
+#as: -32 -mips1 -KPIC -xgot --defsym KPIC=1
#source: la.s
# Test the la macro with -KPIC -xgot.
Index: gas/testsuite/gas/mips/la.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/la.d,v
retrieving revision 1.3
diff -u -p -r1.3 la.d
--- gas/testsuite/gas/mips/la.d 15 May 2001 12:11:13 -0000 1.3
+++ gas/testsuite/gas/mips/la.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS la
-#as: -mips1
+#as: -32 -mips1
# Test the la macro.
Index: gas/testsuite/gas/mips/lb-empic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lb-empic.d,v
retrieving revision 1.2
diff -u -p -r1.2 lb-empic.d
--- gas/testsuite/gas/mips/lb-empic.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/lb-empic.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS lb-empic
-#as: -mips1 -membedded-pic
+#as: -32 -mips1 -membedded-pic
#source: lb-pic.s
# Test the lb macro with -membedded-pic.
Index: gas/testsuite/gas/mips/lb-svr4pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lb-svr4pic.d,v
retrieving revision 1.3
diff -u -p -r1.3 lb-svr4pic.d
--- gas/testsuite/gas/mips/lb-svr4pic.d 27 Dec 2002 23:51:48 -0000 1.3
+++ gas/testsuite/gas/mips/lb-svr4pic.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses
#name: MIPS lb-svr4pic
-#as: -KPIC
+#as: -32 -KPIC
#source: lb-pic.s
# Test the lb macro with -KPIC.
Index: gas/testsuite/gas/mips/lb-xgot-ilocks.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lb-xgot-ilocks.d,v
retrieving revision 1.4
diff -u -p -r1.4 lb-xgot-ilocks.d
--- gas/testsuite/gas/mips/lb-xgot-ilocks.d 3 Jul 2001 18:49:04 -0000 1.4
+++ gas/testsuite/gas/mips/lb-xgot-ilocks.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS lb-xgot-ilocks
-#as: -mips1 -KPIC -xgot -mtune=r3900 -march=r3900
+#as: -32 -mips1 -KPIC -xgot -mtune=r3900 -march=r3900
#source: lb-pic.s
# Test the lb macro with -KPIC -xgot.
Index: gas/testsuite/gas/mips/lb-xgot.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lb-xgot.d,v
retrieving revision 1.3
diff -u -p -r1.3 lb-xgot.d
--- gas/testsuite/gas/mips/lb-xgot.d 29 Jun 2001 21:27:43 -0000 1.3
+++ gas/testsuite/gas/mips/lb-xgot.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS lb-xgot
-#as: -mips1 -KPIC -xgot -mtune=r3000
+#as: -32 -mips1 -KPIC -xgot -mtune=r3000
#source: lb-pic.s
# Test the lb macro with -KPIC -xgot.
Index: gas/testsuite/gas/mips/lb.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lb.d,v
retrieving revision 1.4
diff -u -p -r1.4 lb.d
--- gas/testsuite/gas/mips/lb.d 27 Dec 2002 23:51:48 -0000 1.4
+++ gas/testsuite/gas/mips/lb.d 7 May 2003 03:56:41 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses
#name: MIPS lb
+#as: -32
# Test the lb macro.
Index: gas/testsuite/gas/mips/ld-empic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ld-empic.d,v
retrieving revision 1.3
diff -u -p -r1.3 ld-empic.d
--- gas/testsuite/gas/mips/ld-empic.d 25 Oct 2001 01:22:18 -0000 1.3
+++ gas/testsuite/gas/mips/ld-empic.d 7 May 2003 03:56:41 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS ld-empic
-#as: -mips1 -membedded-pic --defsym EMPIC=1
+#as: -32 -mips1 -membedded-pic --defsym EMPIC=1
#source: ld-pic.s
# Test the ld macro with -membedded-pic.
Index: gas/testsuite/gas/mips/ld-svr4pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ld-svr4pic.d,v
retrieving revision 1.3
diff -u -p -r1.3 ld-svr4pic.d
--- gas/testsuite/gas/mips/ld-svr4pic.d 29 Jun 2001 21:27:43 -0000 1.3
+++ gas/testsuite/gas/mips/ld-svr4pic.d 7 May 2003 03:56:42 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS ld-svr4pic
-#as: -mips1 -mtune=r3000 -KPIC
+#as: -32 -mips1 -mtune=r3000 -KPIC
#source: ld-pic.s
# Test the ld macro with -KPIC.
Index: gas/testsuite/gas/mips/ld-xgot.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ld-xgot.d,v
retrieving revision 1.3
diff -u -p -r1.3 ld-xgot.d
--- gas/testsuite/gas/mips/ld-xgot.d 29 Jun 2001 21:27:43 -0000 1.3
+++ gas/testsuite/gas/mips/ld-xgot.d 7 May 2003 03:56:42 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS ld-xgot
-#as: -mips1 -mtune=r3000 -KPIC -xgot
+#as: -32 -mips1 -mtune=r3000 -KPIC -xgot
#source: ld-pic.s
# Test the ld macro with -KPIC -xgot.
Index: gas/testsuite/gas/mips/ld.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ld.d,v
retrieving revision 1.4
diff -u -p -r1.4 ld.d
--- gas/testsuite/gas/mips/ld.d 4 Oct 2001 00:57:01 -0000 1.4
+++ gas/testsuite/gas/mips/ld.d 7 May 2003 03:56:42 -0000
@@ -1,5 +1,5 @@
#objdump: -dr --prefix-addresses -mmips:4000
-#as: -march=r4000
+#as: -32 -march=r4000
#name: MIPS ld
# Test the ld macro.
Index: gas/testsuite/gas/mips/li.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/li.d,v
retrieving revision 1.2
diff -u -p -r1.2 li.d
--- gas/testsuite/gas/mips/li.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/li.d 7 May 2003 03:56:42 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:4000
#name: MIPS li
+#as: -32
# Test the li macro.
Index: gas/testsuite/gas/mips/lif-empic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lif-empic.d,v
retrieving revision 1.3
diff -u -p -r1.3 lif-empic.d
--- gas/testsuite/gas/mips/lif-empic.d 27 Jul 2001 06:26:23 -0000 1.3
+++ gas/testsuite/gas/mips/lif-empic.d 7 May 2003 03:56:42 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS lifloat-empic
-#as: -mips1 -membedded-pic --defsym EMPIC=1
+#as: -32 -mips1 -membedded-pic --defsym EMPIC=1
#source: lifloat.s
# Test the li.d and li.s macros with -membedded-pic.
Index: gas/testsuite/gas/mips/lif-svr4pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lif-svr4pic.d,v
retrieving revision 1.3
diff -u -p -r1.3 lif-svr4pic.d
--- gas/testsuite/gas/mips/lif-svr4pic.d 29 Jun 2001 21:27:43 -0000 1.3
+++ gas/testsuite/gas/mips/lif-svr4pic.d 7 May 2003 03:56:42 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS lifloat-svr4pic
-#as: -mips1 -mtune=r3000 -KPIC -EB --defsym SVR4=1
+#as: -32 -mips1 -mtune=r3000 -KPIC -EB --defsym SVR4=1
#source: lifloat.s
# Test the li.d and li.s macros with -KPIC.
Index: gas/testsuite/gas/mips/lif-xgot.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lif-xgot.d,v
retrieving revision 1.3
diff -u -p -r1.3 lif-xgot.d
--- gas/testsuite/gas/mips/lif-xgot.d 29 Jun 2001 21:27:43 -0000 1.3
+++ gas/testsuite/gas/mips/lif-xgot.d 7 May 2003 03:56:42 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS lifloat-xgot
-#as: -mips1 -mtune=r3000 -KPIC -xgot -EB --defsym XGOT=1
+#as: -32 -mips1 -mtune=r3000 -KPIC -xgot -EB --defsym XGOT=1
#source: lifloat.s
# Test the li.d and li.s macros with -KPIC -xgot.
Index: gas/testsuite/gas/mips/lifloat.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/lifloat.d,v
retrieving revision 1.2
diff -u -p -r1.2 lifloat.d
--- gas/testsuite/gas/mips/lifloat.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/lifloat.d 7 May 2003 03:56:42 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS lifloat
-#as: -mips1
+#as: -32 -mips1
# Test the li.d and li.s macros.
Index: gas/testsuite/gas/mips/mips-gp32-fp32-pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips-gp32-fp32-pic.d,v
retrieving revision 1.3
diff -u -p -r1.3 mips-gp32-fp32-pic.d
--- gas/testsuite/gas/mips/mips-gp32-fp32-pic.d 10 Aug 2001 16:28:04 -0000 1.3
+++ gas/testsuite/gas/mips/mips-gp32-fp32-pic.d 7 May 2003 03:56:42 -0000
@@ -1,5 +1,5 @@
#objdump: -d -mmips:8000
-#as: -march=8000 -EB -mgp32 -mfp32 -KPIC
+#as: -32 -march=8000 -EB -mgp32 -mfp32 -KPIC
#name: MIPS -mgp32 -mfp32 (SVR4 PIC)
.*: +file format.*
Index: gas/testsuite/gas/mips/mips-gp32-fp32.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips-gp32-fp32.d,v
retrieving revision 1.3
diff -u -p -r1.3 mips-gp32-fp32.d
--- gas/testsuite/gas/mips/mips-gp32-fp32.d 10 Aug 2001 16:28:04 -0000 1.3
+++ gas/testsuite/gas/mips/mips-gp32-fp32.d 7 May 2003 03:56:42 -0000
@@ -1,5 +1,5 @@
#objdump: -d -mmips:8000
-#as: -march=8000 -EB -mgp32 -mfp32
+#as: -32 -march=8000 -EB -mgp32 -mfp32
#name: MIPS -mgp32 -mfp32
.*: +file format.*
Index: gas/testsuite/gas/mips/mips-gp32-fp64-pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips-gp32-fp64-pic.d,v
retrieving revision 1.4
diff -u -p -r1.4 mips-gp32-fp64-pic.d
--- gas/testsuite/gas/mips/mips-gp32-fp64-pic.d 25 Jul 2002 09:48:07 -0000 1.4
+++ gas/testsuite/gas/mips/mips-gp32-fp64-pic.d 7 May 2003 03:56:42 -0000
@@ -1,5 +1,5 @@
#objdump: -d -mmips:8000
-#as: -march=8000 -EB -mgp32 -mfp64 -KPIC
+#as: -32 -march=8000 -EB -mgp32 -mfp64 -KPIC
#name: MIPS -mgp32 -mfp64 (SVR4 PIC)
.*: +file format.*
Index: gas/testsuite/gas/mips/mips-gp32-fp64.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips-gp32-fp64.d,v
retrieving revision 1.4
diff -u -p -r1.4 mips-gp32-fp64.d
--- gas/testsuite/gas/mips/mips-gp32-fp64.d 25 Jul 2002 09:48:07 -0000 1.4
+++ gas/testsuite/gas/mips/mips-gp32-fp64.d 7 May 2003 03:56:42 -0000
@@ -1,5 +1,5 @@
#objdump: -d -mmips:8000
-#as: -march=8000 -EB -mgp32 -mfp64
+#as: -32 -march=8000 -EB -mgp32 -mfp64
#name: MIPS -mgp32 -mfp64
.*: +file format.*
Index: gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d,v
retrieving revision 1.4
diff -u -p -r1.4 mips-gp64-fp32-pic.d
--- gas/testsuite/gas/mips/mips-gp64-fp32-pic.d 25 Feb 2002 13:21:38 -0000 1.4
+++ gas/testsuite/gas/mips/mips-gp64-fp32-pic.d 7 May 2003 03:56:42 -0000
@@ -1,5 +1,5 @@
#objdump: -d -mmips:8000
-#as: -march=8000 -EB -mfp32 -KPIC
+#as: -mabi=o64 -march=8000 -EB -mfp32 -KPIC
#name: MIPS -mgp64 -mfp32 (SVR4 PIC)
.*: +file format.*
Index: gas/testsuite/gas/mips/mips-gp64-fp32.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips-gp64-fp32.d,v
retrieving revision 1.5
diff -u -p -r1.5 mips-gp64-fp32.d
--- gas/testsuite/gas/mips/mips-gp64-fp32.d 22 Apr 2002 22:29:47 -0000 1.5
+++ gas/testsuite/gas/mips/mips-gp64-fp32.d 7 May 2003 03:56:42 -0000
@@ -1,5 +1,5 @@
#objdump: -d -mmips:8000
-#as: -march=8000 -EB -mfp32
+#as: -mabi=o64 -march=8000 -EB -mfp32
#name: MIPS -mgp64 -mfp32
#stderr: mips-gp64-fp32.l
Index: gas/testsuite/gas/mips/mips-gp64-fp64-pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips-gp64-fp64-pic.d,v
retrieving revision 1.4
diff -u -p -r1.4 mips-gp64-fp64-pic.d
--- gas/testsuite/gas/mips/mips-gp64-fp64-pic.d 25 Feb 2002 13:21:38 -0000 1.4
+++ gas/testsuite/gas/mips/mips-gp64-fp64-pic.d 7 May 2003 03:56:42 -0000
@@ -1,5 +1,5 @@
#objdump: -d -mmips:8000
-#as: -march=8000 -EB -KPIC
+#as: -mabi=o64 -march=8000 -EB -KPIC
#name: MIPS -mgp64 -mfp64 (SVR4 PIC)
.*: +file format.*
Index: gas/testsuite/gas/mips/mips-gp64-fp64.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips-gp64-fp64.d,v
retrieving revision 1.5
diff -u -p -r1.5 mips-gp64-fp64.d
--- gas/testsuite/gas/mips/mips-gp64-fp64.d 22 Apr 2002 22:29:47 -0000 1.5
+++ gas/testsuite/gas/mips/mips-gp64-fp64.d 7 May 2003 03:56:42 -0000
@@ -1,5 +1,5 @@
#objdump: -d -mmips:8000
-#as: -march=8000 -EB
+#as: -mabi=o64 -march=8000 -EB
#name: MIPS -mgp64 -mfp64
#stderr: mips-gp64-fp32.l
Index: gas/testsuite/gas/mips/mips.exp
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips.exp,v
retrieving revision 1.69
diff -u -p -r1.69 mips.exp
--- gas/testsuite/gas/mips/mips.exp 3 May 2003 06:52:20 -0000 1.69
+++ gas/testsuite/gas/mips/mips.exp 7 May 2003 03:56:43 -0000
@@ -423,7 +423,7 @@ if { [istarget mips*-*-*] } then {
run_dump_test_arches "blt" [mips_arch_list_matching mips2]
run_dump_test_arches "bltu" [mips_arch_list_matching mips2]
run_dump_test_arches "branch-misc-1" [mips_arch_list_matching mips1]
- run_list_test_arches "branch-misc-2" "" [mips_arch_list_matching mips1]
+ run_list_test_arches "branch-misc-2" "-32" [mips_arch_list_matching mips1]
if $ilocks {
run_dump_test "div-ilocks"
@@ -447,7 +447,7 @@ if { [istarget mips*-*-*] } then {
run_dump_test_arches "jal-empic-elf-2" [mips_arch_list_matching mips1]
run_dump_test_arches "jal-empic-elf-3" [mips_arch_list_matching mips1]
}
- run_list_test_arches "jal-range" "" [mips_arch_list_matching mips1]
+ run_list_test_arches "jal-range" "-32" [mips_arch_list_matching mips1]
if !$aout { run_dump_test "la" }
if $elf { run_dump_test "la-svr4pic" }
if $elf { run_dump_test "la-xgot" }
@@ -537,7 +537,7 @@ if { [istarget mips*-*-*] } then {
run_dump_test "mips16-jalx"
run_dump_test "mips-jalx"
}
- run_list_test "mips-no-jalx" ""
+ run_list_test "mips-no-jalx" "-32"
run_dump_test "delay"
run_dump_test "nodelay"
run_dump_test "mips4010"
@@ -555,7 +555,7 @@ if { [istarget mips*-*-*] } then {
run_dump_test_arches "mips32" [mips_arch_list_matching mips32]
run_dump_test_arches "mips32r2" [mips_arch_list_matching mips32r2]
- run_list_test_arches "mips32r2-ill" "" [mips_arch_list_matching mips32r2]
+ run_list_test_arches "mips32r2-ill" "-32" [mips_arch_list_matching mips32r2]
run_dump_test_arches "mips64" [mips_arch_list_matching mips64]
@@ -568,8 +568,8 @@ if { [istarget mips*-*-*] } then {
run_dump_test "relax"
- run_list_test "illegal" ""
- run_list_test "baddata1" ""
+ run_list_test "illegal" "-32"
+ run_list_test "baddata1" "-32"
# LOSE: As of 2002-02-08, the next 4 tests fail for target mips-ecoff.
# It's unknown whether they _should_ pass as-is, or whether different
Index: gas/testsuite/gas/mips/mips16-e.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips16-e.d,v
retrieving revision 1.4
diff -u -p -r1.4 mips16-e.d
--- gas/testsuite/gas/mips/mips16-e.d 10 Aug 2001 20:38:33 -0000 1.4
+++ gas/testsuite/gas/mips/mips16-e.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -rst -mips16
#name: MIPS16 reloc
-#as: -mips16
+#as: -32 -mips16
# Check MIPS16 reloc processing
Index: gas/testsuite/gas/mips/mips16-f.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips16-f.d,v
retrieving revision 1.5
diff -u -p -r1.5 mips16-f.d
--- gas/testsuite/gas/mips/mips16-f.d 25 Aug 2001 00:48:49 -0000 1.5
+++ gas/testsuite/gas/mips/mips16-f.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -rst -mips16
#name: MIPS16 reloc 2
-#as: -mips16
+#as: -32 -mips16
# Check MIPS16 reloc processing
Index: gas/testsuite/gas/mips/mips32.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips32.d,v
retrieving revision 1.9
diff -u -p -r1.9 mips32.d
--- gas/testsuite/gas/mips/mips32.d 27 Dec 2002 23:51:48 -0000 1.9
+++ gas/testsuite/gas/mips/mips32.d 7 May 2003 03:56:43 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS MIPS32 instructions
+#as: -32
# Check MIPS32 instruction assembly
Index: gas/testsuite/gas/mips/mips32r2.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips32r2.d,v
retrieving revision 1.2
diff -u -p -r1.2 mips32r2.d
--- gas/testsuite/gas/mips/mips32r2.d 2 Jan 2003 20:03:08 -0000 1.2
+++ gas/testsuite/gas/mips/mips32r2.d 7 May 2003 03:56:43 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
#name: MIPS MIPS32r2 instructions
+#as: -32
# Check MIPS32 Release 2 (mips32r2) instruction assembly
Index: gas/testsuite/gas/mips/mips4010.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips4010.d,v
retrieving revision 1.3
diff -u -p -r1.3 mips4010.d
--- gas/testsuite/gas/mips/mips4010.d 29 Jun 2001 21:27:43 -0000 1.3
+++ gas/testsuite/gas/mips/mips4010.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:4010
#name: MIPS 4010
-#as: -march=4010
+#as: -32 -march=4010
.*: +file format .*mips.*
Index: gas/testsuite/gas/mips/mips4650.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips4650.d,v
retrieving revision 1.3
diff -u -p -r1.3 mips4650.d
--- gas/testsuite/gas/mips/mips4650.d 29 Jun 2001 21:27:43 -0000 1.3
+++ gas/testsuite/gas/mips/mips4650.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:4650
#name: MIPS 4650
-#as: -march=4650 -mtune=4650
+#as: -32 -march=4650 -mtune=4650
.*: +file format .*mips.*
Index: gas/testsuite/gas/mips/mips64.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mips64.d,v
retrieving revision 1.7
diff -u -p -r1.7 mips64.d
--- gas/testsuite/gas/mips/mips64.d 27 Dec 2002 23:51:49 -0000 1.7
+++ gas/testsuite/gas/mips/mips64.d 7 May 2003 03:56:43 -0000
@@ -1,5 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS MIPS64 instructions
+#as: -32
# Check MIPS64 instruction assembly
Index: gas/testsuite/gas/mips/mipsel16-e.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mipsel16-e.d,v
retrieving revision 1.1
diff -u -p -r1.1 mipsel16-e.d
--- gas/testsuite/gas/mips/mipsel16-e.d 25 Aug 2001 00:48:49 -0000 1.1
+++ gas/testsuite/gas/mips/mipsel16-e.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -rst -mips16
#name: MIPS16 reloc
-#as: -mips16
+#as: -32 -mips16
#source: mips16-e.s
# Check MIPS16 reloc processing
Index: gas/testsuite/gas/mips/mipsel16-f.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/mipsel16-f.d,v
retrieving revision 1.4
diff -u -p -r1.4 mipsel16-f.d
--- gas/testsuite/gas/mips/mipsel16-f.d 25 Aug 2001 00:48:49 -0000 1.4
+++ gas/testsuite/gas/mips/mipsel16-f.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -rst -mips16
#name: MIPS16 reloc 2
-#as: -mips16
+#as: -32 -mips16
#source: mips16-f.s
# Check MIPS16 reloc processing
Index: gas/testsuite/gas/mips/rol-hw.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/rol-hw.d,v
retrieving revision 1.2
diff -u -p -r1.2 rol-hw.d
--- gas/testsuite/gas/mips/rol-hw.d 27 Dec 2002 23:51:49 -0000 1.2
+++ gas/testsuite/gas/mips/rol-hw.d 7 May 2003 03:56:43 -0000
@@ -2,6 +2,7 @@
#name: MIPS hardware rol/ror
#source: rol.s
#stderr: rol-hw.l
+#as: -32
# Test the rol and ror macros.
Index: gas/testsuite/gas/mips/rol.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/rol.d,v
retrieving revision 1.6
diff -u -p -r1.6 rol.d
--- gas/testsuite/gas/mips/rol.d 27 Dec 2002 23:51:49 -0000 1.6
+++ gas/testsuite/gas/mips/rol.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,7 @@
#objdump: -dr --prefix-addresses
#name: MIPS macro rol/ror
#stderr: rol.l
+#as: -32
# Test the rol and ror macros.
Index: gas/testsuite/gas/mips/sb.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/sb.d,v
retrieving revision 1.3
diff -u -p -r1.3 sb.d
--- gas/testsuite/gas/mips/sb.d 7 Aug 2001 12:36:13 -0000 1.3
+++ gas/testsuite/gas/mips/sb.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS sb
-#as: -mips1
+#as: -32 -mips1
# Test the sb macro.
Index: gas/testsuite/gas/mips/sync.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/sync.d,v
retrieving revision 1.3
diff -u -p -r1.3 sync.d
--- gas/testsuite/gas/mips/sync.d 3 Dec 2000 20:50:35 -0000 1.3
+++ gas/testsuite/gas/mips/sync.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: sync instructions
-#as: -mips2
+#as: -32 -mips2
.*: +file format .*mips.*
Index: gas/testsuite/gas/mips/tempic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/tempic.d,v
retrieving revision 1.6
diff -u -p -r1.6 tempic.d
--- gas/testsuite/gas/mips/tempic.d 14 Aug 2002 07:24:56 -0000 1.6
+++ gas/testsuite/gas/mips/tempic.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -rst -mmips:4000
#name: MIPS empic
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
#source: empic.s
#stderr: empic.l
Index: gas/testsuite/gas/mips/tmips16-e.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/tmips16-e.d,v
retrieving revision 1.3
diff -u -p -r1.3 tmips16-e.d
--- gas/testsuite/gas/mips/tmips16-e.d 10 Aug 2001 20:38:33 -0000 1.3
+++ gas/testsuite/gas/mips/tmips16-e.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -rst -mips16
#name: MIPS16 reloc
-#as: -mips16
+#as: -32 -mips16
#source: mips16-e.s
# Check MIPS16 reloc processing
Index: gas/testsuite/gas/mips/tmips16-f.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/tmips16-f.d,v
retrieving revision 1.1
diff -u -p -r1.1 tmips16-f.d
--- gas/testsuite/gas/mips/tmips16-f.d 6 Sep 2001 20:02:20 -0000 1.1
+++ gas/testsuite/gas/mips/tmips16-f.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -rst -mips16
#name: MIPS16 reloc 2
-#as: -mips16
+#as: -32 -mips16
#source: mips16-f.s
# Check MIPS16 reloc processing
Index: gas/testsuite/gas/mips/tmipsel16-e.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/tmipsel16-e.d,v
retrieving revision 1.3
diff -u -p -r1.3 tmipsel16-e.d
--- gas/testsuite/gas/mips/tmipsel16-e.d 10 Aug 2001 20:38:33 -0000 1.3
+++ gas/testsuite/gas/mips/tmipsel16-e.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -rst -mips16
#name: MIPS16 reloc
-#as: -mips16
+#as: -32 -mips16
#source: mips16-e.s
# Check MIPS16 reloc processing
Index: gas/testsuite/gas/mips/tmipsel16-f.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/tmipsel16-f.d,v
retrieving revision 1.1
diff -u -p -r1.1 tmipsel16-f.d
--- gas/testsuite/gas/mips/tmipsel16-f.d 25 Aug 2001 00:48:49 -0000 1.1
+++ gas/testsuite/gas/mips/tmipsel16-f.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -rst -mips16
#name: MIPS16 reloc 2
-#as: -mips16
+#as: -32 -mips16
#source: mips16-f.s
# Check MIPS16 reloc processing
Index: gas/testsuite/gas/mips/trunc.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/trunc.d,v
retrieving revision 1.4
diff -u -p -r1.4 trunc.d
--- gas/testsuite/gas/mips/trunc.d 7 Aug 2001 12:36:13 -0000 1.4
+++ gas/testsuite/gas/mips/trunc.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS trunc
-#as: -mips1 -mtune=r3000
+#as: -32 -mips1 -mtune=r3000
# Test the trunc macros.
Index: gas/testsuite/gas/mips/uld.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/uld.d,v
retrieving revision 1.4
diff -u -p -r1.4 uld.d
--- gas/testsuite/gas/mips/uld.d 4 Oct 2001 00:57:01 -0000 1.4
+++ gas/testsuite/gas/mips/uld.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:4000
#name: MIPS uld
-#as: -mips3 -mtune=r4000
+#as: -32 -mips3 -mtune=r4000
# Test the uld macro.
Index: gas/testsuite/gas/mips/ulh-empic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ulh-empic.d,v
retrieving revision 1.2
diff -u -p -r1.2 ulh-empic.d
--- gas/testsuite/gas/mips/ulh-empic.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/ulh-empic.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS ulh-empic
-#as: -mips1 -membedded-pic
+#as: -32 -mips1 -membedded-pic
#source: ulh-pic.s
# Test the ulh macro with -membedded-pic.
Index: gas/testsuite/gas/mips/ulh-svr4pic.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ulh-svr4pic.d,v
retrieving revision 1.2
diff -u -p -r1.2 ulh-svr4pic.d
--- gas/testsuite/gas/mips/ulh-svr4pic.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/ulh-svr4pic.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS ulh-svr4pic
-#as: -mips1 -KPIC -EB
+#as: -32 -mips1 -KPIC -EB
#source: ulh-pic.s
# Test the unaligned load and store macros with -KPIC.
Index: gas/testsuite/gas/mips/ulh-xgot.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ulh-xgot.d,v
retrieving revision 1.3
diff -u -p -r1.3 ulh-xgot.d
--- gas/testsuite/gas/mips/ulh-xgot.d 29 Jun 2001 21:27:43 -0000 1.3
+++ gas/testsuite/gas/mips/ulh-xgot.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS ulh-xgot
-#as: -mips1 -mtune=r3000 -KPIC -xgot -EB --defsym XGOT=1
+#as: -32 -mips1 -mtune=r3000 -KPIC -xgot -EB --defsym XGOT=1
#source: ulh-pic.s
# Test the unaligned load and store macros with -KPIC -xgot.
Index: gas/testsuite/gas/mips/ulh.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ulh.d,v
retrieving revision 1.3
diff -u -p -r1.3 ulh.d
--- gas/testsuite/gas/mips/ulh.d 2 Apr 2003 18:43:16 -0000 1.3
+++ gas/testsuite/gas/mips/ulh.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS ulh
-#as: -mips1
+#as: -32 -mips1
# Test the ulh macro.
Index: gas/testsuite/gas/mips/ulh2-eb.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ulh2-eb.d,v
retrieving revision 1.1
diff -u -p -r1.1 ulh2-eb.d
--- gas/testsuite/gas/mips/ulh2-eb.d 2 Apr 2003 18:43:16 -0000 1.1
+++ gas/testsuite/gas/mips/ulh2-eb.d 7 May 2003 03:56:43 -0000
@@ -1,4 +1,4 @@
-#as: -EB
+#as: -EB -32
#objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
#name: ulh2 -EB
#source: ulh2.s
Index: gas/testsuite/gas/mips/ulh2-el.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ulh2-el.d,v
retrieving revision 1.1
diff -u -p -r1.1 ulh2-el.d
--- gas/testsuite/gas/mips/ulh2-el.d 2 Apr 2003 18:43:16 -0000 1.1
+++ gas/testsuite/gas/mips/ulh2-el.d 7 May 2003 03:56:43 -0000
@@ -1,4 +1,4 @@
-#as: -EL
+#as: -EL -32
#objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
#name: ulh2 -EL
#source: ulh2.s
Index: gas/testsuite/gas/mips/ulw.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ulw.d,v
retrieving revision 1.2
diff -u -p -r1.2 ulw.d
--- gas/testsuite/gas/mips/ulw.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/ulw.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS ulw
-#as: -mips1
+#as: -32 -mips1
# Test the ulw macro.
Index: gas/testsuite/gas/mips/ulw2-eb-ilocks.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ulw2-eb-ilocks.d,v
retrieving revision 1.1
diff -u -p -r1.1 ulw2-eb-ilocks.d
--- gas/testsuite/gas/mips/ulw2-eb-ilocks.d 2 Apr 2003 18:43:16 -0000 1.1
+++ gas/testsuite/gas/mips/ulw2-eb-ilocks.d 7 May 2003 03:56:43 -0000
@@ -1,4 +1,4 @@
-#as: -EB
+#as: -EB -32
#objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
#name: ulw2 -EB interlocked
#source: ulw2.s
Index: gas/testsuite/gas/mips/ulw2-eb.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ulw2-eb.d,v
retrieving revision 1.1
diff -u -p -r1.1 ulw2-eb.d
--- gas/testsuite/gas/mips/ulw2-eb.d 2 Apr 2003 18:43:16 -0000 1.1
+++ gas/testsuite/gas/mips/ulw2-eb.d 7 May 2003 03:56:43 -0000
@@ -1,4 +1,4 @@
-#as: -EB
+#as: -EB -32
#objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
#name: ulw2 -EB non-interlocked
#source: ulw2.s
Index: gas/testsuite/gas/mips/ulw2-el-ilocks.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ulw2-el-ilocks.d,v
retrieving revision 1.1
diff -u -p -r1.1 ulw2-el-ilocks.d
--- gas/testsuite/gas/mips/ulw2-el-ilocks.d 2 Apr 2003 18:43:16 -0000 1.1
+++ gas/testsuite/gas/mips/ulw2-el-ilocks.d 7 May 2003 03:56:43 -0000
@@ -1,4 +1,4 @@
-#as: -EL
+#as: -EL -32
#objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
#name: ulw2 -EL interlocked
#source: ulw2.s
Index: gas/testsuite/gas/mips/ulw2-el.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ulw2-el.d,v
retrieving revision 1.1
diff -u -p -r1.1 ulw2-el.d
--- gas/testsuite/gas/mips/ulw2-el.d 2 Apr 2003 18:43:16 -0000 1.1
+++ gas/testsuite/gas/mips/ulw2-el.d 7 May 2003 03:56:43 -0000
@@ -1,4 +1,4 @@
-#as: -EL
+#as: -EL -32
#objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
#name: ulw2 -EL non-interlocked
#source: ulw2.s
Index: gas/testsuite/gas/mips/usd.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/usd.d,v
retrieving revision 1.4
diff -u -p -r1.4 usd.d
--- gas/testsuite/gas/mips/usd.d 4 Oct 2001 00:57:01 -0000 1.4
+++ gas/testsuite/gas/mips/usd.d 7 May 2003 03:56:43 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:4000
#name: MIPS usd
-#as: -mips3 -mtune=r4000
+#as: -32 -mips3 -mtune=r4000
# Test the usd macro.
Index: gas/testsuite/gas/mips/ush.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/ush.d,v
retrieving revision 1.2
diff -u -p -r1.2 ush.d
--- gas/testsuite/gas/mips/ush.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/ush.d 7 May 2003 03:56:44 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS ush
-#as: -mips1
+#as: -32 -mips1
# Test the ush macro.
Index: gas/testsuite/gas/mips/usw.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/usw.d,v
retrieving revision 1.2
diff -u -p -r1.2 usw.d
--- gas/testsuite/gas/mips/usw.d 15 May 2001 12:11:13 -0000 1.2
+++ gas/testsuite/gas/mips/usw.d 7 May 2003 03:56:44 -0000
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses -mmips:3000
#name: MIPS usw
-#as: -mips1
+#as: -32 -mips1
# Test the usw macro.
Index: gas/testsuite/gas/mips/vr4122.d
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/mips/vr4122.d,v
retrieving revision 1.1
diff -u -p -r1.1 vr4122.d
--- gas/testsuite/gas/mips/vr4122.d 30 Sep 2002 12:04:54 -0000 1.1
+++ gas/testsuite/gas/mips/vr4122.d 7 May 2003 03:56:44 -0000
@@ -1,5 +1,5 @@
#objdump: -dz --prefix-addresses -m mips:4120
-#as: -march=vr4120 -mtune=vr4120 -mfix-vr4122-bugs
+#as: -32 -march=vr4120 -mtune=vr4120 -mfix-vr4122-bugs
#name: MIPS vr4122 workarounds
.*: +file format .*mips.*
Index: gas/testsuite/gas/vtable/vtable.exp
===================================================================
RCS file: /cvs/uberbaum/gas/testsuite/gas/vtable/vtable.exp,v
retrieving revision 1.16
diff -u -p -r1.16 vtable.exp
--- gas/testsuite/gas/vtable/vtable.exp 27 Aug 2002 23:51:47 -0000 1.16
+++ gas/testsuite/gas/vtable/vtable.exp 7 May 2003 03:56:44 -0000
@@ -42,7 +42,9 @@ if { ( [istarget "*-*-elf*"] || [istar
|| [istarget "dlx-*"]
|| [istarget "i*86-*"]
|| [istarget "m32r-*"]
- || [istarget "mips*-*"]
+ || ([istarget "mips*-*"]
+ && ! [istarget "mips64*-*-linux*"]
+ && ! [istarget "mips*-*-irix6*"])
|| [istarget "m68hc*-*"]
|| [istarget "or32-*"]
|| [istarget "strongarm*-*"]
Index: ld/testsuite/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* config/default.exp (gcc_gas_flags): Force ABI to n32 on
mips64-linux.
* ld-elf/merge.d: Xfail on mips64*-linux-gnu*.
* ld-mips-elf/mips-elf-flags.exp (ldemul): Set to o32-compatible
on mips-sgi-irix6*, mips64-linux-gnu and mips64el-linux-gnu.
(good_combination, bad_combination): Use it.
Add -32 or -mabi=o64 wherever the ABI was formerly implied.
Index: ld/testsuite/config/default.exp
===================================================================
RCS file: /cvs/uberbaum/ld/testsuite/config/default.exp,v
retrieving revision 1.4
diff -u -p -r1.4 default.exp
--- ld/testsuite/config/default.exp 24 Jul 2001 11:07:06 -0000 1.4
+++ ld/testsuite/config/default.exp 7 May 2003 04:12:01 -0000
@@ -60,6 +60,17 @@ if {![file isdirectory tmpdir/gas]} then
}
set gcc_gas_flag "-B[pwd]/tmpdir/gas/"
+# The mips64-*-linux-gnu compiler defaults to the N32 ABI after
+# 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*] &&
+ (![board_info [target_info name] exists multilib_flags] ||
+ ![string match "*-mabi" [board_info [target_info name] multilib_flags]])
+ } {
+ append gcc_gas_flag " -mabi=n32"
+}
+
# load the utility procedures
load_lib ld-lib.exp
Index: ld/testsuite/ld-elf/merge.d
===================================================================
RCS file: /cvs/uberbaum/ld/testsuite/ld-elf/merge.d,v
retrieving revision 1.2
diff -u -p -r1.2 merge.d
--- ld/testsuite/ld-elf/merge.d 1 Apr 2003 15:50:31 -0000 1.2
+++ ld/testsuite/ld-elf/merge.d 7 May 2003 04:12:01 -0000
@@ -3,7 +3,8 @@
#objdump: -s
#xfail: "arc-*-*" "avr-*-*" "cris-*-*" "dlx-*-*" "fr30-*-*" "frv-*-*"
#xfail: "hppa*-*-*" "h8300-*-*" "i960-*-*" "ip2k-*-*" "m32r-*-*" "mcore-*-*"
-#xfail: "mn10*-*-*" "openrisc-*-*" "pj-*-*" "sparc*-*-*" "xtensa-*-*"
+#xfail: "mn10*-*-*" "mips64*-*-linux*" "openrisc-*-*" "pj-*-*" "sparc*-*-*"
+#xfail: "xtensa-*-*"
.*: file format .*elf.*
Index: ld/testsuite/ld-mips-elf/mips-elf-flags.exp
===================================================================
RCS file: /cvs/uberbaum/ld/testsuite/ld-mips-elf/mips-elf-flags.exp,v
retrieving revision 1.2
diff -u -p -r1.2 mips-elf-flags.exp
--- ld/testsuite/ld-mips-elf/mips-elf-flags.exp 3 Jan 2003 11:04:26 -0000 1.2
+++ ld/testsuite/ld-mips-elf/mips-elf-flags.exp 7 May 2003 04:12:02 -0000
@@ -18,6 +18,17 @@ if {![istarget mips*-*-*] || ![is_elf_fo
return
}
+global ldemul
+if {[istarget mips*-*-irix6*]} {
+ set ldemul "-melf32bmip"
+} elseif {[istarget mips*el-*-linux*]} {
+ set ldemul "-melf32ltsmip"
+} elseif {[istarget mips*-*-linux*]} {
+ set ldemul "-melf32btsmip"
+} else {
+ set ldemul ""
+}
+
# Assemble jr.s using each of the argument lists in ARGLIST. Return the
# list of object files on success and an empty list on failure.
proc assemble_for_flags {arglist} {
@@ -41,7 +52,7 @@ proc assemble_for_flags {arglist} {
# the objects can be linked together and that the readelf output
# includes each flag named in FLAGS.
proc good_combination {arglist flags} {
- global ld READELF
+ global ld ldemul READELF
set finalobj "tmpdir/mips-flags.o"
set testname "MIPS compatible objects: $arglist"
@@ -49,7 +60,7 @@ proc good_combination {arglist flags} {
if {$objs == ""} {
unresolved $testname
- } elseif {![ld_simple_link $ld $finalobj "-r $objs"]} {
+ } elseif {![ld_simple_link "$ld $ldemul" $finalobj "-r $objs"]} {
fail $testname
} else {
catch "exec $READELF --headers $finalobj" output
@@ -80,7 +91,7 @@ proc good_combination {arglist flags} {
# Like good_combination, but check that the objects can't be linked
# together successfully and that the output includes MESSAGE.
proc bad_combination {arglist message} {
- global link_output ld
+ global link_output ld ldemul
set finalobj "tmpdir/mips-flags.o"
set testname "MIPS incompatible objects: $arglist"
@@ -88,7 +99,7 @@ proc bad_combination {arglist message} {
if {$objs == ""} {
unresolved $testname
- } elseif {[ld_simple_link $ld $finalobj "-r $objs"]
+ } elseif {[ld_simple_link "$ld $ldemul" $finalobj "-r $objs"]
|| [string first $message $link_output] < 0} {
fail $testname
} else {
@@ -116,31 +127,31 @@ proc regsize_conflict {arglist} {
abi_conflict { "-mabi=eabi -mgp32" "-mips4 -mabi=32" } EABI32 O32
abi_conflict { "-mips4 -mabi=o64" "-mips3 -mabi=eabi" } O64 EABI64
-isa_conflict { "-march=vr5500" "-march=sb1" } 5500 sb1
-isa_conflict { "-march=vr5400" "-march=4120" } 5400 4120
-isa_conflict { "-march=r3900" "-march=r6000" } 3900 6000
-isa_conflict { "-march=r4010" "-march=r4650" } 4010 4650
-isa_conflict { "-mips3 -mgp32" "-mips32" } 4000 isa32
-isa_conflict { "-march=sb1 -mgp32" "-mips32r2" } sb1 isa32r2
+isa_conflict { "-march=vr5500 -32" "-march=sb1 -32" } 5500 sb1
+isa_conflict { "-march=vr5400 -32" "-march=4120 -32" } 5400 4120
+isa_conflict { "-march=r3900 -32" "-march=r6000 -32" } 3900 6000
+isa_conflict { "-march=r4010 -32" "-march=r4650 -32" } 4010 4650
+isa_conflict { "-mips3 -mgp32 -32" "-mips32 -32" } 4000 isa32
+isa_conflict { "-march=sb1 -mgp32 -32" "-mips32r2 -32" } sb1 isa32r2
-regsize_conflict { "-mips4 -mgp64" "-mips2" }
+regsize_conflict { "-mips4 -mgp64 -mabi=o64" "-mips2 -32" }
regsize_conflict { "-mips4 -mabi=o64" "-mips4 -mabi=32" }
regsize_conflict { "-mips4 -mabi=eabi -mgp32" "-mips4 -mabi=eabi -mgp64" }
-regsize_conflict { "-march=vr5000 -mgp64" "-march=vr5000 -mgp32" }
-regsize_conflict { "-mips32" "-mips64" }
-regsize_conflict { "-mips32r2" "-mips64" }
-
-good_combination { "-mips4 -mgp32" "-mips2" } { mips4 32bitmode }
-good_combination { "-mips4 -mabi=32" "-mips2" } { mips4 o32 }
-good_combination { "-mips2" "-mips4 -mabi=32" } { mips4 o32 }
-good_combination { "-mips2" "-mips4 -mabi=eabi -mgp32" } { mips4 eabi32 }
-good_combination { "-mips2" "-mips32" "-mips32r2" } { mips32r2 }
-good_combination { "-mips1" "-mips32r2" "-mips32" } { mips32r2 }
-
-good_combination { "-march=vr4100" "-march=vr4120" } { 4120 }
-good_combination { "-march=vr5400" "-march=vr5500" "-mips4" } { 5500 }
-good_combination { "-mips3" "-mips4" "-march=sb1" "-mips5" } { sb1 }
-good_combination { "-mips1" "-march=3900" } { 3900 }
+regsize_conflict { "-march=vr5000 -mgp64 -mabi=o64" "-march=vr5000 -mgp32 -32" }
+regsize_conflict { "-mips32 -32" "-mips64 -mabi=o64" }
+regsize_conflict { "-mips32r2 -32" "-mips64 -mabi=o64" }
+
+good_combination { "-mips4 -mgp32 -32" "-mips2 -32" } { mips4 o32 }
+good_combination { "-mips4 -mabi=32" "-mips2 -32" } { mips4 o32 }
+good_combination { "-mips2 -32" "-mips4 -mabi=32" } { mips4 o32 }
+good_combination { "-mips2 -mabi=eabi" "-mips4 -mabi=eabi -mgp32" } { mips4 eabi32 }
+good_combination { "-mips2 -32" "-mips32 -32" "-mips32r2 -32" } { mips32r2 }
+good_combination { "-mips1 -32" "-mips32r2 -32" "-mips32 -32" } { mips32r2 }
+
+good_combination { "-march=vr4100 -32" "-march=vr4120 -32" } { 4120 }
+good_combination { "-march=vr5400 -32" "-march=vr5500 -32" "-mips4 -32" } { 5500 }
+good_combination { "-mips3 -32" "-mips4 -32" "-march=sb1 -32" "-mips5 -32" } { sb1 }
+good_combination { "-mips1 -32" "-march=3900 -32" } { 3900 }
good_combination { "-march=vr4120 -mabi=32" "-mips3 -mabi=32" } { 4120 o32 }
-good_combination { "-march=sb1 -mgp32" "-march=4000 -mgp32" } { sb1 32bitmode }
+good_combination { "-march=sb1 -mgp32 -32" "-march=4000 -mgp32 -32" } { sb1 o32 }
--
Alexandre Oliva Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer aoliva@{redhat.com, gcc.gnu.org}
CS PhD student at IC-Unicamp oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist Professional serial bug killer