diff options
Diffstat (limited to 'sim/mips')
| -rw-r--r-- | sim/mips/ChangeLog | 7 | ||||
| -rw-r--r-- | sim/mips/Makefile.in | 2 | ||||
| -rwxr-xr-x | sim/mips/configure | 15 | ||||
| -rw-r--r-- | sim/mips/configure.ac | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 5c8e6eb..60275b0 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,6 +1,13 @@ 2015-03-23 Mike Frysinger <vapier@gentoo.org> * configure: Regenerate. + * configure.ac (mips_extra_objs): Delete. + * Makefile.in (MIPS_EXTRA_OBJS): Delete. + (SIM_OBJS): Delete MIPS_EXTRA_OBJS. + +2015-03-23 Mike Frysinger <vapier@gentoo.org> + + * configure: Regenerate. * configure.ac: Delete sim_hw checks for dv-sockser. 2015-03-16 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in index 67bce7f..b9151eb 100644 --- a/sim/mips/Makefile.in +++ b/sim/mips/Makefile.in @@ -37,13 +37,11 @@ SIM_M16_OBJ = \ SIM_MULTI_OBJ = itable.o @sim_multi_obj@ -MIPS_EXTRA_OBJS = @mips_extra_objs@ MIPS_EXTRA_LIBS = @mips_extra_libs@ SIM_OBJS = \ $(SIM_@sim_gen@_OBJ) \ $(SIM_NEW_COMMON_OBJS) \ - $(MIPS_EXTRA_OBJS) \ cp1.o \ interp.o \ mdmx.o \ diff --git a/sim/mips/configure b/sim/mips/configure index 650b6bb..792d77c 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -604,8 +604,6 @@ cgen_breaks mips_extra_libs XMKMF mips_igen_engine -mips_extra_objs -SIM_DV_SOCKSER_O sim_multi_obj sim_multi_src sim_multi_igen_configs @@ -12402,7 +12400,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12405 "configure" +#line 12403 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12508,7 +12506,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12511 "configure" +#line 12509 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14059,10 +14057,12 @@ else esac done # mingw does not support sockser - SIM_DV_SOCKSER_O="" case ${host} in *mingw*) ;; - *) SIM_DV_SOCKSER_O="dv-sockser.o" + *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device + # that you instatiate. Instead, other code will call into it directly. + # At some point, we should convert it over. + sim_hw_objs="$sim_hw_objs dv-sockser.o" cat >>confdefs.h <<_ACEOF #define HAVE_DV_SOCKSER 1 @@ -14070,7 +14070,6 @@ _ACEOF ;; esac - if test x"$silent" != x"yes"; then echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs" fi @@ -14123,8 +14122,6 @@ fi esac fi -mips_extra_objs="$SIM_DV_SOCKSER_O" - # Choose simulator engine diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac index 02deab6..4dee7d4 100644 --- a/sim/mips/configure.ac +++ b/sim/mips/configure.ac @@ -419,8 +419,6 @@ case "${target}" in ;; esac SIM_AC_OPTION_HARDWARE($hw_enabled,$hw_devices,$hw_extra_devices) -mips_extra_objs="$SIM_DV_SOCKSER_O" -AC_SUBST(mips_extra_objs) # Choose simulator engine |