From 9b5a17d2be51a9d84df4934bf1262441cd1a2ca1 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 1 Jan 2023 14:14:05 -0500 Subject: [PATCH] sim: m32r: move arch-specific file compilation to top-level --- sim/Makefile.in | 15 ++++++++++++--- sim/m32r/Makefile.in | 3 --- sim/m32r/local.mk | 17 ++++++++++++++--- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 7f35e2abecb..61ee0abd011 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2458,6 +2458,18 @@ testsuite_common_CPPFLAGS = \ # opc2c leaks memory, and therefore makes AddressSanitizer unhappy. Disable # leak detection while running it. @SIM_ENABLE_ARCH_m32c_TRUE@m32c_OPC2C_RUN = ASAN_OPTIONS=detect_leaks=0 m32c/opc2c$(EXEEXT) +@SIM_ENABLE_ARCH_m32r_TRUE@AM_CFLAGS_m32r_cpu.o = -Wno-error +@SIM_ENABLE_ARCH_m32r_TRUE@AM_CFLAGS_m32r_cpu2.o = -Wno-error +@SIM_ENABLE_ARCH_m32r_TRUE@AM_CFLAGS_m32r_cpux.o = -Wno-error +@SIM_ENABLE_ARCH_m32r_TRUE@AM_CFLAGS_m32r_m32r.o = -Wno-error +@SIM_ENABLE_ARCH_m32r_TRUE@AM_CFLAGS_m32r_m32r2.o = -Wno-error +@SIM_ENABLE_ARCH_m32r_TRUE@AM_CFLAGS_m32r_m32rx.o = -Wno-error +@SIM_ENABLE_ARCH_m32r_TRUE@AM_CFLAGS_m32r_mloop.o = -Wno-error +@SIM_ENABLE_ARCH_m32r_TRUE@AM_CFLAGS_m32r_mloop2.o = -Wno-error +@SIM_ENABLE_ARCH_m32r_TRUE@AM_CFLAGS_m32r_mloopx.o = -Wno-error +@SIM_ENABLE_ARCH_m32r_TRUE@AM_CFLAGS_m32r_sem.o = -Wno-error +@SIM_ENABLE_ARCH_m32r_TRUE@AM_CFLAGS_m32r_sim_if.o = -Wno-error +@SIM_ENABLE_ARCH_m32r_TRUE@AM_CFLAGS_m32r_traps.o = -Wno-error @SIM_ENABLE_ARCH_m32r_TRUE@m32r_libsim_a_SOURCES = @SIM_ENABLE_ARCH_m32r_TRUE@m32r_libsim_a_LIBADD = \ @SIM_ENABLE_ARCH_m32r_TRUE@ $(common_libcommon_a_OBJECTS) \ @@ -4991,9 +5003,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_m32c_TRUE@ $(AM_V_at)mv $@.tmp $@ @SIM_ENABLE_ARCH_m32r_TRUE@$(m32r_libsim_a_OBJECTS) $(m32r_libsim_a_LIBADD): m32r/hw-config.h -@SIM_ENABLE_ARCH_m32r_TRUE@m32r/%.o: m32r/%.c -@SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - @SIM_ENABLE_ARCH_m32r_TRUE@m32r/%.o: common/%.c @SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @SIM_ENABLE_ARCH_m32r_TRUE@m32r/modules.c: | $(m32r_BUILD_OUTPUTS) diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in index bc7b8569479..43346b8b984 100644 --- a/sim/m32r/Makefile.in +++ b/sim/m32r/Makefile.in @@ -21,7 +21,4 @@ arch = m32r -# Some modules don't build cleanly yet. -cpu.o cpu2.o cpux.o m32r.o m32r2.o m32rx.o mloop.o mloop2.o mloopx.o sem.o sim-if.o traps.o: SIM_WERROR_CFLAGS = - ## COMMON_POST_CONFIG_FRAG diff --git a/sim/m32r/local.mk b/sim/m32r/local.mk index afecaf6c8bc..3ccfce79b09 100644 --- a/sim/m32r/local.mk +++ b/sim/m32r/local.mk @@ -16,6 +16,20 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . +## Some modules don't build cleanly yet. +AM_CFLAGS_%C%_cpu.o = -Wno-error +AM_CFLAGS_%C%_cpu2.o = -Wno-error +AM_CFLAGS_%C%_cpux.o = -Wno-error +AM_CFLAGS_%C%_m32r.o = -Wno-error +AM_CFLAGS_%C%_m32r2.o = -Wno-error +AM_CFLAGS_%C%_m32rx.o = -Wno-error +AM_CFLAGS_%C%_mloop.o = -Wno-error +AM_CFLAGS_%C%_mloop2.o = -Wno-error +AM_CFLAGS_%C%_mloopx.o = -Wno-error +AM_CFLAGS_%C%_sem.o = -Wno-error +AM_CFLAGS_%C%_sim_if.o = -Wno-error +AM_CFLAGS_%C%_traps.o = -Wno-error + %C%_libsim_a_SOURCES = %C%_libsim_a_LIBADD = \ $(common_libcommon_a_OBJECTS) \ @@ -56,9 +70,6 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: %D%/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - %D%/%.o: common/%.c $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) -- 2.30.2