From 456ef1c1d43c0407801fb2d59db355472be8a554 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 19 Jun 2021 20:06:12 -0400 Subject: sim: unify hardware settings Move these options up to the common dir so we only test & export them once across all ports. --- sim/common/ChangeLog | 4 ++++ sim/common/Make-common.in | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sim/common') diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 02540a0..9e1d300 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,9 @@ 2021-06-21 Mike Frysinger + * Make-common.in: Move sim-hw settings to ../arch-subdir.mk.in. + +2021-06-21 Mike Frysinger + * Make-common.in (SIM_HW): Delete. (SIM_HW_OBJS): Redefine. (SIM_HW_SOCKSER, SIM_HW_DEVICES): Define. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 6d7c9c4..41becaa 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -72,8 +72,6 @@ SHELL = @SHELL@ SIM_BITSIZE = @sim_bitsize@ SIM_DEFAULT_MODEL = @sim_default_model@ SIM_FLOAT = @sim_float@ -SIM_HW_CFLAGS = @sim_hw_cflags@ -SIM_HW_SOCKSER = @sim_hw_sockser@ SIM_RESERVED_BITS = @sim_reserved_bits@ SIM_SCACHE = @sim_scache@ SIM_WARN_CFLAGS = $(WARN_CFLAGS) @@ -216,8 +214,6 @@ 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 -- cgit v1.1