From patchwork Mon Nov 7 16:24:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 60128 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AB5B7385800F for ; Mon, 7 Nov 2022 16:24:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AB5B7385800F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667838297; bh=ZUcPEsnXl3XCIxE9+Yuep6DTg9gRyQDI0YOggFYQ9cU=; 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=QCq9GogBcHPpxuZuKqgF28fiXgbYk1jUh6tf03pEeF/kmBoHAjQFZrL+UgxDErOjR B28rMVj2WXI7of8S2QZVVl/0fNPh/Ll4IhIxjTh854kKWWBYG6mVrhi9HQ+H4JyeBK Yu3ua93bSFuFF+bFo0S05pBsMjqrHoCRPEqPMOeg= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id DD1093858C2F for ; Mon, 7 Nov 2022 16:24:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DD1093858C2F Received: by smtp.gentoo.org (Postfix, from userid 559) id 67C8E341012; Mon, 7 Nov 2022 16:24:32 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 2/5] sim: bpf: drop subdir configure logic Date: Mon, 7 Nov 2022 23:24:23 +0700 Message-Id: <20221107162426.26097-2-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 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 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-Patchwork-Original-From: Mike Frysinger via Gdb-patches From: Mike Frysinger Reply-To: Mike Frysinger Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" We've been using this only to set the default word size to 64. 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 | 32 +- sim/bpf/Makefile.in | 2 + sim/bpf/aclocal.m4 | 16 - sim/bpf/configure | 2932 ------------------------------------------ sim/bpf/configure.ac | 7 - sim/configure | 32 +- sim/configure.ac | 2 +- 7 files changed, 44 insertions(+), 2979 deletions(-) delete mode 100644 sim/bpf/aclocal.m4 delete mode 100755 sim/bpf/configure delete mode 100644 sim/bpf/configure.ac diff --git a/sim/bpf/Makefile.in b/sim/bpf/Makefile.in index 522484235357..3fa3b67f12d2 100644 --- a/sim/bpf/Makefile.in +++ b/sim/bpf/Makefile.in @@ -31,6 +31,8 @@ SIM_OBJS = \ $(BPF_GEN_OBJS) \ $(BPF_HAND_OBJS) +SIM_EXTRA_CFLAGS = -DWITH_TARGET_WORD_BITSIZE=64 + SIM_EXTRA_CLEAN = bpf-clean ## COMMON_POST_CONFIG_FRAG diff --git a/sim/bpf/configure.ac b/sim/bpf/configure.ac deleted file mode 100644 index 87654ec6a919..000000000000 --- a/sim/bpf/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([64]) - -SIM_AC_OUTPUT diff --git a/sim/configure.ac b/sim/configure.ac index 97cea4b6dd8b..c179e636a226 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -129,7 +129,7 @@ if test "${enable_sim}" != no; then SIM_TARGET([arm*-*-*], [arm]) SIM_TARGET([avr*-*-*], [avr]) SIM_TARGET([bfin-*-*], [bfin]) - SIM_TARGET([bpf-*-*], [bpf], [true]) + SIM_TARGET([bpf-*-*], [bpf]) SIM_TARGET([cr16*-*-*], [cr16]) SIM_TARGET([cris-*-* | crisv32-*-*], [cris]) SIM_TARGET([d10v-*-*], [d10v])