aboutsummaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorRichard Sandiford <rdsandiford@googlemail.com>2007-06-28 06:00:52 +0000
committerRichard Sandiford <rdsandiford@googlemail.com>2007-06-28 06:00:52 +0000
commitd5fb0879a5c2008b43d057d7a0ee09bb3b500be2 (patch)
tree8704fe22de4b08197a0544fad59002b43f71c484 /sim
parentfe0a07a117e93d7fa68eee47732db783f13fab39 (diff)
downloadgdb-d5fb0879a5c2008b43d057d7a0ee09bb3b500be2.zip
gdb-d5fb0879a5c2008b43d057d7a0ee09bb3b500be2.tar.gz
gdb-d5fb0879a5c2008b43d057d7a0ee09bb3b500be2.tar.bz2
sim/mips/
* configure.ac, configure: Revert last patch.
Diffstat (limited to 'sim')
-rw-r--r--sim/mips/ChangeLog4
-rwxr-xr-xsim/mips/configure38
-rw-r--r--sim/mips/configure.ac38
3 files changed, 44 insertions, 36 deletions
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 25c43bf..8fb2ff7 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-28 Richard Sandiford <richard@codesourcery.com>
+
+ * configure.ac, configure: Revert last patch.
+
2007-06-26 Richard Sandiford <richard@codesourcery.com>
* configure.ac (sim_mipsisa3264_configs): New variable.
diff --git a/sim/mips/configure b/sim/mips/configure
index 31738ec..ed82180 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -5098,12 +5098,6 @@ sim_igen_filter="32,64,f"
sim_m16_filter="16"
sim_mach_default="mips8000"
-sim_mipsisa3264_configs="\
- mipsisa32:mips32,mips16,mips16e,smartmips:32,f:mipsisa32\
- mipsisa32r2:mips32r2,mips16,mips16e,mdmx,dsp,dsp2,smartmips:32,f:mipsisa32r2\
- mipsisa64:mips64,mips3d,mips16,mips16e,mdmx:32,64,f:mipsisa64\
- mipsisa64r2:mips64r2,mips3d,mips16,mips16e,mdmx,dsp,dsp2:32,64,f:mipsisa64r2"
-
case "${target}" in
mips*tx39*) sim_gen=IGEN
sim_igen_filter="32,f"
@@ -5147,26 +5141,34 @@ case "${target}" in
sim_igen_filter="32,64,f"
sim_m16_filter="16"
;;
- mipsisa32r2*-*-*) sim_gen=MULTI
- sim_multi_configs=$sim_mipsisa3264_configs
- sim_multi_default="mipsisa32r2"
+ mipsisa32r2*-*-*) sim_gen=M16
+ sim_igen_machine="-M mips32r2,mips16,mips16e,mdmx,dsp,dsp2,smartmips"
+ sim_m16_machine="-M mips16,mips16e,mips32r2"
+ sim_igen_filter="32,f"
+ sim_mach_default="mipsisa32r2"
;;
- mipsisa32*-*-*) sim_gen=MULTI
- sim_multi_configs=$sim_mipsisa3264_configs
- sim_multi_default="mipsisa32"
+ mipsisa32*-*-*) sim_gen=M16
+ sim_igen_machine="-M mips32,mips16,mips16e,smartmips"
+ sim_m16_machine="-M mips16,mips16e,mips32"
+ sim_igen_filter="32,f"
+ sim_mach_default="mipsisa32"
;;
- mipsisa64r2*-*-*) sim_gen=MULTI
- sim_multi_configs=$sim_mipsisa3264_configs
- sim_multi_default="mipsisa64r2"
+ mipsisa64r2*-*-*) sim_gen=M16
+ sim_igen_machine="-M mips64r2,mips3d,mips16,mips16e,mdmx,dsp,dsp2"
+ sim_m16_machine="-M mips16,mips16e,mips64r2"
+ sim_igen_filter="32,64,f"
+ sim_mach_default="mipsisa64r2"
;;
mipsisa64sb1*-*-*) sim_gen=IGEN
sim_igen_machine="-M mips64,mips3d,sb1"
sim_igen_filter="32,64,f"
sim_mach_default="mips_sb1"
;;
- mipsisa64*-*-*) sim_gen=MULTI
- sim_multi_configs=$sim_mipsisa3264_configs
- sim_multi_default="mipsisa64"
+ mipsisa64*-*-*) sim_gen=M16
+ sim_igen_machine="-M mips64,mips3d,mips16,mips16e,mdmx"
+ sim_m16_machine="-M mips16,mips16e,mips64"
+ sim_igen_filter="32,64,f"
+ sim_mach_default="mipsisa64"
;;
mips*lsi*) sim_gen=M16
sim_igen_machine="-M mipsIII,mips16"
diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index 1334265..c251e43 100644
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -109,12 +109,6 @@ sim_igen_filter="32,64,f"
sim_m16_filter="16"
sim_mach_default="mips8000"
-sim_mipsisa3264_configs="\
- mipsisa32:mips32,mips16,mips16e,smartmips:32,f:mipsisa32\
- mipsisa32r2:mips32r2,mips16,mips16e,mdmx,dsp,dsp2,smartmips:32,f:mipsisa32r2\
- mipsisa64:mips64,mips3d,mips16,mips16e,mdmx:32,64,f:mipsisa64\
- mipsisa64r2:mips64r2,mips3d,mips16,mips16e,mdmx,dsp,dsp2:32,64,f:mipsisa64r2"
-
case "${target}" in
mips*tx39*) sim_gen=IGEN
sim_igen_filter="32,f"
@@ -158,26 +152,34 @@ case "${target}" in
sim_igen_filter="32,64,f"
sim_m16_filter="16"
;;
- mipsisa32r2*-*-*) sim_gen=MULTI
- sim_multi_configs=$sim_mipsisa3264_configs
- sim_multi_default="mipsisa32r2"
+ mipsisa32r2*-*-*) sim_gen=M16
+ sim_igen_machine="-M mips32r2,mips16,mips16e,mdmx,dsp,dsp2,smartmips"
+ sim_m16_machine="-M mips16,mips16e,mips32r2"
+ sim_igen_filter="32,f"
+ sim_mach_default="mipsisa32r2"
;;
- mipsisa32*-*-*) sim_gen=MULTI
- sim_multi_configs=$sim_mipsisa3264_configs
- sim_multi_default="mipsisa32"
+ mipsisa32*-*-*) sim_gen=M16
+ sim_igen_machine="-M mips32,mips16,mips16e,smartmips"
+ sim_m16_machine="-M mips16,mips16e,mips32"
+ sim_igen_filter="32,f"
+ sim_mach_default="mipsisa32"
;;
- mipsisa64r2*-*-*) sim_gen=MULTI
- sim_multi_configs=$sim_mipsisa3264_configs
- sim_multi_default="mipsisa64r2"
+ mipsisa64r2*-*-*) sim_gen=M16
+ sim_igen_machine="-M mips64r2,mips3d,mips16,mips16e,mdmx,dsp,dsp2"
+ sim_m16_machine="-M mips16,mips16e,mips64r2"
+ sim_igen_filter="32,64,f"
+ sim_mach_default="mipsisa64r2"
;;
mipsisa64sb1*-*-*) sim_gen=IGEN
sim_igen_machine="-M mips64,mips3d,sb1"
sim_igen_filter="32,64,f"
sim_mach_default="mips_sb1"
;;
- mipsisa64*-*-*) sim_gen=MULTI
- sim_multi_configs=$sim_mipsisa3264_configs
- sim_multi_default="mipsisa64"
+ mipsisa64*-*-*) sim_gen=M16
+ sim_igen_machine="-M mips64,mips3d,mips16,mips16e,mdmx"
+ sim_m16_machine="-M mips16,mips16e,mips64"
+ sim_igen_filter="32,64,f"
+ sim_mach_default="mipsisa64"
;;
mips*lsi*) sim_gen=M16
sim_igen_machine="-M mipsIII,mips16"