sim: rx: 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 f19f245553be474471411ead2861735cc0a17d02..6cae85c80381d561683b7a5eace71c726f4784c9 100644 (file)
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -2867,6 +2867,7 @@ testsuite_common_CPPFLAGS = \
 @SIM_ENABLE_ARCH_rl78_TRUE@    rl78/libsim.a \
 @SIM_ENABLE_ARCH_rl78_TRUE@    $(SIM_COMMON_LIBS)
 
+@SIM_ENABLE_ARCH_rx_TRUE@AM_CPPFLAGS_rx = $(SIM_RX_CYCLE_ACCURATE_FLAGS)
 @SIM_ENABLE_ARCH_rx_TRUE@rx_libsim_a_SOURCES = 
 @SIM_ENABLE_ARCH_rx_TRUE@rx_libsim_a_LIBADD = \
 @SIM_ENABLE_ARCH_rx_TRUE@      $(common_libcommon_a_OBJECTS) \
@@ -5410,9 +5411,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo
 @SIM_ENABLE_ARCH_rl78_TRUE@    $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
 @SIM_ENABLE_ARCH_rx_TRUE@$(rx_libsim_a_OBJECTS) $(rx_libsim_a_LIBADD): rx/hw-config.h
 
-@SIM_ENABLE_ARCH_rx_TRUE@rx/%.o: rx/%.c
-@SIM_ENABLE_ARCH_rx_TRUE@      $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
-
 @SIM_ENABLE_ARCH_rx_TRUE@rx/%.o: common/%.c
 @SIM_ENABLE_ARCH_rx_TRUE@      $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
 @SIM_ENABLE_ARCH_sh_TRUE@$(sh_libsim_a_OBJECTS) $(sh_libsim_a_LIBADD): sh/hw-config.h

diff --git a/sim/rx/Makefile.in b/sim/rx/Makefile.in
index 0c4a1f6ab6b6bcd29815a75bf879b2c1026c47d5..da241390ab1ea743b627203ccccaf6c1a06270c6 100644 (file)
--- a/sim/rx/Makefile.in
+++ b/sim/rx/Makefile.in
@@ -19,7 +19,4 @@
 ### along with the GNU simulators; if not, see <http://www.gnu.org/licenses/>.
 
 ## COMMON_PRE_CONFIG_FRAG
-
-SIM_EXTRA_CFLAGS = @SIM_RX_CYCLE_ACCURATE_FLAGS@
-
 ## COMMON_POST_CONFIG_FRAG

diff --git a/sim/rx/local.mk b/sim/rx/local.mk
index c23ac4f8035c92c47ce210d1524bed82d864d558..7115286a9b50a6282ec28338403090bab4ddf9ef 100644 (file)
--- a/sim/rx/local.mk
+++ b/sim/rx/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% = $(SIM_RX_CYCLE_ACCURATE_FLAGS)
+
 %C%_libsim_a_SOURCES =
 %C%_libsim_a_LIBADD = \
        $(common_libcommon_a_OBJECTS) \
@@ -34,9 +36,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)