[PATCH 1/3] sim: adjust sim_hw options style

[PATCH 1/3] sim: adjust sim_hw options style

[Mike Frysinger]

We use uppercase for other variables, and are already turning it to
uppercase in the arch-subdir.mk, so convert it in the configure step.
---
 sim/Makefile.in                  | 4 ++--
 sim/arch-subdir.mk.in            | 4 ++--
 sim/configure                    | 6 ++++--
 sim/m4/sim_ac_option_hardware.m4 | 6 ++++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in
index 616e06ec453f..cbe3fca88654 100644
--- a/sim/arch-subdir.mk.in
+++ b/sim/arch-subdir.mk.in
@@ -77,7 +77,7 @@ CGENDIR = @cgendir@
 
 SIM_INLINE = @SIM_INLINE@
 
-SIM_HW_CFLAGS = @sim_hw_cflags@
-SIM_HW_SOCKSER = @sim_hw_sockser@
+SIM_HW_CFLAGS = @SIM_HW_CFLAGS@
+SIM_HW_SOCKSER = @SIM_HW_SOCKSER@
 SIM_HW_OBJS = $(SIM_COMMON_HW_OBJS) $(SIM_HW_DEVICES:%=dv-%.o) $(SIM_HW_SOCKSER)
 @SIM_ENABLE_HW_FALSE@SIM_HW_OBJS =
diff --git a/sim/m4/sim_ac_option_hardware.m4 b/sim/m4/sim_ac_option_hardware.m4
index d1acc6a7403d..5216d6ba5545 100644
--- a/sim/m4/sim_ac_option_hardware.m4
+++ b/sim/m4/sim_ac_option_hardware.m4
@@ -36,6 +36,8 @@ else
 fi
 AM_CONDITIONAL([SIM_ENABLE_HW], [test "$enable_sim_hardware" = "yes"])
 AC_MSG_RESULT(${enable_sim_hardware})
-AC_SUBST(sim_hw_cflags)
-AC_SUBST(sim_hw_sockser)
+SIM_HW_CFLAGS=$sim_hw_cflags
+AC_SUBST(SIM_HW_CFLAGS)
+SIM_HW_SOCKSER=$sim_hw_sockser
+AC_SUBST(SIM_HW_SOCKSER)
 ])
-- 
2.38.1

[PATCH 2/3] sim: drop unused SIM_HARDWARE variable

[Mike Frysinger]

This hasn't been used since the refactor way back in commit
f872d0d643968c1101bb8c07b252edd54f626da2 ("Only enable H/W
on some mips targets."), so punt it.
---
 sim/common/Make-common.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 2698f7b2b673..18dcd36a72bb 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -186,8 +186,7 @@ CONFIG_CFLAGS = \
 	$(SIM_HW_CFLAGS) \
 	$(SIM_INLINE) \
 	$(SIM_WARN_CFLAGS) \
-	$(SIM_WERROR_CFLAGS) \
-	$(SIM_HARDWARE)
+	$(SIM_WERROR_CFLAGS)
 CSEARCH = -I. -I$(srcdir) -I$(srccom) \
   -I$(srcroot)/include \
   -I../../bfd -I$(srcroot)/bfd \
-- 
2.38.1

[PATCH 3/3] sim: build: add SIM_HW_CFLAGS to top-level build too

[Mike Frysinger]

This matches what we do with targets already.
---
 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 d8730f276988..7ea013ac1965 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 $@
-- 
2.38.1