commit:     66dd69a78553b1905198032c248cd1243579e561
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 28 23:04:42 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Sep 28 23:04:42 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=66dd69a7

4.8.5: don't allow STAGE1_LDFLAGS to leak into next stages.

Noticed as a build failure in gentoo where -no-pie is passed
to STAGE1_LDFLAGS.

It's a backport of upstream patch.

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 4.8.5/gentoo/96_all_stage1-ldflags.patch | 62 ++++++++++++++++++++++++++++++++
 4.8.5/gentoo/README.history              |  2 ++
 2 files changed, 64 insertions(+)

diff --git a/4.8.5/gentoo/96_all_stage1-ldflags.patch 
b/4.8.5/gentoo/96_all_stage1-ldflags.patch
new file mode 100644
index 0000000..5a7e5a5
--- /dev/null
+++ b/4.8.5/gentoo/96_all_stage1-ldflags.patch
@@ -0,0 +1,62 @@
+From 41a4aa66eac45c8862a79351647ec06dd03bd1f5 Mon Sep 17 00:00:00 2001
+From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Sat, 13 Dec 2014 11:24:37 +0000
+Subject: [PATCH]       PR bootstrap/64023      * Makefile.tpl
+ (EXTRA_TARGET_FLAGS): Set STAGE1_LDFLAGS      to POSTSTAGE1_LDFLAGS and
+ STAGE1_LIBS to POSTSTAGE1_LIBS.       Add -B to libstdc++-v3/src/.libs and
+ libstdc++-v3/libsupc++/.libs  to CXX.         * Makefile.in: Regenerated.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218705 
138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ ChangeLog    | 9 +++++++++
+ Makefile.in  | 6 +++++-
+ Makefile.tpl | 6 +++++-
+ 3 files changed, 19 insertions(+), 2 deletions(-)
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -835,7 +835,9 @@ EXTRA_TARGET_FLAGS = \
+       'AS=$(COMPILER_AS_FOR_TARGET)' \
+       'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+       'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
+-      'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
++      'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
++       -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
++       $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+       'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
+       'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
+       'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+@@ -853,6 +855,8 @@ EXTRA_TARGET_FLAGS = \
+       'WINDRES=$$(WINDRES_FOR_TARGET)' \
+       'WINDMC=$$(WINDMC_FOR_TARGET)' \
+       'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
++      'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
++      'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
+       "TFLAGS=$$TFLAGS"
+ 
+ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
+--- a/Makefile.tpl
++++ b/Makefile.tpl
+@@ -641,7 +641,9 @@ EXTRA_TARGET_FLAGS = \
+       'AS=$(COMPILER_AS_FOR_TARGET)' \
+       'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+       'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
+-      'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
++      'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
++       -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
++       $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+       'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
+       'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
+       'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+@@ -659,6 +661,8 @@ EXTRA_TARGET_FLAGS = \
+       'WINDRES=$$(WINDRES_FOR_TARGET)' \
+       'WINDMC=$$(WINDMC_FOR_TARGET)' \
+       'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
++      'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
++      'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
+       "TFLAGS=$$TFLAGS"
+ 
+ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
+-- 
+2.19.0
+

diff --git a/4.8.5/gentoo/README.history b/4.8.5/gentoo/README.history
index be9a4bb..099ec69 100644
--- a/4.8.5/gentoo/README.history
+++ b/4.8.5/gentoo/README.history
@@ -1,3 +1,5 @@
+1.5            TODO
+       + 96_all_stage1-ldflags.patch
 1.4            23 Sep 2018
        U 09_all_default-ssp.patch
        + 34_all_libjava-classpath-locale-sort.patch

Reply via email to