sim: m32c: move arch-specific file compilation to top-level

The arch-specific flags are only used by the arch-specific modules,
not the common/ files, so we can delete them too.

diff --git a/sim/Makefile.in b/sim/Makefile.in
index 51e54234dbd6004c8c6f4540a1a004fc0b1b63dd..7f35e2abecb2d9702e826d45b088f146ceac6901 100644 (file)
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -2425,6 +2425,7 @@ testsuite_common_CPPFLAGS = \
 @SIM_ENABLE_ARCH_lm32_TRUE@    lm32/mloop.c \
 @SIM_ENABLE_ARCH_lm32_TRUE@    lm32/stamp-mloop
 
+@SIM_ENABLE_ARCH_m32c_TRUE@AM_CPPFLAGS_m32c = -DTIMER_A
 @SIM_ENABLE_ARCH_m32c_TRUE@m32c_libsim_a_SOURCES = 
 @SIM_ENABLE_ARCH_m32c_TRUE@m32c_libsim_a_LIBADD = \
 @SIM_ENABLE_ARCH_m32c_TRUE@    $(common_libcommon_a_OBJECTS) \
@@ -4969,9 +4970,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo
 @SIM_ENABLE_ARCH_lm32_TRUE@lm32/cpu.h lm32/sem.c lm32/sem-switch.c lm32/model.c lm32/decode.c lm32/decode.h: @CGEN_MAINT@ lm32/cgen-cpu-decode
 @SIM_ENABLE_ARCH_m32c_TRUE@$(m32c_libsim_a_OBJECTS) $(m32c_libsim_a_LIBADD): m32c/hw-config.h
 
-@SIM_ENABLE_ARCH_m32c_TRUE@m32c/%.o: m32c/%.c
-@SIM_ENABLE_ARCH_m32c_TRUE@    $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
-
 @SIM_ENABLE_ARCH_m32c_TRUE@m32c/%.o: common/%.c
 @SIM_ENABLE_ARCH_m32c_TRUE@    $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
 @SIM_ENABLE_ARCH_m32c_TRUE@m32c/modules.c: | $(m32c_BUILD_OUTPUTS)

diff --git a/sim/m32c/Makefile.in b/sim/m32c/Makefile.in
index 4c91e57dd2d020ee9a83075a7cef823f9cd87ea1..02d204366ac50818ca61a6f36b3409ccec54f001 100644 (file)
--- a/sim/m32c/Makefile.in
+++ b/sim/m32c/Makefile.in
@@ -19,7 +19,4 @@
 ### along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ## COMMON_PRE_CONFIG_FRAG
-
-SIM_EXTRA_CFLAGS = -DTIMER_A
-
 ## COMMON_POST_CONFIG_FRAG

diff --git a/sim/m32c/local.mk b/sim/m32c/local.mk
index 56332402f3293167cdff322dc900089d586e9aae..e992b01d3067d927b219907745a3b90a03398187 100644 (file)
--- a/sim/m32c/local.mk
+++ b/sim/m32c/local.mk
@@ -16,6 +16,8 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+AM_CPPFLAGS_%C% = -DTIMER_A
+
 %C%_libsim_a_SOURCES =
 %C%_libsim_a_LIBADD = \
        $(common_libcommon_a_OBJECTS) \
@@ -35,9 +37,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)