aboutsummaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
Diffstat (limited to 'sim')
-rw-r--r--sim/Makefile.in4
-rw-r--r--sim/moxie/Makefile.in3
-rw-r--r--sim/moxie/local.mk5
3 files changed, 3 insertions, 9 deletions
diff --git a/sim/Makefile.in b/sim/Makefile.in
index 90f1449..ab68081 100644
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -2738,6 +2738,7 @@ testsuite_common_CPPFLAGS = \
@SIM_ENABLE_ARCH_mn10300_TRUE@mn10300_IGEN_INSN = $(srcdir)/mn10300/mn10300.igen
@SIM_ENABLE_ARCH_mn10300_TRUE@mn10300_IGEN_INSN_INC = mn10300/am33.igen mn10300/am33-2.igen
@SIM_ENABLE_ARCH_mn10300_TRUE@mn10300_IGEN_DC = $(srcdir)/mn10300/mn10300.dc
+@SIM_ENABLE_ARCH_moxie_TRUE@AM_CPPFLAGS_moxie = -DDTB="\"$(dtbdir)/moxie-gdb.dtb\""
@SIM_ENABLE_ARCH_moxie_TRUE@moxie_libsim_a_SOURCES =
@SIM_ENABLE_ARCH_moxie_TRUE@moxie_libsim_a_LIBADD = \
@SIM_ENABLE_ARCH_moxie_TRUE@ $(common_libcommon_a_OBJECTS) \
@@ -5334,9 +5335,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo
@SIM_ENABLE_ARCH_mn10300_TRUE@ $(AM_V_at)touch $@
@SIM_ENABLE_ARCH_moxie_TRUE@$(moxie_libsim_a_OBJECTS) $(moxie_libsim_a_LIBADD): moxie/hw-config.h
-@SIM_ENABLE_ARCH_moxie_TRUE@moxie/%.o: moxie/%.c
-@SIM_ENABLE_ARCH_moxie_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
-
@SIM_ENABLE_ARCH_moxie_TRUE@moxie/%.o: common/%.c
@SIM_ENABLE_ARCH_moxie_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
diff --git a/sim/moxie/Makefile.in b/sim/moxie/Makefile.in
index fd9beed..0067fab 100644
--- a/sim/moxie/Makefile.in
+++ b/sim/moxie/Makefile.in
@@ -16,7 +16,4 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
## COMMON_PRE_CONFIG_FRAG
-
-SIM_EXTRA_CFLAGS = -DDTB="\"$(dtbdir)/moxie-gdb.dtb\""
-
## COMMON_POST_CONFIG_FRAG
diff --git a/sim/moxie/local.mk b/sim/moxie/local.mk
index 813bdc8..b75f0a9 100644
--- a/sim/moxie/local.mk
+++ b/sim/moxie/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% = -DDTB="\"$(dtbdir)/moxie-gdb.dtb\""
+
%C%_libsim_a_SOURCES =
%C%_libsim_a_LIBADD = \
$(common_libcommon_a_OBJECTS) \
@@ -28,9 +30,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)