From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 20AF9385843B; Sat, 5 Nov 2022 03:51:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 20AF9385843B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667620276; bh=uYeW+FagmTrXwQr2cyzIcwLjKM0jhMhCeLdB/5OzUts=; h=From:To:Subject:Date:From; b=LwNPihv8CEJRaOiQYOL6Jp9fCg3k5MpLNOxNRS1/Ma3KkaWql9V4mzbcflLQQJWwV iNfXGaNlWW47zYB5riGEk0EbGUsHke5vQrX/MqHELmnU0hQkJPe4LYM7J6Bbm3wcUh dH9J//+ag/oSLKCnqAVwigXjlHWsDFEj/WkuH2Co= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: gdb-cvs@sourceware.org Subject: [binutils-gdb] sim: adjust sim_hw options style X-Act-Checkin: binutils-gdb X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 0fa7ad4eb4f76e24fabf6a15197f078a3ba60d80 X-Git-Newrev: 682a2a82e404a7ec033546f639c89e709ce870e1 Message-Id: <20221105035116.20AF9385843B@sourceware.org> Date: Sat, 5 Nov 2022 03:51:16 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D682a2a82e404= a7ec033546f639c89e709ce870e1 commit 682a2a82e404a7ec033546f639c89e709ce870e1 Author: Mike Frysinger Date: Sat Nov 5 10:23:28 2022 +0700 sim: adjust sim_hw options style =20 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: --- 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 =3D @SHELL@ SIM_COMMON_BUILD_FALSE =3D @SIM_COMMON_BUILD_FALSE@ SIM_COMMON_BUILD_TRUE =3D @SIM_COMMON_BUILD_TRUE@ SIM_FRV_TRAPDUMP_FLAGS =3D @SIM_FRV_TRAPDUMP_FLAGS@ +SIM_HW_CFLAGS =3D @SIM_HW_CFLAGS@ +SIM_HW_SOCKSER =3D @SIM_HW_SOCKSER@ SIM_INLINE =3D @SIM_INLINE@ SIM_PRIMARY_TARGET =3D @SIM_PRIMARY_TARGET@ SIM_RX_CYCLE_ACCURATE_FLAGS =3D @SIM_RX_CYCLE_ACCURATE_FLAGS@ @@ -889,8 +891,6 @@ sbindir =3D @sbindir@ sharedstatedir =3D @sharedstatedir@ sim_bitsize =3D @sim_bitsize@ sim_float =3D @sim_float@ -sim_hw_cflags =3D @sim_hw_cflags@ -sim_hw_sockser =3D @sim_hw_sockser@ srcdir =3D @srcdir@ subdirs =3D @subdirs@ sysconfdir =3D @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 =3D @cgendir@ =20 SIM_INLINE =3D @SIM_INLINE@ =20 -SIM_HW_CFLAGS =3D @sim_hw_cflags@ -SIM_HW_SOCKSER =3D @sim_hw_sockser@ +SIM_HW_CFLAGS =3D @SIM_HW_CFLAGS@ +SIM_HW_SOCKSER =3D @SIM_HW_SOCKSER@ SIM_HW_OBJS =3D $(SIM_COMMON_HW_OBJS) $(SIM_HW_DEVICES:%=3Ddv-%.o) $(SIM_H= W_SOCKSER) @SIM_ENABLE_HW_FALSE@SIM_HW_OBJS =3D 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 =20 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >= &5 $as_echo "${enable_sim_hardware}" >&6; } +SIM_HW_CFLAGS=3D$sim_hw_cflags =20 +SIM_HW_SOCKSER=3D$sim_hw_sockser =20 =20 { $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_hardwa= re.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" =3D "yes"]) AC_MSG_RESULT(${enable_sim_hardware}) -AC_SUBST(sim_hw_cflags) -AC_SUBST(sim_hw_sockser) +SIM_HW_CFLAGS=3D$sim_hw_cflags +AC_SUBST(SIM_HW_CFLAGS) +SIM_HW_SOCKSER=3D$sim_hw_sockser +AC_SUBST(SIM_HW_SOCKSER) ])