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

The arch-specific compiler flags are duplicated, but they'll be cleaned
up once we move all subdir compiles to the top-level.

diff --git a/sim/Makefile.in b/sim/Makefile.in
index d912877cd40c30a3e97e661a5758a57481b4d239..8fd48426fa5bd54d7d0d5bca910f4d823eb0b1bd 100644 (file)
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -2832,6 +2832,7 @@ testsuite_common_CPPFLAGS = \
 @SIM_ENABLE_ARCH_pru_TRUE@     pru/libsim.a \
 @SIM_ENABLE_ARCH_pru_TRUE@     $(SIM_COMMON_LIBS)
 
+@SIM_ENABLE_ARCH_riscv_TRUE@AM_CPPFLAGS_riscv = -DWITH_TARGET_WORD_BITSIZE=$(SIM_RISCV_BITSIZE)
 @SIM_ENABLE_ARCH_riscv_TRUE@riscv_libsim_a_SOURCES = 
 @SIM_ENABLE_ARCH_riscv_TRUE@riscv_libsim_a_LIBADD = \
 @SIM_ENABLE_ARCH_riscv_TRUE@   $(common_libcommon_a_OBJECTS) \
@@ -5401,9 +5402,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo
 @SIM_ENABLE_ARCH_pru_TRUE@     $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
 @SIM_ENABLE_ARCH_riscv_TRUE@$(riscv_libsim_a_OBJECTS) $(riscv_libsim_a_LIBADD): riscv/hw-config.h
 
-@SIM_ENABLE_ARCH_riscv_TRUE@riscv/%.o: riscv/%.c
-@SIM_ENABLE_ARCH_riscv_TRUE@   $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
-
 @SIM_ENABLE_ARCH_riscv_TRUE@riscv/%.o: common/%.c
 @SIM_ENABLE_ARCH_riscv_TRUE@   $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
 @SIM_ENABLE_ARCH_rl78_TRUE@$(rl78_libsim_a_OBJECTS) $(rl78_libsim_a_LIBADD): rl78/hw-config.h

diff --git a/sim/riscv/local.mk b/sim/riscv/local.mk
index 6f03fc3d0346e654ff914cd4abb0d5c359ce8cec..a77f6f74317d1e73867901341880fd168c0bc7a8 100644 (file)
--- a/sim/riscv/local.mk
+++ b/sim/riscv/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% = -DWITH_TARGET_WORD_BITSIZE=$(SIM_RISCV_BITSIZE)
+
 %C%_libsim_a_SOURCES =
 %C%_libsim_a_LIBADD = \
        $(common_libcommon_a_OBJECTS) \
@@ -30,9 +32,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)