diff options
Diffstat (limited to 'sim/common')
| -rw-r--r-- | sim/common/ChangeLog | 7 | ||||
| -rw-r--r-- | sim/common/Make-common.in | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index f3530df..02540a0 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,10 @@ +2021-06-21 Mike Frysinger <vapier@gentoo.org> + + * Make-common.in (SIM_HW): Delete. + (SIM_HW_OBJS): Redefine. + (SIM_HW_SOCKSER, SIM_HW_DEVICES): Define. + (stamp-hw): Change SIM_HW to SIM_HW_DEVICES. + 2021-06-20 Mike Frysinger <vapier@gentoo.org> * Make-common.in (CGENDIR): Delete. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index ba62c32..6d7c9c4 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -73,8 +73,7 @@ SIM_BITSIZE = @sim_bitsize@ SIM_DEFAULT_MODEL = @sim_default_model@ SIM_FLOAT = @sim_float@ SIM_HW_CFLAGS = @sim_hw_cflags@ -SIM_HW_OBJS = @sim_hw_objs@ -SIM_HW = @sim_hw@ +SIM_HW_SOCKSER = @sim_hw_sockser@ SIM_RESERVED_BITS = @sim_reserved_bits@ SIM_SCACHE = @sim_scache@ SIM_WARN_CFLAGS = $(WARN_CFLAGS) @@ -216,6 +215,10 @@ BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(CSEARCH) COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS) +SIM_HW_DEVICES = cfi core pal glue $(SIM_EXTRA_HW_DEVICES) +SIM_HW_OBJS = $(SIM_COMMON_HW_OBJS) $(SIM_HW_DEVICES:%=dv-%.o) $(SIM_HW_SOCKSER) +@SIM_ENABLE_HW_FALSE@SIM_HW_OBJS = + ZLIB = $(zlibdir) -lz LIBIBERTY_LIB = ../../libiberty/libiberty.a BFD_LIB = ../../bfd/libbfd.a @@ -417,12 +420,12 @@ hw-config.h: stamp-hw ; @true stamp-hw: Makefile.in $(srccom)/Make-common.in config.status Makefile rm -f tmp-hw.h echo "/* generated by Makefile */" > tmp-hw.h - sim_hw="$(SIM_HW)"; \ + sim_hw="$(SIM_HW_DEVICES)"; \ for hw in $$sim_hw ; do \ echo "extern const struct hw_descriptor dv_$${hw}_descriptor[];" ; \ done >> tmp-hw.h echo "const struct hw_descriptor *hw_descriptors[] = {" >> tmp-hw.h - sim_hw="$(SIM_HW)"; \ + sim_hw="$(SIM_HW_DEVICES)"; \ for hw in $$sim_hw ; do \ echo " dv_$${hw}_descriptor," ; \ done >> tmp-hw.h |