aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2023-01-01 14:17:46 -0500
committerMike Frysinger <vapier@gentoo.org>2023-01-10 01:15:28 -0500
commit63a9d59e884e18d02ca15abc1149fd14b4b144cd (patch)
treedce85a932f02e530c4631c3a5a0fcebd65cd7b8d
parent1546cb45407f5228e8d4bdd948b7d0bc6c4d1b76 (diff)
downloadgdb-63a9d59e884e18d02ca15abc1149fd14b4b144cd.zip
gdb-63a9d59e884e18d02ca15abc1149fd14b4b144cd.tar.gz
gdb-63a9d59e884e18d02ca15abc1149fd14b4b144cd.tar.bz2
sim: mn10300: 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.
-rw-r--r--sim/Makefile.in7
-rw-r--r--sim/mn10300/local.mk7
2 files changed, 8 insertions, 6 deletions
diff --git a/sim/Makefile.in b/sim/Makefile.in
index d26c8eb..90f1449 100644
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -2684,6 +2684,10 @@ testsuite_common_CPPFLAGS = \
@SIM_ENABLE_ARCH_mips_TRUE@mips_M16_DC = $(srcdir)/mips/m16.dc
@SIM_ENABLE_ARCH_mips_TRUE@mips_MICROMIPS32_DC = $(srcdir)/mips/micromips.dc
@SIM_ENABLE_ARCH_mips_TRUE@mips_MICROMIPS16_DC = $(srcdir)/mips/micromips16.dc
+@SIM_ENABLE_ARCH_mn10300_TRUE@AM_CPPFLAGS_mn10300 = \
+@SIM_ENABLE_ARCH_mn10300_TRUE@ -DPOLL_QUIT_INTERVAL=0x20 \
+@SIM_ENABLE_ARCH_mn10300_TRUE@ -DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31
+
@SIM_ENABLE_ARCH_mn10300_TRUE@mn10300_libsim_a_SOURCES =
@SIM_ENABLE_ARCH_mn10300_TRUE@mn10300_libsim_a_LIBADD = \
@SIM_ENABLE_ARCH_mn10300_TRUE@ $(common_libcommon_a_OBJECTS) \
@@ -5297,9 +5301,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo
@SIM_ENABLE_ARCH_mips_TRUE@ $(AM_V_at)touch $@
@SIM_ENABLE_ARCH_mn10300_TRUE@$(mn10300_libsim_a_OBJECTS) $(mn10300_libsim_a_LIBADD): mn10300/hw-config.h
-@SIM_ENABLE_ARCH_mn10300_TRUE@mn10300/%.o: mn10300/%.c
-@SIM_ENABLE_ARCH_mn10300_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
-
@SIM_ENABLE_ARCH_mn10300_TRUE@mn10300/%.o: common/%.c
@SIM_ENABLE_ARCH_mn10300_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
@SIM_ENABLE_ARCH_mn10300_TRUE@mn10300/modules.c: | $(mn10300_BUILD_OUTPUTS)
diff --git a/sim/mn10300/local.mk b/sim/mn10300/local.mk
index 06b4208..527d580 100644
--- a/sim/mn10300/local.mk
+++ b/sim/mn10300/local.mk
@@ -16,6 +16,10 @@
## 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% = \
+ -DPOLL_QUIT_INTERVAL=0x20 \
+ -DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31
+
%C%_libsim_a_SOURCES =
%C%_libsim_a_LIBADD = \
$(common_libcommon_a_OBJECTS) \
@@ -37,9 +41,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)