| 1 |
commit: 86a2e8f6c4c94b5e483c0788fc0f95f89f1b252c |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 8 04:04:15 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 8 04:04:46 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=86a2e8f6 |
| 7 |
|
| 8 |
*/musl: add some context to patches |
| 9 |
|
| 10 |
Not yet perfect, but an improvement nonetheless. |
| 11 |
|
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
10.3.0/musl/nocross/50_all_libssp_unconditionally.patch | 8 ++++++-- |
| 15 |
11.2.0/musl/25_all_multilib_pure64.patch | 3 +++ |
| 16 |
11.2.0/musl/nocross/50_all_libssp_unconditionally.patch | 8 ++++++-- |
| 17 |
11.3.0/musl/25_all_multilib_pure64.patch | 3 +++ |
| 18 |
11.3.0/musl/nocross/50_all_libssp_unconditionally.patch | 8 ++++++-- |
| 19 |
5 files changed, 24 insertions(+), 6 deletions(-) |
| 20 |
|
| 21 |
diff --git a/10.3.0/musl/nocross/50_all_libssp_unconditionally.patch b/10.3.0/musl/nocross/50_all_libssp_unconditionally.patch |
| 22 |
index fe5c614..7e4c58a 100644 |
| 23 |
--- a/10.3.0/musl/nocross/50_all_libssp_unconditionally.patch |
| 24 |
+++ b/10.3.0/musl/nocross/50_all_libssp_unconditionally.patch |
| 25 |
@@ -1,11 +1,15 @@ |
| 26 |
+https://bugs.gentoo.org/706210 |
| 27 |
+https://bugs.gentoo.org/747346 |
| 28 |
+ |
| 29 |
Author: Timo Teräs <timo.teras@×××.fi> |
| 30 |
|
| 31 |
-Alpine musl package provides libssp_nonshared.a. We link to it unconditionally, |
| 32 |
+"Alpine musl package provides libssp_nonshared.a. We link to it unconditionally, |
| 33 |
as otherwise we get link failures if some objects are -fstack-protector built |
| 34 |
and final link happens with -fno-stack-protector. This seems to be the common |
| 35 |
case when bootstrapping gcc, the piepatches do not seem to fully fix the |
| 36 |
-crosstoolchain and bootstrap sequence wrt. stack-protector flag usage. |
| 37 |
+crosstoolchain and bootstrap sequence wrt. stack-protector flag usage." |
| 38 |
|
| 39 |
+(We do the same in Gentoo.) |
| 40 |
--- gcc-6.1.0/gcc/gcc.c.orig |
| 41 |
+++ gcc-6.1.0/gcc/gcc.c |
| 42 |
@@ -870,8 +870,7 @@ |
| 43 |
|
| 44 |
diff --git a/11.2.0/musl/25_all_multilib_pure64.patch b/11.2.0/musl/25_all_multilib_pure64.patch |
| 45 |
index 19fd5c9..4ff0a25 100644 |
| 46 |
--- a/11.2.0/musl/25_all_multilib_pure64.patch |
| 47 |
+++ b/11.2.0/musl/25_all_multilib_pure64.patch |
| 48 |
@@ -1,3 +1,6 @@ |
| 49 |
+https://bugs.gentoo.org/675954 |
| 50 |
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90077 |
| 51 |
+ |
| 52 |
diff -Naur gcc-9.3.0.orig/gcc/config/aarch64/t-aarch64-linux gcc-9.3.0/gcc/config/aarch64/t-aarch64-linux |
| 53 |
--- gcc-9.3.0.orig/gcc/config/aarch64/t-aarch64-linux 2020-10-05 02:59:12.767988285 -0700 |
| 54 |
+++ gcc-9.3.0/gcc/config/aarch64/t-aarch64-linux 2020-10-05 03:03:32.310816444 -0700 |
| 55 |
|
| 56 |
diff --git a/11.2.0/musl/nocross/50_all_libssp_unconditionally.patch b/11.2.0/musl/nocross/50_all_libssp_unconditionally.patch |
| 57 |
index fe5c614..7e4c58a 100644 |
| 58 |
--- a/11.2.0/musl/nocross/50_all_libssp_unconditionally.patch |
| 59 |
+++ b/11.2.0/musl/nocross/50_all_libssp_unconditionally.patch |
| 60 |
@@ -1,11 +1,15 @@ |
| 61 |
+https://bugs.gentoo.org/706210 |
| 62 |
+https://bugs.gentoo.org/747346 |
| 63 |
+ |
| 64 |
Author: Timo Teräs <timo.teras@×××.fi> |
| 65 |
|
| 66 |
-Alpine musl package provides libssp_nonshared.a. We link to it unconditionally, |
| 67 |
+"Alpine musl package provides libssp_nonshared.a. We link to it unconditionally, |
| 68 |
as otherwise we get link failures if some objects are -fstack-protector built |
| 69 |
and final link happens with -fno-stack-protector. This seems to be the common |
| 70 |
case when bootstrapping gcc, the piepatches do not seem to fully fix the |
| 71 |
-crosstoolchain and bootstrap sequence wrt. stack-protector flag usage. |
| 72 |
+crosstoolchain and bootstrap sequence wrt. stack-protector flag usage." |
| 73 |
|
| 74 |
+(We do the same in Gentoo.) |
| 75 |
--- gcc-6.1.0/gcc/gcc.c.orig |
| 76 |
+++ gcc-6.1.0/gcc/gcc.c |
| 77 |
@@ -870,8 +870,7 @@ |
| 78 |
|
| 79 |
diff --git a/11.3.0/musl/25_all_multilib_pure64.patch b/11.3.0/musl/25_all_multilib_pure64.patch |
| 80 |
index 19fd5c9..4ff0a25 100644 |
| 81 |
--- a/11.3.0/musl/25_all_multilib_pure64.patch |
| 82 |
+++ b/11.3.0/musl/25_all_multilib_pure64.patch |
| 83 |
@@ -1,3 +1,6 @@ |
| 84 |
+https://bugs.gentoo.org/675954 |
| 85 |
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90077 |
| 86 |
+ |
| 87 |
diff -Naur gcc-9.3.0.orig/gcc/config/aarch64/t-aarch64-linux gcc-9.3.0/gcc/config/aarch64/t-aarch64-linux |
| 88 |
--- gcc-9.3.0.orig/gcc/config/aarch64/t-aarch64-linux 2020-10-05 02:59:12.767988285 -0700 |
| 89 |
+++ gcc-9.3.0/gcc/config/aarch64/t-aarch64-linux 2020-10-05 03:03:32.310816444 -0700 |
| 90 |
|
| 91 |
diff --git a/11.3.0/musl/nocross/50_all_libssp_unconditionally.patch b/11.3.0/musl/nocross/50_all_libssp_unconditionally.patch |
| 92 |
index fe5c614..7e4c58a 100644 |
| 93 |
--- a/11.3.0/musl/nocross/50_all_libssp_unconditionally.patch |
| 94 |
+++ b/11.3.0/musl/nocross/50_all_libssp_unconditionally.patch |
| 95 |
@@ -1,11 +1,15 @@ |
| 96 |
+https://bugs.gentoo.org/706210 |
| 97 |
+https://bugs.gentoo.org/747346 |
| 98 |
+ |
| 99 |
Author: Timo Teräs <timo.teras@×××.fi> |
| 100 |
|
| 101 |
-Alpine musl package provides libssp_nonshared.a. We link to it unconditionally, |
| 102 |
+"Alpine musl package provides libssp_nonshared.a. We link to it unconditionally, |
| 103 |
as otherwise we get link failures if some objects are -fstack-protector built |
| 104 |
and final link happens with -fno-stack-protector. This seems to be the common |
| 105 |
case when bootstrapping gcc, the piepatches do not seem to fully fix the |
| 106 |
-crosstoolchain and bootstrap sequence wrt. stack-protector flag usage. |
| 107 |
+crosstoolchain and bootstrap sequence wrt. stack-protector flag usage." |
| 108 |
|
| 109 |
+(We do the same in Gentoo.) |
| 110 |
--- gcc-6.1.0/gcc/gcc.c.orig |
| 111 |
+++ gcc-6.1.0/gcc/gcc.c |
| 112 |
@@ -870,8 +870,7 @@ |
Archives