aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2021-04-15 16:03:15 -0700
committerJohn Baldwin <jhb@FreeBSD.org>2021-04-15 16:04:55 -0700
commit10737236a0fd768ba207d23f451505c85a35d60e (patch)
tree1adf60771e51b7f58d733dbc20bdeb9e420f81cd
parentc45ecc9d169436937d06491aa2bf175113e2d502 (diff)
downloadgdb-10737236a0fd768ba207d23f451505c85a35d60e.zip
gdb-10737236a0fd768ba207d23f451505c85a35d60e.tar.gz
gdb-10737236a0fd768ba207d23f451505c85a35d60e.tar.bz2
sim: Add SIM_EXTRA_CFLAGS after CSEARCH.
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.
-rw-r--r--sim/common/ChangeLog6
-rw-r--r--sim/common/Make-common.in7
2 files changed, 9 insertions, 4 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index dd4391e..c8782d7 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,9 @@
+2021-04-15 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 28f50ab..7098824 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