[61/83] sim: moxie: move arch-specific file compilation to top-level

Message ID 20230103075605.13606-62-vapier@gentoo.org
State Committed
Headers
Series sim: merge subdir makefiles into top-level |

Commit Message

Mike Frysinger Jan. 3, 2023, 7:55 a.m. UTC
  The arch-specific flags are only used by the arch-specific modules,
not the common/ files, so we can delete them too.
---
 sim/Makefile.in       | 4 +---
 sim/moxie/Makefile.in | 3 ---
 sim/moxie/local.mk    | 5 ++---
 3 files changed, 3 insertions(+), 9 deletions(-)
  

Patch

diff --git a/sim/moxie/Makefile.in b/sim/moxie/Makefile.in
index fd9beedbf1d6..0067fabbe5ca 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 813bdc895339..b75f0a9a8e31 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)