diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2023-01-02 00:06:34 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2023-01-14 20:44:40 -0500 |
| commit | 49444feaefc9ec5a64e5c9a0ce54923f50473013 (patch) | |
| tree | 7bd56ba13e4c1f4eaf9e9a3ff27047a3a6700225 /sim | |
| parent | 068b723abc3f642f2fa5408908049d3d21a98588 (diff) | |
| download | gdb-49444feaefc9ec5a64e5c9a0ce54923f50473013.zip gdb-49444feaefc9ec5a64e5c9a0ce54923f50473013.tar.gz gdb-49444feaefc9ec5a64e5c9a0ce54923f50473013.tar.bz2 | |
sim: common: simplify hw-config.h deps
Now that all ports (other than ppc) build in the top-level, we don't
need to expand all the hw-config.h targets as a recursive dep. Each
port depends on their respective header now, and the ppc port doesn't
use it at all.
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/Makefile.in | 18 | ||||
| -rw-r--r-- | sim/common/local.mk | 4 |
2 files changed, 9 insertions, 13 deletions
diff --git a/sim/Makefile.in b/sim/Makefile.in index c2669fd..24ad291 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -1761,8 +1761,8 @@ CLEANFILES = common/version.c common/version.c-stamp \ testsuite/common/bits64m63.c DISTCLEANFILES = $(am__append_93) MOSTLYCLEANFILES = core $(SIM_ENABLED_ARCHES:%=%/*.o) \ - $(common_HW_CONFIG_H_TARGETS) $(patsubst \ - %,%/stamp-hw,$(SIM_ENABLED_ARCHES)) \ + $(SIM_ENABLED_ARCHES:%=%/hw-config.h) \ + $(SIM_ENABLED_ARCHES:%=%/stamp-hw) \ $(common_GEN_MODULES_C_TARGETS) $(patsubst \ %,%/stamp-modules,$(SIM_ENABLED_ARCHES)) $(am__append_6) \ site-sim-config.exp testrun.log testrun.sum $(am__append_19) \ @@ -1786,13 +1786,12 @@ AM_CPPFLAGS_FOR_BUILD = -I$(srcroot)/include $(SIM_HW_CFLAGS) \ COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ SIM_ALL_RECURSIVE_DEPS = common/libcommon.a \ - $(common_HW_CONFIG_H_TARGETS) $(common_GEN_MODULES_C_TARGETS) \ - $(am__append_3) $(am__append_18) $(am__append_23) \ - $(am__append_30) $(am__append_35) $(am__append_47) \ - $(am__append_56) $(am__append_61) $(am__append_65) \ - $(am__append_71) $(am__append_75) $(am__append_91) \ - $(am__append_97) $(am__append_106) $(am__append_120) \ - $(am__append_126) + $(common_GEN_MODULES_C_TARGETS) $(am__append_3) \ + $(am__append_18) $(am__append_23) $(am__append_30) \ + $(am__append_35) $(am__append_47) $(am__append_56) \ + $(am__append_61) $(am__append_65) $(am__append_71) \ + $(am__append_75) $(am__append_91) $(am__append_97) \ + $(am__append_106) $(am__append_120) $(am__append_126) SIM_INSTALL_DATA_LOCAL_DEPS = SIM_INSTALL_EXEC_LOCAL_DEPS = $(am__append_40) SIM_UNINSTALL_LOCAL_DEPS = $(am__append_41) @@ -1833,7 +1832,6 @@ SIM_NEW_COMMON_OBJS = sim-arange.o sim-bits.o sim-close.o \ sim-signal.o sim-stop.o sim-syscall.o sim-trace.o sim-utils.o \ sim-watch.o $(am__append_2) SIM_HW_DEVICES = cfi core pal glue -common_HW_CONFIG_H_TARGETS = $(patsubst %,%/hw-config.h,$(SIM_ENABLED_ARCHES)) am_arch_d = $(subst -,_,$(@D)) GEN_MODULES_C_SRCS = \ $(wildcard \ diff --git a/sim/common/local.mk b/sim/common/local.mk index 2c68f66..0ce7901 100644 --- a/sim/common/local.mk +++ b/sim/common/local.mk @@ -131,9 +131,7 @@ endif touch $@ .PRECIOUS: %/stamp-hw -%C%_HW_CONFIG_H_TARGETS = $(patsubst %,%/hw-config.h,$(SIM_ENABLED_ARCHES)) -MOSTLYCLEANFILES += $(%C%_HW_CONFIG_H_TARGETS) $(patsubst %,%/stamp-hw,$(SIM_ENABLED_ARCHES)) -SIM_ALL_RECURSIVE_DEPS += $(%C%_HW_CONFIG_H_TARGETS) +MOSTLYCLEANFILES += $(SIM_ENABLED_ARCHES:%=%/hw-config.h) $(SIM_ENABLED_ARCHES:%=%/stamp-hw) ## See sim_pre_argv_init and sim_module_install in sim-module.c for more details. ## TODO: Switch this to xxx_SOURCES once projects build objects in local.mk. |