From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id sLkzKvJ0d2CUXgAAWB0awg (envelope-from ) for ; Wed, 14 Apr 2021 19:04:18 -0400 Received: by simark.ca (Postfix, from userid 112) id 90F9F1F108; Wed, 14 Apr 2021 19:04:18 -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.6 required=5.0 tests=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 59A2E1F0FE for ; Wed, 14 Apr 2021 19:04:17 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 878A23848010; Wed, 14 Apr 2021 23:04:16 +0000 (GMT) Received: from mail.baldwin.cx (bigwig.baldwin.cx [66.216.25.90]) by sourceware.org (Postfix) with ESMTPS id 09362385781F for ; Wed, 14 Apr 2021 23:04:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 09362385781F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=FreeBSD.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=jhb@FreeBSD.org Received: from ralph.com (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id 544471A84BB1; Wed, 14 Apr 2021 19:04:09 -0400 (EDT) From: John Baldwin To: gdb-patches@sourceware.org Subject: [PATCH 1/5] sim: Add SIM_EXTRA_CFLAGS after CSEARCH. Date: Wed, 14 Apr 2021 16:02:55 -0700 Message-Id: <20210414230259.19234-2-jhb@FreeBSD.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210414230259.19234-1-jhb@FreeBSD.org> References: <20210414230259.19234-1-jhb@FreeBSD.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.4 (mail.baldwin.cx [0.0.0.0]); Wed, 14 Apr 2021 19:04:09 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.103.1 at mail.baldwin.cx X-Virus-Status: Clean 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: , Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" The bfin sim adds include paths for the SDL libraries. These include paths might include headers for different version of binutils. Move SIM_EXTRA_CFLAGS after CSEARCH to ensure local includes are always preferred to external includes. sim/common/ChangeLog: * Make-common.in (CONFIG_CFLAGS): Remove SIM_EXTRA_CFLAGS. (ALL_CLAGS, COMMON_DEP_CFLAGS): Add SIM_EXTRA_CFLAGS after CSEARCH. --- sim/common/ChangeLog | 6 ++++++ sim/common/Make-common.in | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index dd4391e36d9..d11e5e049a9 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,9 @@ +2021-04-14 John Baldwin + + * Make-common.in (CONFIG_CFLAGS): Remove SIM_EXTRA_CFLAGS. + (ALL_CLAGS, COMMON_DEP_CFLAGS): Add SIM_EXTRA_CFLAGS after + CSEARCH. + 2021-04-12 Mike Frysinger * sim-cpu.c (sim_cpu_alloc_all): Delete 3rd arg. Delete 2nd arg to diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 28f50abb220..709882469e4 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -227,17 +227,16 @@ CONFIG_CFLAGS = \ $(SIM_SCACHE) \ $(SIM_WARN_CFLAGS) \ $(SIM_WERROR_CFLAGS) \ - $(SIM_HARDWARE) \ - $(SIM_EXTRA_CFLAGS) + $(SIM_HARDWARE) CSEARCH = -I. -I$(srcdir) -I../common -I$(srccom) \ -I../../include -I$(srcroot)/include \ -I../../bfd -I$(srcroot)/bfd \ -I../../opcodes -I$(srcroot)/opcodes \ @INCINTL@ -ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(CFLAGS) +ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS) $(CFLAGS) BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(CSEARCH) -COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) +COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS) ZLIB = @zlibdir@ -lz LIBIBERTY_LIB = ../../libiberty/libiberty.a -- 2.30.1