1 |
commit: 66dd69a78553b1905198032c248cd1243579e561 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 28 23:04:42 2018 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 28 23:04:42 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=66dd69a7 |
7 |
|
8 |
4.8.5: don't allow STAGE1_LDFLAGS to leak into next stages. |
9 |
|
10 |
Noticed as a build failure in gentoo where -no-pie is passed |
11 |
to STAGE1_LDFLAGS. |
12 |
|
13 |
It's a backport of upstream patch. |
14 |
|
15 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
16 |
|
17 |
4.8.5/gentoo/96_all_stage1-ldflags.patch | 62 ++++++++++++++++++++++++++++++++ |
18 |
4.8.5/gentoo/README.history | 2 ++ |
19 |
2 files changed, 64 insertions(+) |
20 |
|
21 |
diff --git a/4.8.5/gentoo/96_all_stage1-ldflags.patch b/4.8.5/gentoo/96_all_stage1-ldflags.patch |
22 |
new file mode 100644 |
23 |
index 0000000..5a7e5a5 |
24 |
--- /dev/null |
25 |
+++ b/4.8.5/gentoo/96_all_stage1-ldflags.patch |
26 |
@@ -0,0 +1,62 @@ |
27 |
+From 41a4aa66eac45c8862a79351647ec06dd03bd1f5 Mon Sep 17 00:00:00 2001 |
28 |
+From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> |
29 |
+Date: Sat, 13 Dec 2014 11:24:37 +0000 |
30 |
+Subject: [PATCH] PR bootstrap/64023 * Makefile.tpl |
31 |
+ (EXTRA_TARGET_FLAGS): Set STAGE1_LDFLAGS to POSTSTAGE1_LDFLAGS and |
32 |
+ STAGE1_LIBS to POSTSTAGE1_LIBS. Add -B to libstdc++-v3/src/.libs and |
33 |
+ libstdc++-v3/libsupc++/.libs to CXX. * Makefile.in: Regenerated. |
34 |
+ |
35 |
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218705 138bc75d-0d04-0410-961f-82ee72b054a4 |
36 |
+--- |
37 |
+ ChangeLog | 9 +++++++++ |
38 |
+ Makefile.in | 6 +++++- |
39 |
+ Makefile.tpl | 6 +++++- |
40 |
+ 3 files changed, 19 insertions(+), 2 deletions(-) |
41 |
+ |
42 |
+--- a/Makefile.in |
43 |
++++ b/Makefile.in |
44 |
+@@ -835,7 +835,9 @@ EXTRA_TARGET_FLAGS = \ |
45 |
+ 'AS=$(COMPILER_AS_FOR_TARGET)' \ |
46 |
+ 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ |
47 |
+ 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ |
48 |
+- 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ |
49 |
++ 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ |
50 |
++ -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ |
51 |
++ $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ |
52 |
+ 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ |
53 |
+ 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ |
54 |
+ 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ |
55 |
+@@ -853,6 +855,8 @@ EXTRA_TARGET_FLAGS = \ |
56 |
+ 'WINDRES=$$(WINDRES_FOR_TARGET)' \ |
57 |
+ 'WINDMC=$$(WINDMC_FOR_TARGET)' \ |
58 |
+ 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \ |
59 |
++ 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \ |
60 |
++ 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \ |
61 |
+ "TFLAGS=$$TFLAGS" |
62 |
+ |
63 |
+ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) |
64 |
+--- a/Makefile.tpl |
65 |
++++ b/Makefile.tpl |
66 |
+@@ -641,7 +641,9 @@ EXTRA_TARGET_FLAGS = \ |
67 |
+ 'AS=$(COMPILER_AS_FOR_TARGET)' \ |
68 |
+ 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ |
69 |
+ 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ |
70 |
+- 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ |
71 |
++ 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ |
72 |
++ -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ |
73 |
++ $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ |
74 |
+ 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ |
75 |
+ 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ |
76 |
+ 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ |
77 |
+@@ -659,6 +661,8 @@ EXTRA_TARGET_FLAGS = \ |
78 |
+ 'WINDRES=$$(WINDRES_FOR_TARGET)' \ |
79 |
+ 'WINDMC=$$(WINDMC_FOR_TARGET)' \ |
80 |
+ 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \ |
81 |
++ 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \ |
82 |
++ 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \ |
83 |
+ "TFLAGS=$$TFLAGS" |
84 |
+ |
85 |
+ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) |
86 |
+-- |
87 |
+2.19.0 |
88 |
+ |
89 |
|
90 |
diff --git a/4.8.5/gentoo/README.history b/4.8.5/gentoo/README.history |
91 |
index be9a4bb..099ec69 100644 |
92 |
--- a/4.8.5/gentoo/README.history |
93 |
+++ b/4.8.5/gentoo/README.history |
94 |
@@ -1,3 +1,5 @@ |
95 |
+1.5 TODO |
96 |
+ + 96_all_stage1-ldflags.patch |
97 |
1.4 23 Sep 2018 |
98 |
U 09_all_default-ssp.patch |
99 |
+ 34_all_libjava-classpath-locale-sort.patch |