1 files changed, 137 insertions, 0 deletions

diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0028-Fix-various-_FOR_BUILD-and-related-variables.patch b/meta/recipes-devtools/gcc/gcc-9.1/0028-Fix-various-_FOR_BUILD-and-related-variables.patch
new file mode 100644
index 0000000000..bdcbd323cb
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-9.1/0028-Fix-various-_FOR_BUILD-and-related-variables.patch
@@ -0,0 +1,137 @@
+From 16ab14b7221b3491cd43ab745f57b60ca83089df Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 7 Dec 2015 23:42:45 +0000
+Subject: [PATCH 28/37] Fix various _FOR_BUILD and related variables
+
+When doing a FOR_BUILD thing, you have to override CFLAGS with
+CFLAGS_FOR_BUILD. And if you use C++, you also have to override
+CXXFLAGS with CXXFLAGS_FOR_BUILD.
+Without this, when building for mingw, you end up trying to use
+the mingw headers for a host build.
+
+The same goes for other variables as well, such as CPPFLAGS,
+CPP, and GMPINC.
+
+Upstream-Status: Pending
+
+Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile.in      | 6 ++++++
+ Makefile.tpl     | 5 +++++
+ gcc/Makefile.in  | 2 +-
+ gcc/configure    | 2 +-
+ gcc/configure.ac | 2 +-
+ 5 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index b21e0791f55..0e573791202 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -152,6 +152,7 @@ BUILD_EXPORTS = \
+        CPP="$(CC_FOR_BUILD) -E"; export CPP; \
+        CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
+        CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
++       CPPFLAGS="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS; \
+        CXX="$(CXX_FOR_BUILD)"; export CXX; \
+        CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
+        GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
+@@ -171,6 +172,9 @@ BUILD_EXPORTS = \
+ # built for the build system to override those in BASE_FLAGS_TO_PASS.
+ EXTRA_BUILD_FLAGS = \
+        CFLAGS="$(CFLAGS_FOR_BUILD)" \
++       CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
++       CPP="$(CC_FOR_BUILD) -E" \
++       CPPFLAGS="$(CPPFLAGS_FOR_BUILD)" \
+        LDFLAGS="$(LDFLAGS_FOR_BUILD)"
+ 
+ # This is the list of directories to built for the host system.
+@@ -188,6 +192,7 @@ HOST_SUBDIR = @host_subdir@
+ HOST_EXPORTS = \
+        $(BASE_EXPORTS) \
+        CC="$(CC)"; export CC; \
++       CPP="$(CC) -E"; export CPP; \
+        ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
+        CFLAGS="$(CFLAGS)"; export CFLAGS; \
+        CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+@@ -775,6 +780,7 @@ BASE_FLAGS_TO_PASS = \
+        "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+        "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+        "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
++       "CXXFLAGS_FOR_BUILD=$(CXXFLAGS_FOR_BUILD)" \
+        "EXPECT=$(EXPECT)" \
+        "FLEX=$(FLEX)" \
+        "INSTALL=$(INSTALL)" \
+diff --git a/Makefile.tpl b/Makefile.tpl
+index 126296fb49a..15fb236bcc0 100644
+--- a/Makefile.tpl
++++ b/Makefile.tpl
+@@ -154,6 +154,7 @@ BUILD_EXPORTS = \
+        CC="$(CC_FOR_BUILD)"; export CC; \
+        CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
+        CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
++       CPPFLAGS="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS; \
+        CXX="$(CXX_FOR_BUILD)"; export CXX; \
+        CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
+        GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
+@@ -173,6 +174,9 @@ BUILD_EXPORTS = \
+ # built for the build system to override those in BASE_FLAGS_TO_PASS.
+ EXTRA_BUILD_FLAGS = \
+        CFLAGS="$(CFLAGS_FOR_BUILD)" \
++       CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
++       CPP="$(CC_FOR_BUILD) -E" \
++       CPPFLAGS="$(CPPFLAGS_FOR_BUILD)" \
+        LDFLAGS="$(LDFLAGS_FOR_BUILD)"
+ 
+ # This is the list of directories to built for the host system.
+@@ -190,6 +194,7 @@ HOST_SUBDIR = @host_subdir@
+ HOST_EXPORTS = \
+        $(BASE_EXPORTS) \
+        CC="$(CC)"; export CC; \
++       CPP="$(CC) -E"; export CPP; \
+        ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
+        CFLAGS="$(CFLAGS)"; export CFLAGS; \
+        CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index eb1dc304de2..93a43146846 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -805,7 +805,7 @@ BUILD_LDFLAGS=@BUILD_LDFLAGS@
+ BUILD_NO_PIE_FLAG = @BUILD_NO_PIE_FLAG@
+ BUILD_LDFLAGS += $(BUILD_NO_PIE_FLAG)
+ BUILD_CPPFLAGS= -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
+-               -I$(srcdir)/../include @INCINTL@ $(CPPINC) $(CPPFLAGS)
++               -I$(srcdir)/../include @INCINTL@ $(CPPINC) $(CPPFLAGS_FOR_BUILD)
+ 
+ # Actual name to use when installing a native compiler.
+ GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
+diff --git a/gcc/configure b/gcc/configure
+index 2e822caf66d..2c50676a2bf 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -11965,7 +11965,7 @@ else
+        CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
+        CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \
+        LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \
+-       GMPINC="" CPPFLAGS="${CPPFLAGS} -DGENERATOR_FILE" \
++       GMPINC="" CPPFLAGS="${CPPFLAGS_FOR_BUILD} -DGENERATOR_FILE" \
+        ${realsrcdir}/configure \
+                --enable-languages=${enable_languages-all} \
+                --target=$target_alias --host=$build_alias --build=$build_alias
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 70e7bac78c4..d29eb580429 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -1743,7 +1743,7 @@ else
+        CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
+        CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \
+        LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \
+-       GMPINC="" CPPFLAGS="${CPPFLAGS} -DGENERATOR_FILE" \
++       GMPINC="" CPPFLAGS="${CPPFLAGS_FOR_BUILD} -DGENERATOR_FILE" \
+        ${realsrcdir}/configure \
+                --enable-languages=${enable_languages-all} \
+                --target=$target_alias --host=$build_alias --build=$build_alias
+-- 
+2.20.1
+