From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 765FA398B842 for ; Tue, 4 May 2021 12:42:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 765FA398B842 Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id C9501340C08 for ; Tue, 4 May 2021 12:42:58 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 2/2] sim: mips: always enable device models Date: Tue, 4 May 2021 08:42:57 -0400 Message-Id: <20210504124257.3734-2-vapier@gentoo.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210504124257.3734-1-vapier@gentoo.org> References: <20210504124257.3734-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org 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: , X-List-Received-Date: Tue, 04 May 2021 12:43:00 -0000 There's no need to restrict these to only specific targets as the user can select them at runtime if they want them. Always build them so we can improve build coverage too. --- sim/mips/configure | 10 +--------- sim/mips/configure.ac | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/sim/mips/configure b/sim/mips/configure index 4d2ada1f4d61..d6902677a654 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -12584,16 +12584,8 @@ sim_micromips_flags=" -F ${sim_micromips_filter} ${sim_micromips_machine} ${si # # Add simulated hardware devices # -hw_extra_devices="" -case "${target}" in - mips*tx39*) - hw_extra_devices="tx3904cpu tx3904irc tx3904tmr tx3904sio" - ;; - *) - ;; -esac -hardware="cfi core pal glue $hw_extra_devices" +hardware="cfi core pal glue tx3904cpu tx3904irc tx3904tmr tx3904sio" sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`" diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac index 6c9a6b812e38..fee3816b57af 100644 --- a/sim/mips/configure.ac +++ b/sim/mips/configure.ac @@ -426,15 +426,7 @@ AC_SUBST(sim_multi_obj) # # Add simulated hardware devices # -hw_extra_devices="" -case "${target}" in - mips*tx39*) - hw_extra_devices="tx3904cpu tx3904irc tx3904tmr tx3904sio" - ;; - *) - ;; -esac -SIM_AC_OPTION_HARDWARE($hw_extra_devices) +SIM_AC_OPTION_HARDWARE(tx3904cpu tx3904irc tx3904tmr tx3904sio) AC_PATH_X -- 2.31.1