From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id D63343858D20 for ; Sun, 25 Dec 2022 19:29:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D63343858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 2BE573410CC; Sun, 25 Dec 2022 19:29:36 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 1/8] sim: mips: rename multi_flags to igen_itable_flags Date: Sun, 25 Dec 2022 14:28:45 -0500 Message-Id: <20221225192852.1940-1-vapier@gentoo.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221225072831.18760-1-vapier@gentoo.org> References: <20221225072831.18760-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This variable is only used to generate the itable files. In preparation for merging the itable logic among all ports, rename "multi_flags" to a more appropriate "igen_itable_flags" variable. There should be no real chagnes here otherwise. --- sim/Makefile.in | 2 +- sim/configure | 12 ++++++------ sim/mips/Makefile.in | 4 ++-- sim/mips/acinclude.m4 | 14 +++++++------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in index 3a2594be9ad0..3861e4e50779 100644 --- a/sim/mips/Makefile.in +++ b/sim/mips/Makefile.in @@ -6,7 +6,7 @@ SIM_MIPS_IGEN_FLAGS = @SIM_MIPS_IGEN_FLAGS@ SIM_MIPS_M16_FLAGS = @SIM_MIPS_M16_FLAGS@ SIM_MIPS_GEN = @SIM_MIPS_GEN@ -SIM_MIPS_MULTI_FLAGS = @SIM_MIPS_MULTI_FLAGS@ +SIM_MIPS_IGEN_ITABLE_FLAGS = @SIM_MIPS_IGEN_ITABLE_FLAGS@ SIM_MIPS_MULTI_IGEN_CONFIGS = @SIM_MIPS_MULTI_IGEN_CONFIGS@ SIM_MIPS_MULTI_SRC = @SIM_MIPS_MULTI_SRC@ SIM_MIPS_MULTI_OBJ = @SIM_MIPS_MULTI_OBJ@ @@ -299,7 +299,7 @@ tmp-itable-multi: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE) -Werror \ -Wnodiscard \ -Wnowidth \ - $(SIM_MIPS_MULTI_FLAGS) \ + $(SIM_MIPS_IGEN_ITABLE_FLAGS) \ -G gen-direct-access \ -G gen-zero-r0 \ -i $(IGEN_INSN) \ diff --git a/sim/mips/acinclude.m4 b/sim/mips/acinclude.m4 index 0775b323dbfa..116dc1e6141b 100644 --- a/sim/mips/acinclude.m4 +++ b/sim/mips/acinclude.m4 @@ -153,7 +153,7 @@ dnl The simulator compares the bfd mach against BFDMACHS to decide dnl which engine to use. Entries in BFDMACHS should be bfd_mach dnl values with "bfd_mach_" removed. ${sim_mips_multi_default} says dnl which entry should be the default. -SIM_MIPS_MULTI_FLAGS= +SIM_MIPS_IGEN_ITABLE_FLAGS= SIM_MIPS_MULTI_SRC= SIM_MIPS_MULTI_OBJ= SIM_MIPS_MULTI_IGEN_CONFIGS= @@ -233,7 +233,7 @@ __EOF__ dnl Build the following lists: dnl - dnl SIM_MIPS_MULTI_FLAGS: all -M and -F flags used by the simulator + dnl SIM_MIPS_IGEN_ITABLE_FLAGS: all -M and -F flags used by the simulator dnl SIM_MIPS_MULTI_SRC: all makefile-generated source files dnl SIM_MIPS_MULTI_OBJ: the objects for ${SIM_MIPS_MULTI_SRC} dnl SIM_MIPS_MULTI_IGEN_CONFIGS: igen configuration strings. @@ -241,7 +241,7 @@ __EOF__ dnl Each entry in ${SIM_MIPS_MULTI_IGEN_CONFIGS} is a prefix (m32 dnl or m16) followed by the NAME, MACHINE and FILTER part of dnl the ${sim_mips_multi_configs} entry. - AS_VAR_APPEND([SIM_MIPS_MULTI_FLAGS], [" -F ${filter} -M ${machine}"]) + AS_VAR_APPEND([SIM_MIPS_IGEN_ITABLE_FLAGS], [" -F ${filter} -M ${machine}"]) dnl Check whether special handling is needed. AS_CASE([${c}], @@ -254,7 +254,7 @@ __EOF__ dnl tmp-run-multi Makefile rule. AS_VAR_APPEND([SIM_MIPS_MULTI_SRC], [" m16${name}_run.c"]) AS_VAR_APPEND([SIM_MIPS_MULTI_OBJ], [" m16${name}_run.o"]) - AS_VAR_APPEND([SIM_MIPS_MULTI_FLAGS], [" -F 16"]) + AS_VAR_APPEND([SIM_MIPS_IGEN_ITABLE_FLAGS], [" -F 16"]) ], [*:*micromips32*:*], [dnl dnl Run igen thrice, once for micromips32, once for micromips16, @@ -266,7 +266,7 @@ __EOF__ dnl tmp-run-multi Makefile rule. AS_VAR_APPEND([SIM_MIPS_MULTI_SRC], [" micromips${name}_run.c"]) AS_VAR_APPEND([SIM_MIPS_MULTI_OBJ], [" micromips${name}_run.o"]) - AS_VAR_APPEND([SIM_MIPS_MULTI_FLAGS], [" -F 16,32"]) + AS_VAR_APPEND([SIM_MIPS_IGEN_ITABLE_FLAGS], [" -F 16,32"]) ], [*:*micromips64*:*], [dnl dnl Run igen thrice, once for micromips64, once for micromips16, @@ -278,7 +278,7 @@ __EOF__ dnl tmp-run-multi Makefile rule. AS_VAR_APPEND([SIM_MIPS_MULTI_SRC], [" micromips${name}_run.c"]) AS_VAR_APPEND([SIM_MIPS_MULTI_OBJ], [" micromips${name}_run.o"]) - AS_VAR_APPEND([SIM_MIPS_MULTI_FLAGS], [" -F 16,32,64"]) + AS_VAR_APPEND([SIM_MIPS_IGEN_ITABLE_FLAGS], [" -F 16,32,64"]) ], [ws=m32]) @@ -327,7 +327,7 @@ SIM_MIPS_M16_FLAGS="-F ${sim_mips_m16_filter} ${sim_mips_m16_machine}" AC_SUBST(SIM_MIPS_IGEN_FLAGS) AC_SUBST(SIM_MIPS_M16_FLAGS) AC_SUBST(SIM_MIPS_GEN) -AC_SUBST(SIM_MIPS_MULTI_FLAGS) +AC_SUBST(SIM_MIPS_IGEN_ITABLE_FLAGS) AC_SUBST(SIM_MIPS_MULTI_IGEN_CONFIGS) AC_SUBST(SIM_MIPS_MULTI_SRC) AC_SUBST(SIM_MIPS_MULTI_OBJ) -- 2.39.0