espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-21 18:39:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

sim: common: simplify modules.c deps

Browse Source 
Now that all ports (other than ppc) build in the top-level, we don't
need to expand all the modules.c targets as a recursive dep.  Each
port depends on their respective file now, and the ppc port doesn't
use it at all.
This commit is contained in:
Mike Frysinger
2023-01-02 00:11:00 -05:00
parent 72be276fff
commit 1b907fc09f
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sim/Makefile.in
View File

@ -1825,8 +1825,8 @@ DISTCLEANFILES = $(am__append_81)
MOSTLYCLEANFILES = core $(SIM_ENABLED_ARCHES:%=%/*.o) \ MOSTLYCLEANFILES = core $(SIM_ENABLED_ARCHES:%=%/*.o) \
$(SIM_ENABLED_ARCHES:%=%/hw-config.h) \ $(SIM_ENABLED_ARCHES:%=%/hw-config.h) \
$(SIM_ENABLED_ARCHES:%=%/stamp-hw) \ $(SIM_ENABLED_ARCHES:%=%/stamp-hw) \
$(common_GEN_MODULES_C_TARGETS) $(patsubst \ $(SIM_ENABLED_ARCHES:%=%/modules.c) \
%,%/stamp-modules,$(SIM_ENABLED_ARCHES)) $(am__append_5) \ $(SIM_ENABLED_ARCHES:%=%/stamp-modules) $(am__append_5) \
site-sim-config.exp testrun.log testrun.sum $(am__append_17) \ site-sim-config.exp testrun.log testrun.sum $(am__append_17) \
$(am__append_22) $(am__append_27) $(am__append_32) \ $(am__append_22) $(am__append_27) $(am__append_32) \
$(am__append_42) $(am__append_50) $(am__append_54) \ $(am__append_42) $(am__append_50) $(am__append_54) \
@ -1847,8 +1847,7 @@ AM_CPPFLAGS_FOR_BUILD = -I$(srcroot)/include $(SIM_HW_CFLAGS) \
$(SIM_INLINE) -I$(srcdir)/common $(SIM_INLINE) -I$(srcdir)/common
COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) 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 $@ LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
SIM_ALL_RECURSIVE_DEPS = $(common_GEN_MODULES_C_TARGETS) \ SIM_ALL_RECURSIVE_DEPS = $(am__append_94)
$(am__append_94)
SIM_INSTALL_DATA_LOCAL_DEPS = SIM_INSTALL_DATA_LOCAL_DEPS =
SIM_INSTALL_EXEC_LOCAL_DEPS = $(am__append_35) SIM_INSTALL_EXEC_LOCAL_DEPS = $(am__append_35)
SIM_UNINSTALL_LOCAL_DEPS = $(am__append_36) SIM_UNINSTALL_LOCAL_DEPS = $(am__append_36)
@ -1896,7 +1895,6 @@ GEN_MODULES_C_SRCS = \
$(patsubst %.o,$(srcdir)/%.c,$($(am_arch_d)_libsim_a_OBJECTS) $($(am_arch_d)_libsim_a_LIBADD)) \ $(patsubst %.o,$(srcdir)/%.c,$($(am_arch_d)_libsim_a_OBJECTS) $($(am_arch_d)_libsim_a_LIBADD)) \
$(filter-out %.o,$(patsubst $(@D)/%.o,$(srcdir)/common/%.c,$($(am_arch_d)_libsim_a_LIBADD)))) $(filter-out %.o,$(patsubst $(@D)/%.o,$(srcdir)/common/%.c,$($(am_arch_d)_libsim_a_LIBADD))))
common_GEN_MODULES_C_TARGETS = $(patsubst %,%/modules.c,$(filter-out ppc,$(SIM_ENABLED_ARCHES)))
LIBIBERTY_LIB = ../libiberty/libiberty.a LIBIBERTY_LIB = ../libiberty/libiberty.a
BFD_LIB = ../bfd/libbfd.la BFD_LIB = ../bfd/libbfd.la
OPCODES_LIB = ../opcodes/libopcodes.la OPCODES_LIB = ../opcodes/libopcodes.la

5
sim/common/local.mk
View File

@ -160,10 +160,7 @@ GEN_MODULES_C_SRCS = \
.PRECIOUS: %/stamp-modules .PRECIOUS: %/stamp-modules
## NB: The ppc port doesn't currently utilize the modules API, so skip it. ## NB: The ppc port doesn't currently utilize the modules API, so skip it.
%C%_GEN_MODULES_C_TARGETS = $(patsubst %,%/modules.c,$(filter-out ppc,$(SIM_ENABLED_ARCHES))) MOSTLYCLEANFILES += $(SIM_ENABLED_ARCHES:%=%/modules.c) $(SIM_ENABLED_ARCHES:%=%/stamp-modules)
MOSTLYCLEANFILES += $(%C%_GEN_MODULES_C_TARGETS) $(patsubst %,%/stamp-modules,$(SIM_ENABLED_ARCHES))
## TODO: Drop this once each port's local.mk:libsim.a depends on it themself.
SIM_ALL_RECURSIVE_DEPS += $(%C%_GEN_MODULES_C_TARGETS)
LIBIBERTY_LIB = ../libiberty/libiberty.a LIBIBERTY_LIB = ../libiberty/libiberty.a
BFD_LIB = ../bfd/libbfd.la BFD_LIB = ../bfd/libbfd.la