From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id E8E703858420 for ; Mon, 7 Nov 2022 16:24:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E8E703858420 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 97ABA34100B; Mon, 7 Nov 2022 16:24:34 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 3/5] sim: or1k: drop subdir configure logic Date: Mon, 7 Nov 2022 23:24:24 +0700 Message-Id: <20221107162426.26097-3-vapier@gentoo.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221107162426.26097-1-vapier@gentoo.org> References: <20221107162426.26097-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.1 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: We've been using this only to set the default word size to 32. We can easily move this into the makefile via a -D compiler flag and clean up the build logic quite a bit. --- sim/Makefile.in | 15 +- sim/configure | 24 +- sim/configure.ac | 2 +- sim/or1k/Makefile.in | 2 + sim/or1k/aclocal.m4 | 16 - sim/or1k/configure | 2932 ----------------------------------------- sim/or1k/configure.ac | 7 - 7 files changed, 32 insertions(+), 2966 deletions(-) delete mode 100644 sim/or1k/aclocal.m4 delete mode 100755 sim/or1k/configure delete mode 100644 sim/or1k/configure.ac diff --git a/sim/configure.ac b/sim/configure.ac index c179e636a226..48bf75e88085 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -147,7 +147,7 @@ if test "${enable_sim}" != no; then SIM_TARGET([mn10300*-*-*], [mn10300], [true], [sim_igen=yes]) SIM_TARGET([moxie-*-*], [moxie]) SIM_TARGET([msp430*-*-*], [msp430]) - SIM_TARGET([or1k*-*-*], [or1k], [true]) + SIM_TARGET([or1k*-*-*], [or1k]) SIM_TARGET([powerpc*-*-*], [ppc], [true]) SIM_TARGET([pru*-*-*], [pru]) SIM_TARGET([riscv*-*-*], [riscv]) diff --git a/sim/or1k/Makefile.in b/sim/or1k/Makefile.in index fdf49835c7b8..17c40bcdc544 100644 --- a/sim/or1k/Makefile.in +++ b/sim/or1k/Makefile.in @@ -40,6 +40,8 @@ SIM_OBJS = \ SIM_OBJS += $(OR1K_OBJS) +SIM_EXTRA_CFLAGS = -DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31 + ## COMMON_POST_CONFIG_FRAG arch = or1k diff --git a/sim/or1k/configure.ac b/sim/or1k/configure.ac deleted file mode 100644 index a0fe51c897bc..000000000000 --- a/sim/or1k/configure.ac +++ /dev/null @@ -1,7 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(Makefile.in) -AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) - -SIM_AC_OPTION_BITSIZE([32], [31]) - -SIM_AC_OUTPUT -- 2.38.1