sim: dv-sockser: move build to common dir
If dv-sockser is available, lets add it to the common SIM_HW_OBJS variable so it is always included automatically. Now ports do not have to shoe horn it in directly themselves. It does mean it will be compiled for targets that don't explicitly use it, but that's really what we want anyways.
This commit is contained in:
parent
3649cb0656
commit
49cd1634b2
29 changed files with 123 additions and 100 deletions
|
@ -1,3 +1,8 @@
|
|||
2015-03-23 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* configure: Regenerate.
|
||||
* Makefile.in (SIM_OBJS): Delete @SIM_DV_SOCKSER_O@.
|
||||
|
||||
2015-03-16 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* aclocal.m4, config.in, configure: Regenerate.
|
||||
|
|
|
@ -12,7 +12,6 @@ SIM_OBJS = \
|
|||
sim-model.o \
|
||||
sim-reg.o \
|
||||
sim-signal.o \
|
||||
@SIM_DV_SOCKSER_O@ \
|
||||
cgen-utils.o cgen-trace.o cgen-scache.o \
|
||||
cgen-run.o sim-reason.o sim-engine.o sim-stop.o \
|
||||
sim-if.o arch.o \
|
||||
|
|
12
sim/lm32/configure
vendored
12
sim/lm32/configure
vendored
|
@ -601,7 +601,6 @@ ac_includes_default="\
|
|||
ac_subst_vars='LTLIBOBJS
|
||||
LIBOBJS
|
||||
cgen_breaks
|
||||
SIM_DV_SOCKSER_O
|
||||
cgen
|
||||
cgendir
|
||||
CGEN_MAINT
|
||||
|
@ -12375,7 +12374,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12378 "configure"
|
||||
#line 12377 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
@ -12481,7 +12480,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12484 "configure"
|
||||
#line 12483 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
@ -13442,10 +13441,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
|
||||
|
@ -13453,7 +13454,6 @@ _ACEOF
|
|||
|
||||
;;
|
||||
esac
|
||||
|
||||
if test x"$silent" != x"yes"; then
|
||||
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
|
||||
fi
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue