sim: mips: simplify fpu configure logic

The configure code always defaults to HARD_FLOATING_POINT, so inline
that value and drop redundant target checks as a result.

diff --git a/sim/mips/configure b/sim/mips/configure
index 14d7e0ce52e93460c627577ff4ee91c3eb65c15b..b0ba7ba74705a05c305b0caabff7c1137a25959e 100755 (executable)
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -1941,21 +1941,17 @@ fi
 #
 # Select the floating hardware support of the target
 #
-mips_fpu=HARDWARE_FLOATING_POINT
 mips_fpu_bitsize=
 case "${target}" in
-  mips*tx39*)          mips_fpu=HARD_FLOATING_POINT ; mips_fpu_bitsize=32 ;;
-  mips*-sde-elf*)       mips_fpu=HARD_FLOATING_POINT ; mips_fpu_bitsize=64 ;;
-  mips*-mti-elf*)       mips_fpu=HARD_FLOATING_POINT ; mips_fpu_bitsize=64 ;;
-  mips64*-*-*)          mips_fpu=HARD_FLOATING_POINT ;;
-  mips16*-*-*)          mips_fpu=HARD_FLOATING_POINT ;;
-  mipsisa32*-*-*)       mips_fpu=HARD_FLOATING_POINT ; mips_fpu_bitsize=64 ;;
-  mipsisa64*-*-*)       mips_fpu=HARD_FLOATING_POINT ; mips_fpu_bitsize=64 ;;
-  mips*-*-*)            mips_fpu=HARD_FLOATING_POINT ; mips_fpu_bitsize=32 ;;
-  *)                    mips_fpu=HARD_FLOATING_POINT ;;
+  mips*tx39*)           mips_fpu_bitsize=32 ;;
+  mips*-sde-elf*)       mips_fpu_bitsize=64 ;;
+  mips*-mti-elf*)       mips_fpu_bitsize=64 ;;
+  mipsisa32*-*-*)       mips_fpu_bitsize=64 ;;
+  mipsisa64*-*-*)       mips_fpu_bitsize=64 ;;
+  mips*-*-*)            mips_fpu_bitsize=32 ;;
 esac
 
-default_sim_float="$mips_fpu"
+default_sim_float="HARD_FLOATING_POINT"
 default_sim_float_bitsize="$mips_fpu_bitsize"
 # Check whether --enable-sim-float was given.
 if test "${enable_sim_float+set}" = set; then :

diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index bdc675842d386654ec9f48f8a19c9504f19773ae..f1d9f3d2410035a58a5462d37a86af8467971796 100644 (file)
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -45,20 +45,16 @@ SIM_AC_OPTION_BITSIZE($mips_bitsize,$mips_msb)
 #
 # Select the floating hardware support of the target
 #
-mips_fpu=HARDWARE_FLOATING_POINT
 mips_fpu_bitsize=
 case "${target}" in
-  mips*tx39*)          mips_fpu=HARD_FLOATING_POINT ; mips_fpu_bitsize=32 ;;
-  mips*-sde-elf*)       mips_fpu=HARD_FLOATING_POINT ; mips_fpu_bitsize=64 ;;
-  mips*-mti-elf*)       mips_fpu=HARD_FLOATING_POINT ; mips_fpu_bitsize=64 ;;
-  mips64*-*-*)          mips_fpu=HARD_FLOATING_POINT ;;
-  mips16*-*-*)          mips_fpu=HARD_FLOATING_POINT ;;
-  mipsisa32*-*-*)       mips_fpu=HARD_FLOATING_POINT ; mips_fpu_bitsize=64 ;;
-  mipsisa64*-*-*)       mips_fpu=HARD_FLOATING_POINT ; mips_fpu_bitsize=64 ;;
-  mips*-*-*)            mips_fpu=HARD_FLOATING_POINT ; mips_fpu_bitsize=32 ;;
-  *)                    mips_fpu=HARD_FLOATING_POINT ;;
+  mips*tx39*)           mips_fpu_bitsize=32 ;;
+  mips*-sde-elf*)       mips_fpu_bitsize=64 ;;
+  mips*-mti-elf*)       mips_fpu_bitsize=64 ;;
+  mipsisa32*-*-*)       mips_fpu_bitsize=64 ;;
+  mipsisa64*-*-*)       mips_fpu_bitsize=64 ;;
+  mips*-*-*)            mips_fpu_bitsize=32 ;;
 esac
-SIM_AC_OPTION_FLOAT($mips_fpu,$mips_fpu_bitsize)
+SIM_AC_OPTION_FLOAT(HARD_FLOATING_POINT,$mips_fpu_bitsize)