1 files changed, 0 insertions, 137 deletions

diff --git a/meta/recipes-devtools/gcc/gcc-7.3/0038-Fix-various-_FOR_BUILD-and-related-variables.patch b/meta/recipes-devtools/gcc/gcc-7.3/0038-Fix-various-_FOR_BUILD-and-related-variables.patch
deleted file mode 100644
index a226d10d06..0000000000
--- a/meta/recipes-devtools/gcc/gcc-7.3/0038-Fix-various-_FOR_BUILD-and-related-variables.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 6e7f526e71a76aac3d49ba8f1742fe1b359c1060 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 38/47] 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 e34e9555388..a03740f3f9d 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; \
-@@ -169,6 +170,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.
-@@ -186,6 +190,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; \
-@@ -734,6 +739,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 d0fa07005be..953376c658d 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; \
-@@ -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; \
-diff --git a/gcc/Makefile.in b/gcc/Makefile.in
-index 95d21effad3..dbe2bacde50 100644
---- a/gcc/Makefile.in
-+++ b/gcc/Makefile.in
-@@ -795,7 +795,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 6ba391ed068..72ca6e5c535 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -11789,7 +11789,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 8551a412df3..6eefb61dc2b 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -1708,7 +1708,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.12.2
-