sim: adjust sim_hw options style

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.

diff --git a/sim/Makefile.in b/sim/Makefile.in
index f660db9199fbb0b103902397ab9a7e7c599fde6e..57c1fc034a0b9536df3666f6733e4d0bd7dd382d 100644 (file)
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -829,6 +829,8 @@ SHELL = @SHELL@
 SIM_COMMON_BUILD_FALSE = @SIM_COMMON_BUILD_FALSE@
 SIM_COMMON_BUILD_TRUE = @SIM_COMMON_BUILD_TRUE@
 SIM_FRV_TRAPDUMP_FLAGS = @SIM_FRV_TRAPDUMP_FLAGS@
+SIM_HW_CFLAGS = @SIM_HW_CFLAGS@
+SIM_HW_SOCKSER = @SIM_HW_SOCKSER@
 SIM_INLINE = @SIM_INLINE@
 SIM_PRIMARY_TARGET = @SIM_PRIMARY_TARGET@
 SIM_RX_CYCLE_ACCURATE_FLAGS = @SIM_RX_CYCLE_ACCURATE_FLAGS@
@@ -889,8 +891,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sim_bitsize = @sim_bitsize@
 sim_float = @sim_float@
-sim_hw_cflags = @sim_hw_cflags@
-sim_hw_sockser = @sim_hw_sockser@
 srcdir = @srcdir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@

diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in
index 616e06ec453f74bc64e2a31337ff23433b11d910..cbe3fca88654de1a751e7a96479ec035a0a06611 100644 (file)
--- 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/configure b/sim/configure
index 06c3012bb0472c2c5542c14c4c1afc759b4fea62..00639e805d459ba0fda3b335440a574f5be60baf 100755 (executable)
--- a/sim/configure
+++ b/sim/configure
@@ -644,8 +644,8 @@ SIM_FRV_TRAPDUMP_FLAGS
 sim_float
 sim_bitsize
 SIM_INLINE
-sim_hw_sockser
-sim_hw_cflags
+SIM_HW_SOCKSER
+SIM_HW_CFLAGS
 SIM_ENABLE_HW_FALSE
 SIM_ENABLE_HW_TRUE
 cgen
@@ -15868,7 +15868,9 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
 $as_echo "${enable_sim_hardware}" >&6; }
+SIM_HW_CFLAGS=$sim_hw_cflags
 
+SIM_HW_SOCKSER=$sim_hw_sockser
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking sim inline settings" >&5

diff --git a/sim/m4/sim_ac_option_hardware.m4 b/sim/m4/sim_ac_option_hardware.m4
index d1acc6a7403d7c1175b2dd6445b4dbd08d384e16..5216d6ba5545e519eb4a91d78e92ed081093c41e 100644 (file)
--- 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)
 ])