From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway24.websitewelcome.com (gateway24.websitewelcome.com [192.185.51.59]) by sourceware.org (Postfix) with ESMTPS id 110D93957052 for ; Thu, 8 Apr 2021 20:42:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 110D93957052 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway24.websitewelcome.com (Postfix) with ESMTP id 0F27F5DE3C for ; Thu, 8 Apr 2021 15:35:17 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id UbL1lKKQ9MGeEUbL1lr5Yd; Thu, 08 Apr 2021 15:33:15 -0500 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=7sj2zUCvfWplJAc8RTco14GxNNwNJH2MuhD6MzcOIbc=; b=nQHvT4DMRlVhbfWidlJmmNjC4F JW1duFo+IoWA6hyZfLSD6og/0aP6wHXIaWjGa7w1SDidF0tIsyCsnQ2dQIpj9b1psGXYhQH0M+UT4 O+znKd3+HrQoR4YEBwwRcQJ52; Received: from 71-211-182-15.hlrn.qwest.net ([71.211.182.15]:55942 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1lUbL1-000UdK-Hs; Thu, 08 Apr 2021 14:33:15 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 08/10] Define autoconf substitution variables early in Make-common.in Date: Thu, 8 Apr 2021 14:33:10 -0600 Message-Id: <20210408203312.2938165-9-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210408203312.2938165-1-tom@tromey.com> References: <20210408203312.2938165-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.211.182.15 X-Source-L: No X-Exim-ID: 1lUbL1-000UdK-Hs X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-182-15.hlrn.qwest.net (localhost.localdomain) [71.211.182.15]:55942 X-Source-Auth: tom+tromey.com X-Email-Count: 9 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3028.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, RCVD_IN_SBL_CSS, SPF_HELO_PASS, SPF_NEUTRAL, TXREP, URIBL_CSS, URIBL_CSS_A 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: Thu, 08 Apr 2021 20:42:16 -0000 This hoists any autoconf substitution (like "@var@") to a definition early in Make-common.in, and changes the uses to refer to the corresponding Makefile variable. This will make the coming Makefile split a bit simpler. 2021-04-08 Tom Tromey * Make-common.in (DEFS, LIBS, INCINTL, zlibdir) (@PLUGINS_TRUE@LIBDL, LIBINTL, LIBINTL_DEP, CGENDIR): Define early. (CONFIG_CFLAGS, CSEARCH, ZLIB, CONFIG_LIBS): Update. --- sim/common/ChangeLog | 7 +++++++ sim/common/Make-common.in | 21 +++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index c3c5748d061..d76b3a681f6 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -104,6 +104,15 @@ DEPMODE = @CCDEPMODE@ DEPDIR = @DEPDIR@ depcomp = $(SHELL) $(srcroot)/depcomp +DEFS = @DEFS@ +LIBS = @LIBS@ +INCINTL = @INCINTL@ +zlibdir = @zlibdir@ +@PLUGINS_TRUE@LIBDL = @lt_cv_dlopen_libs@ +LIBINTL = @LIBINTL@ +LIBINTL_DEP = @LIBINTL_DEP@ +CGENDIR = @cgendir@ + # Note that these are overridden by GNU make-specific code below if # GNU make is used. The overrides implement dependency tracking. COMPILE.pre = $(CC) $(C_DIALECT) @@ -215,7 +224,7 @@ CGEN_INCLUDE_DEPS = \ ## COMMON_POST_CONFIG_FRAG CONFIG_CFLAGS = \ - @DEFS@ \ + $(DEFS) \ $(SIM_DEFAULT_MODEL) \ $(SIM_ALIGNMENT) \ $(SIM_BITSIZE) \ @@ -233,20 +242,17 @@ CSEARCH = -I. -I$(srcdir) -I../common -I$(srccom) \ -I../../include -I$(srcroot)/include \ -I../../bfd -I$(srcroot)/bfd \ -I../../opcodes -I$(srcroot)/opcodes \ - @INCINTL@ + $(INCINTL) ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(CFLAGS) BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(CSEARCH) COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) -ZLIB = @zlibdir@ -lz +ZLIB = $(zlibdir) -lz LIBIBERTY_LIB = ../../libiberty/libiberty.a BFD_LIB = ../../bfd/libbfd.a -@PLUGINS_TRUE@LIBDL = @lt_cv_dlopen_libs@ OPCODES_LIB = ../../opcodes/libopcodes.a -LIBINTL = @LIBINTL@ -LIBINTL_DEP = @LIBINTL_DEP@ -CONFIG_LIBS = @LIBS@ $(ZLIB) +CONFIG_LIBS = $(LIBS) $(ZLIB) LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB) EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \ $(CONFIG_LIBS) $(SIM_EXTRA_LIBS) $(LIBDL) @@ -544,7 +550,6 @@ stamp-h: config.in config.status # CGEN support -CGENDIR = @cgendir@ CGEN = "`if [ -f ../../guile/libguile/guile ]; then echo ../../guile/libguile/guile; else echo guile ; fi` -l $(CGENDIR)/guile.scm -s" CGENFLAGS = -v CGEN_CPU_DIR = $(CGENDIR)/cpu -- 2.26.2