From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id eBwlN4LMHmH3GwAAWB0awg (envelope-from ) for ; Thu, 19 Aug 2021 17:26:26 -0400 Received: by simark.ca (Postfix, from userid 112) id DDBBC1EDFB; Thu, 19 Aug 2021 17:26:26 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id B8B6E1E4A3 for ; Thu, 19 Aug 2021 17:26:25 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6BB5C39BB43B for ; Thu, 19 Aug 2021 21:26:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6BB5C39BB43B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1629408385; bh=fJPTbh8d3ZpnZIIF/DSTGcSTKtydT18IZVx1zXta7mI=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=I35Y7mgXyqM0dsFG/WtE0eCqbEt74sJCEjhEZJrmXnMkQPo7BLMvmHZlATGXgUTk7 ISsJRekLd3DeBhz+CPoe6Htc0eVCgp8C7HdhQvuEzn1K8c3q3q3SPtc8/lokqWHR41 Uj/w6S2EjVDPCEIeOfq1h6X7Z5IqdInV+CPVmpew= Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id B192A39BE4A5 for ; Thu, 19 Aug 2021 21:24:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B192A39BE4A5 Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 88499342A64 for ; Thu, 19 Aug 2021 21:24:31 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 4/4] sim: update configure target list Date: Thu, 19 Aug 2021 17:23:39 -0400 Message-Id: <20210819212339.15857-4-vapier@gentoo.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210819212339.15857-1-vapier@gentoo.org> References: <20210819212339.15857-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Mike Frysinger via Gdb-patches Reply-To: Mike Frysinger Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Fix sorting of the list, and update the globs to match the list used in gdb's configure script. --- sim/configure | 42 +++++++++++++++++++++--------------------- sim/configure.ac | 11 +++++++---- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/sim/configure b/sim/configure index 8dec72cf3b40..c1db1b66e1dd 100755 --- a/sim/configure +++ b/sim/configure @@ -867,8 +867,8 @@ ac_subdirs_all='bpf mips mn10300 or1k -riscv ppc +riscv v850' # Initialize some variables set by options. @@ -14028,7 +14028,7 @@ subdirs="$subdirs bpf" esac case "${targ}" in - all|microblaze-*-*) + all|microblaze*-*-*) if test "${targ}" = "${target}"; then SIM_PRIMARY_TARGET=microblaze fi @@ -14112,7 +14112,7 @@ subdirs="$subdirs bpf" esac case "${targ}" in - all|or1k-*-* | or1knd-*-*) + all|or1k*-*-*) if test "${targ}" = "${target}"; then SIM_PRIMARY_TARGET=or1k fi @@ -14123,6 +14123,21 @@ subdirs="$subdirs bpf" + ;; + esac + + case "${targ}" in + all|powerpc*-*-*) + if test "${targ}" = "${target}"; then + SIM_PRIMARY_TARGET=ppc + fi + subdirs="$subdirs ppc" + + + ac_config_commands="$ac_config_commands depdir-ppc" + + + ;; esac @@ -14214,7 +14229,7 @@ subdirs="$subdirs bpf" esac case "${targ}" in - all|sparc-*-rtems*|sparc-*-elf*) + all|sparc-*-*) if test "${targ}" = "${target}"; then SIM_PRIMARY_TARGET=erc32 fi @@ -14228,21 +14243,6 @@ subdirs="$subdirs bpf" - ;; - esac - - case "${targ}" in - all|powerpc*-*-*) - if test "${targ}" = "${target}"; then - SIM_PRIMARY_TARGET=ppc - fi - subdirs="$subdirs ppc" - - - ac_config_commands="$ac_config_commands depdir-ppc" - - - ;; esac @@ -15882,6 +15882,7 @@ do "msp430/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS msp430/Makefile" ;; "depdir-msp430") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-msp430" ;; "depdir-or1k") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-or1k" ;; + "depdir-ppc") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-ppc" ;; "pru/Makefile.sim") CONFIG_FILES="$CONFIG_FILES pru/Makefile.sim:pru/Makefile.in" ;; "pru/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS pru/Makefile" ;; "depdir-pru") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-pru" ;; @@ -15898,7 +15899,6 @@ do "erc32/Makefile.sim") CONFIG_FILES="$CONFIG_FILES erc32/Makefile.sim:erc32/Makefile.in" ;; "erc32/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS erc32/Makefile" ;; "depdir-erc32") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-erc32" ;; - "depdir-ppc") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-ppc" ;; "depdir-v850") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-v850" ;; "example-synacor/Makefile.sim") CONFIG_FILES="$CONFIG_FILES example-synacor/Makefile.sim:example-synacor/Makefile.in" ;; "example-synacor/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS example-synacor/Makefile" ;; @@ -17483,6 +17483,7 @@ $as_echo X"$file" | ;; "depdir-msp430":C) $SHELL $ac_aux_dir/mkinstalldirs msp430/$DEPDIR ;; "depdir-or1k":C) $SHELL $ac_aux_dir/mkinstalldirs or1k/$DEPDIR ;; + "depdir-ppc":C) $SHELL $ac_aux_dir/mkinstalldirs ppc/$DEPDIR ;; "pru/Makefile":C) sed -n \ -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { /^srcdir = / s:$:/pru: @@ -17549,7 +17550,6 @@ $as_echo X"$file" | rm -f erc32/Makesim1.tmp erc32/Makesim2.tmp ;; "depdir-erc32":C) $SHELL $ac_aux_dir/mkinstalldirs erc32/$DEPDIR ;; - "depdir-ppc":C) $SHELL $ac_aux_dir/mkinstalldirs ppc/$DEPDIR ;; "depdir-v850":C) $SHELL $ac_aux_dir/mkinstalldirs v850/$DEPDIR ;; "example-synacor/Makefile":C) sed -n \ -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { diff --git a/sim/configure.ac b/sim/configure.ac index 098d88bc01ef..5d36e5556d34 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -107,6 +107,9 @@ dnl WHEN ADDING ENTRIES TO THIS MATRIX: dnl Make sure that the left side always has two dashes. Otherwise you can get dnl spurious matches. Even for unambiguous cases, do this as a convention, else dnl the table becomes a real mess to understand and maintain. +dnl +dnl NB: Target matching is aligned with gdb/configure.tgt. Changes must be kept +dnl in sync with that file. if test "${enable_sim}" != no; then sim_igen=no for targ in `echo $target $enable_targets | sed 's/,/ /g'` @@ -128,19 +131,19 @@ if test "${enable_sim}" != no; then SIM_TARGET([m32r-*-*], [m32r]) SIM_TARGET([m68hc11-*-*|m6811-*-*], [m68hc11]) SIM_TARGET([mcore-*-*], [mcore]) - SIM_TARGET([microblaze-*-*], [microblaze]) + SIM_TARGET([microblaze*-*-*], [microblaze]) SIM_TARGET([mips*-*-*], [mips], [true], [sim_igen=yes]) SIM_TARGET([mn10300*-*-*], [mn10300], [true], [sim_igen=yes]) SIM_TARGET([moxie-*-*], [moxie]) SIM_TARGET([msp430*-*-*], [msp430]) - SIM_TARGET([or1k-*-* | or1knd-*-*], [or1k], [true]) + SIM_TARGET([or1k*-*-*], [or1k], [true]) + SIM_TARGET([powerpc*-*-*], [ppc], [true]) SIM_TARGET([pru*-*-*], [pru]) SIM_TARGET([riscv*-*-*], [riscv], [true]) SIM_TARGET([rl78-*-*], [rl78]) SIM_TARGET([rx-*-*], [rx]) SIM_TARGET([sh*-*-*], [sh]) - SIM_TARGET([sparc-*-rtems*|sparc-*-elf*], [erc32]) - SIM_TARGET([powerpc*-*-*], [ppc], [true]) + SIM_TARGET([sparc-*-*], [erc32]) SIM_TARGET([v850*-*-*], [v850], [true], [sim_igen=yes]) done -- 2.31.1