summaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2022-11-07 21:43:40 +0700
committerMike Frysinger <vapier@gentoo.org>2022-11-11 01:44:16 +0700
commit5894c5944cc1697758d12864040b95b86a308c23 (patch)
treeeeecfe1a79573588db1fe6d780dc63009d14f0f6 /sim
parent267058274c08c2df61d5f83a5f1d864eee2ccf34 (diff)
downloadbinutils-gdb-5894c5944cc1697758d12864040b95b86a308c23.tar.gz
squash: more modules.c work
Diffstat (limited to 'sim')
-rw-r--r--sim/aarch64/local.mk3
-rw-r--r--sim/common/local.mk17
2 files changed, 10 insertions, 10 deletions
diff --git a/sim/aarch64/local.mk b/sim/aarch64/local.mk
index 62095f7ce2c..e3202d65b39 100644
--- a/sim/aarch64/local.mk
+++ b/sim/aarch64/local.mk
@@ -46,6 +46,3 @@ $(%C%_libsim_a_OBJECTS) $(%C%_run_OBJECTS) $(%C%_libsim_a_LIBADD): | $(SIM_ALL_R
%D%/%.o: common/%.c | $(SIM_ALL_RECURSIVE_DEPS)
$(AM_V_CC)$(COMPILE) -c -o $@ $<
-
-%D%/modules.c: %D%/stamp-modules ; @true
-%D%/stamp-modules: Makefile $(%C%_libsim_a_SOURCES) ; $(GEN_MODULES_C)
diff --git a/sim/common/local.mk b/sim/common/local.mk
index 07ca04b083e..33bdbe2dd78 100644
--- a/sim/common/local.mk
+++ b/sim/common/local.mk
@@ -135,16 +135,17 @@ GEN_MODULES_C_SRCS = \
$(wildcard \
$(patsubst %.o,$(srcdir)/%.c,$($(@D)_libsim_a_OBJECTS) $($(@D)_libsim_a_LIBADD)) \
$(patsubst $(@D)/%.o,$(srcdir)/common/%.c,$($(@D)_libsim_a_LIBADD)))
-GEN_MODULES_C = \
+%/modules.c: %/stamp-modules ; @true
+%/stamp-modules: Makefile
$(AM_V_GEN)set -e; \
LANG=C ; export LANG; \
LC_ALL=C ; export LC_ALL; \
- sed -n -e '/^sim_install_/{s/^\(sim_install_[a-z_0-9A-Z]*\).*/\1/;p}' $(GEN_MODULES_C_SRCS) | sort >$@.l-tmp; \
+ sed -n -e '/^sim_install_/{s/^\(sim_install_[a-z_0-9A-Z]*\).*/\1/;p}' Makefile $(GEN_MODULES_C_SRCS) | sort >$@.l-tmp; \
( \
echo '/* Do not modify this file. */'; \
echo '/* It is created automatically by the Makefile. */'; \
- echo '\#include "libiberty.h"'; \
- echo '\#include "sim-module.h"'; \
+ echo '#include "libiberty.h"'; \
+ echo '#include "sim-module.h"'; \
sed -e 's:\(.*\):extern MODULE_INIT_FN \1;:' $@.l-tmp; \
echo 'MODULE_INSTALL_FN * const sim_modules_detected[] = {'; \
sed -e 's:\(.*\): \1,:' $@.l-tmp; \
@@ -154,9 +155,11 @@ GEN_MODULES_C = \
$(SHELL) $(srcroot)/move-if-change $@.tmp $(@D)/modules.c; \
rm -f $@.l-tmp; \
touch $@
-GEN_MODULES_C_TARGETS = $(patsubst %,%/modules.c,$(SIM_SUBDIRS))
-MOSTLYCLEANFILES += $(GEN_MODULES_C_TARGETS) $(patsubst %,%/stamp-moules,$(SIM_SUBDIRS))
-SIM_ALL_RECURSIVE_DEPS += $(GEN_MODULES_C_TARGETS)
+.PRECIOUS: %/stamp-modules
+
+%C%_GEN_MODULES_C_TARGETS = $(patsubst %,%/modules.c,$(SIM_ENABLED_ARCHES))
+MOSTLYCLEANFILES += $(%C%_GEN_MODULES_C_TARGETS) $(patsubst %,%/stamp-moules,$(SIM_ENABLED_ARCHES))
+SIM_ALL_RECURSIVE_DEPS += $(%C%_GEN_MODULES_C_TARGETS)
LIBIBERTY_LIB = ../libiberty/libiberty.a
BFD_LIB = ../bfd/libbfd.la