From: John Baldwin <jhb@FreeBSD.org>
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 [thread overview]
Message-ID: <20210414230259.19234-2-jhb@FreeBSD.org> (raw)
In-Reply-To: <20210414230259.19234-1-jhb@FreeBSD.org>
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 <jhb@FreeBSD.org>
+
+ * 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 <vapier@gentoo.org>
* 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
next prev parent reply other threads:[~2021-04-14 23:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-14 23:02 [PATCH 0/5] Various build fixes for sims John Baldwin
2021-04-14 23:02 ` John Baldwin [this message]
2021-04-14 23:56 ` [PATCH 1/5] sim: Add SIM_EXTRA_CFLAGS after CSEARCH Mike Frysinger via Gdb-patches
2021-04-14 23:02 ` [PATCH 2/5] sim frv: Add a missing return value for frvbf_check_acc_range John Baldwin
2021-04-14 23:54 ` Mike Frysinger via Gdb-patches
2021-11-10 9:33 ` Mike Frysinger via Gdb-patches
2021-04-14 23:02 ` [PATCH 3/5] sim lm32: Use a known-good shell with genmloop.sh John Baldwin
2021-04-14 23:55 ` Mike Frysinger via Gdb-patches
2021-04-14 23:02 ` [PATCH 4/5] sim mn10300: Fix igen generation John Baldwin
2021-04-14 23:53 ` Mike Frysinger via Gdb-patches
2021-04-14 23:02 ` [PATCH 5/5] sim erc32: Add include path for readline John Baldwin
2021-04-14 23:56 ` Mike Frysinger via Gdb-patches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210414230259.19234-2-jhb@FreeBSD.org \
--to=jhb@freebsd.org \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox