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.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index dd4391e36d911465e61b345ed1a279bb0c70a0f1..c8782d7c34b2a61d03fe854c7f65d2790ea252aa 100644 (file)
--- 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 28f50abb22053c39c67f818b69dbc025736d3faf..709882469e41fbc7666c18667fd9769709536f4f 100644 (file)
--- 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