diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2023-01-01 14:21:09 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2023-01-10 01:15:28 -0500 |
| commit | b7bd5fe99b5fe73197df09b5010b55b7b915232c (patch) | |
| tree | 37547d332662ca5767d0fea7bbbae9e8a37b47a0 /sim | |
| parent | 4fff443a1149a5264eb41e504a360b0b1d0612f6 (diff) | |
| download | binutils-gdb-b7bd5fe99b5fe73197df09b5010b55b7b915232c.tar.gz | |
sim: or1k: 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.
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/Makefile.in | 4 | ||||
| -rw-r--r-- | sim/or1k/local.mk | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sim/Makefile.in b/sim/Makefile.in index c4de9760b02..c8518a331b9 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2771,6 +2771,7 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_msp430_TRUE@ msp430/libsim.a \ @SIM_ENABLE_ARCH_msp430_TRUE@ $(SIM_COMMON_LIBS) +@SIM_ENABLE_ARCH_or1k_TRUE@AM_CPPFLAGS_or1k = -DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31 @SIM_ENABLE_ARCH_or1k_TRUE@or1k_libsim_a_SOURCES = @SIM_ENABLE_ARCH_or1k_TRUE@or1k_libsim_a_LIBADD = \ @SIM_ENABLE_ARCH_or1k_TRUE@ $(common_libcommon_a_OBJECTS) \ @@ -5355,9 +5356,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_msp430_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @SIM_ENABLE_ARCH_or1k_TRUE@$(or1k_libsim_a_OBJECTS) $(or1k_libsim_a_LIBADD): or1k/hw-config.h -@SIM_ENABLE_ARCH_or1k_TRUE@or1k/%.o: or1k/%.c -@SIM_ENABLE_ARCH_or1k_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - @SIM_ENABLE_ARCH_or1k_TRUE@or1k/%.o: common/%.c @SIM_ENABLE_ARCH_or1k_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @SIM_ENABLE_ARCH_or1k_TRUE@or1k/modules.c: | $(or1k_BUILD_OUTPUTS) diff --git a/sim/or1k/local.mk b/sim/or1k/local.mk index a7412bfa07c..1294986a6d8 100644 --- a/sim/or1k/local.mk +++ b/sim/or1k/local.mk @@ -15,6 +15,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=32 -DWITH_TARGET_WORD_MSB=31 + %C%_libsim_a_SOURCES = %C%_libsim_a_LIBADD = \ $(common_libcommon_a_OBJECTS) \ @@ -43,9 +45,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) |