aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/config.bfd14
-rw-r--r--binutils/testsuite/binutils-all/mips/mips-note-2-n32.d1
-rwxr-xr-xgas/configure5
-rw-r--r--gas/configure.ac5
-rw-r--r--gold/configure.tgt14
-rw-r--r--ld/configure.tgt12
6 files changed, 6 insertions, 45 deletions
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 81ddbcd..54a30ef 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -941,21 +941,11 @@ case "${targ}" in
targ_defvec=mips_elf32_be_vec
targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
;;
- mips*64*el-*-linux*-gnuabi64)
- targ_defvec=mips_elf64_trad_le_vec
- targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec"
- want64=true
- ;;
- mips*64*-*-linux*-gnuabi64)
- targ_defvec=mips_elf64_trad_be_vec
- targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec"
- want64=true
- ;;
- mips*64*el-*-linux*)
+ mips64*el-*-linux*)
targ_defvec=mips_elf32_ntrad_le_vec
targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec"
;;
- mips*64*-*-linux*)
+ mips64*-*-linux*)
targ_defvec=mips_elf32_ntrad_be_vec
targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
;;
diff --git a/binutils/testsuite/binutils-all/mips/mips-note-2-n32.d b/binutils/testsuite/binutils-all/mips/mips-note-2-n32.d
index 5e24e7a..c2a5818 100644
--- a/binutils/testsuite/binutils-all/mips/mips-note-2-n32.d
+++ b/binutils/testsuite/binutils-all/mips/mips-note-2-n32.d
@@ -1,5 +1,4 @@
#PROG: objcopy
-#as: -n32
#readelf: --notes --wide
#objcopy: --merge-notes
#name: MIPS merge notes section (n32)
diff --git a/gas/configure b/gas/configure
index dbb3425..e5023ff 100755
--- a/gas/configure
+++ b/gas/configure
@@ -12225,10 +12225,7 @@ _ACEOF
esac
# Decide which ABI to target by default.
case ${target} in
- mips*64*-linux-gnuabi64)
- mips_default_abi=N64_ABI
- ;;
- mips*64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \
+ mips64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \
| mips64*-kfreebsd*-gnu | mips64*-ps2-elf*)
mips_default_abi=N32_ABI
;;
diff --git a/gas/configure.ac b/gas/configure.ac
index 13adaad..e8e8f31 100644
--- a/gas/configure.ac
+++ b/gas/configure.ac
@@ -394,10 +394,7 @@ changequote([,])dnl
esac
# Decide which ABI to target by default.
case ${target} in
- mips*64*-linux-gnuabi64)
- mips_default_abi=N64_ABI
- ;;
- mips*64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \
+ mips64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \
| mips64*-kfreebsd*-gnu | mips64*-ps2-elf*)
mips_default_abi=N32_ABI
;;
diff --git a/gold/configure.tgt b/gold/configure.tgt
index ef47ce0..4b54e08 100644
--- a/gold/configure.tgt
+++ b/gold/configure.tgt
@@ -153,13 +153,6 @@ aarch64*-*)
targ_big_endian=false
targ_extra_big_endian=true
;;
-mips*64*el*-*-*|mips*64*le*-*-*)
- targ_obj=mips
- targ_machine=EM_MIPS_RS3_LE
- targ_size=64
- targ_big_endian=false
- targ_extra_big_endian=true
- ;;
mips*el*-*-*|mips*le*-*-*)
targ_obj=mips
targ_machine=EM_MIPS_RS3_LE
@@ -167,13 +160,6 @@ mips*el*-*-*|mips*le*-*-*)
targ_big_endian=false
targ_extra_big_endian=true
;;
-mips*64*-*-*)
- targ_obj=mips
- targ_machine=EM_MIPS
- targ_size=64
- targ_big_endian=true
- targ_extra_big_endian=false
- ;;
mips*-*-*)
targ_obj=mips
targ_machine=EM_MIPS
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 4a71f67..34c9d67 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -580,19 +580,11 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks
;;
mips*-*-windiss) targ_emul=elf32mipswindiss
;;
-mips*64*el-*-linux-gnuabi64) targ_emul=elf64ltsmip
- targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
- targ_extra_libpath=$targ_extra_emuls
- ;;
-mips*64*el-*-linux-*) targ_emul=elf32ltsmipn32
+mips64*el-*-linux-*) targ_emul=elf32ltsmipn32
targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
targ_extra_libpath=$targ_extra_emuls
;;
-mips*64*-*-linux-gnuabi64) targ_emul=elf64btsmip
- targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
- targ_extra_libpath=$targ_extra_emuls
- ;;
-mips*64*-*-linux-*) targ_emul=elf32btsmipn32
+mips64*-*-linux-*) targ_emul=elf32btsmipn32
targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
targ_extra_libpath=$targ_extra_emuls
;;