sim: mips: delete unused constant variables

Since these never change, inline and delete them.

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index ba657417eb3325888d0422e084291dce4ebecc22..c6ccfa0a7826cedb4707aac3ce14d539bc7d5d68 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,10 @@
+2021-05-04  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_IGEN_OBJ): Change @mips_igen_engine@ to engine.o.
+       (MIPS_EXTRA_LIB, SIM_EXTRA_LIBS): Delete.
+       * configure.ac (mips_igen_engine, mips_extra_libs): Delete.
+       * configure: Regenerate.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
        * mdmx.c (qh_acc): Change 2nd AccAddAQH to AccAddLQH.

diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in
index aa66bb3777f90075710ab4e0be7ee6e0b3e64c02..d8eba877fb8d4e7172957c9028c6dd0f88da22ad 100644 (file)
--- a/sim/mips/Makefile.in
+++ b/sim/mips/Makefile.in
@@ -17,7 +17,7 @@ SIM_IGEN_OBJ = \
        semantics.o \
        idecode.o \
        icache.o \
-       @mips_igen_engine@ \
+       engine.o \
        irun.o \
 
 
@@ -59,8 +59,6 @@ SIM_MULTI_OBJ = @sim_multi_obj@ \
                itable.o \
                multi-run.o \
 
-MIPS_EXTRA_LIBS = @mips_extra_libs@
-
 SIM_OBJS = \
        interp.o \
        $(SIM_@sim_gen@_OBJ) \
@@ -81,8 +79,6 @@ SIM_EXTRA_DISTCLEAN = distclean-extra
 
 all: $(SIM_@sim_gen@_ALL)
 
-SIM_EXTRA_LIBS = $(MIPS_EXTRA_LIBS)
-
 SIM_EXTRA_DEPS = itable.h
 
 

diff --git a/sim/mips/configure b/sim/mips/configure
index 084e22f26ae917cbea77aceac51a42b6722b8354..4d2ada1f4d61a5de3f68bb6786d68109a12b906e 100755 (executable)
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -636,9 +636,7 @@ LIBOBJS
 sim_default_model
 sim_scache
 cgen_breaks
-mips_extra_libs
 XMKMF
-mips_igen_engine
 sim_multi_obj
 sim_multi_src
 sim_multi_igen_configs
@@ -11227,7 +11225,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11230 "configure"
+#line 11228 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11333,7 +11331,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11336 "configure"
+#line 11334 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12697,14 +12695,6 @@ fi
 
 
 
-# Choose simulator engine
-case "${target}" in
-  *)    mips_igen_engine="engine.o"
-       ;;
-esac
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
 $as_echo_n "checking for X... " >&6; }
 
@@ -12898,8 +12888,6 @@ else
 $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
 fi
 
-mips_extra_libs=""
-
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fabs in -lm" >&5
 $as_echo_n "checking for fabs in -lm... " >&6; }

diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index 593ee2bb4b0ecb1d8356e12223e99265cf950cf4..6c9a6b812e38934c388226ec406f487c5878ad51 100644 (file)
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -437,17 +437,7 @@ esac
 SIM_AC_OPTION_HARDWARE($hw_extra_devices)
 
 
-# Choose simulator engine
-case "${target}" in
-  *)    mips_igen_engine="engine.o"
-       ;;
-esac
-AC_SUBST(mips_igen_engine)
-
-
 AC_PATH_X
-mips_extra_libs=""
-AC_SUBST(mips_extra_libs)
 
 AC_CHECK_LIB(m, fabs)
 AC_CHECK_FUNCS(aint anint sqrt)