[binutils-gdb] sim: build: add SIM_HW_CFLAGS to top-level build too

[binutils-gdb] sim: build: add SIM_HW_CFLAGS to top-level build too

[Michael Frysinger]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=bfc96c1039d33b1ed0c8b2e1b6fb3859a693cfe9

commit bfc96c1039d33b1ed0c8b2e1b6fb3859a693cfe9
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Sat Nov 5 10:33:37 2022 +0700

    sim: build: add SIM_HW_CFLAGS to top-level build too
    
    This matches what we do with targets already.

Diff:
---
 sim/Makefile.am | 2 ++
 sim/Makefile.in | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sim/Makefile.am b/sim/Makefile.am
index d8730f27698..7ea013ac196 100644
--- a/sim/Makefile.am
+++ b/sim/Makefile.am
@@ -46,10 +46,12 @@ AM_CPPFLAGS = \
 	-I$(srcroot)/include \
 	-I../bfd \
 	-I.. \
+	$(SIM_HW_CFLAGS) \
 	$(SIM_INLINE)
 
 AM_CPPFLAGS_FOR_BUILD = \
 	-I$(srcroot)/include \
+	$(SIM_HW_CFLAGS) \
 	$(SIM_INLINE)
 COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
 LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
diff --git a/sim/Makefile.in b/sim/Makefile.in
index 57c1fc034a0..06d5da1ecf5 100644
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -924,9 +924,10 @@ MOSTLYCLEANFILES = core $(am__append_5) site-sim-config.exp \
 	$(am__append_34) $(am__append_37) $(am__append_39)
 AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
 AM_CPPFLAGS = $(INCGNU) -I$(srcroot)/include -I../bfd -I.. \
-	$(SIM_INLINE) -I$(srcdir)/common -DSIM_COMMON_BUILD
-AM_CPPFLAGS_FOR_BUILD = -I$(srcroot)/include $(SIM_INLINE) \
-	-I$(srcdir)/common
+	$(SIM_HW_CFLAGS) $(SIM_INLINE) -I$(srcdir)/common \
+	-DSIM_COMMON_BUILD
+AM_CPPFLAGS_FOR_BUILD = -I$(srcroot)/include $(SIM_HW_CFLAGS) \
+	$(SIM_INLINE) -I$(srcdir)/common
 COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
 LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
 SIM_ALL_RECURSIVE_DEPS = common/libcommon.a $(am__append_2) \