From 682a2a82e404a7ec033546f639c89e709ce870e1 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 5 Nov 2022 10:23:28 +0700
Subject: [PATCH] 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.
---
 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/Makefile.in b/sim/Makefile.in
index f660db9199f..57c1fc034a0 100644
--- 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 616e06ec453..cbe3fca8865 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/configure b/sim/configure
index 06c3012bb04..00639e805d4 100755
--- 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 d1acc6a7403..5216d6ba554 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.30.2