1 |
commit: 09baa54449dcda1e6f26777015e80de19fd3cc2d |
2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 8 03:47:07 2020 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 8 03:47:07 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=09baa544 |
7 |
|
8 |
sys-devel/gcc: bump up to 10.1.0 |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
12 |
|
13 |
sys-devel/gcc/Manifest | 2 ++ |
14 |
sys-devel/gcc/files/10.1.0/cpu_indicator.patch | 46 ++++++++++++++++++++++++++ |
15 |
sys-devel/gcc/gcc-10.1.0.ebuild | 27 +++++++++++++++ |
16 |
3 files changed, 75 insertions(+) |
17 |
|
18 |
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest |
19 |
index d4de0ae..798807f 100644 |
20 |
--- a/sys-devel/gcc/Manifest |
21 |
+++ b/sys-devel/gcc/Manifest |
22 |
@@ -1,2 +1,4 @@ |
23 |
+DIST gcc-10.1.0-patches-1.tar.bz2 13432 BLAKE2B 2f0517778eb012288ae305a91f84eb31a5f08f842c504201f1a8085afd42ed4c9b4a5b15f7553982c926735e8ea57307a1749004e679880ef47abad7d4596115 SHA512 cc513d8b68dcf484d37c51961c809fc6c470a8341f068b4029430ca4677e7b49155c3d964b3b9ab50c69835b32db98bcb9a91f14de14417e4611521059192118 |
24 |
+DIST gcc-10.1.0.tar.xz 74591240 BLAKE2B d64cf01beaaff7af9e7d5b1d5e6fdfb37cce5667b4455c1c9bbfd190e631f03555d63d52d31e7be5ac232256be11058f89d5bc7d0dcb01de44e90a52645ad87f SHA512 0cb2a74c793face751f42bc580960b00e2bfea785872a0a2155f1f1dbfaa248f9591b67f4322db0f096f8844aca9243bc02732bda106c3b6e43b02bb67eb3096 |
25 |
DIST gcc-9.3.0-patches-2.tar.bz2 13230 BLAKE2B d37859c753864be2c4b8c98847f6e51d9c2b1c091304971c31cf680d6f2194131bac3dfd625077117ca452d6f4416e72c7892d19ccc5880eac7a6bcbe5b2a286 SHA512 c5f7c9d4350879e5ca61e97897e37e4cfea56d0c961aad8df09041e6b1fededad0d7ed89387836d0779b947bdfe7696009d5c61c73630c45f09ca1f3ec3b163c |
26 |
DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de |
27 |
|
28 |
diff --git a/sys-devel/gcc/files/10.1.0/cpu_indicator.patch b/sys-devel/gcc/files/10.1.0/cpu_indicator.patch |
29 |
new file mode 100644 |
30 |
index 0000000..6141a83 |
31 |
--- /dev/null |
32 |
+++ b/sys-devel/gcc/files/10.1.0/cpu_indicator.patch |
33 |
@@ -0,0 +1,46 @@ |
34 |
+From d16a8ceb1c3c8a7ec381090b4c316ff4c55661c0 Mon Sep 17 00:00:00 2001 |
35 |
+From: |
36 |
+Date: Thu, 7 May 2020 21:14:11 -0500 |
37 |
+Subject: [PATCH] convert "__cpu_indicator_init" to |
38 |
+ "__cpu_indicator_init_local" |
39 |
+ |
40 |
+--- |
41 |
+ gcc/config/i386/i386-expand.c | 4 ++-- |
42 |
+ libgcc/config/i386/cpuinfo.c | 6 +++--- |
43 |
+ 2 files changed, 5 insertions(+), 5 deletions(-) |
44 |
+ |
45 |
+diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c |
46 |
+index 48f00c5fc..78650b202 100644 |
47 |
+--- a/gcc/config/i386/i386-expand.c |
48 |
++++ b/gcc/config/i386/i386-expand.c |
49 |
+@@ -10941,10 +10941,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, |
50 |
+ { |
51 |
+ case IX86_BUILTIN_CPU_INIT: |
52 |
+ { |
53 |
+- /* Make it call __cpu_indicator_init in libgcc. */ |
54 |
++ /* Make it call __cpu_indicator_init_local in libgcc. */ |
55 |
+ tree call_expr, fndecl, type; |
56 |
+ type = build_function_type_list (integer_type_node, NULL_TREE); |
57 |
+- fndecl = build_fn_decl ("__cpu_indicator_init", type); |
58 |
++ fndecl = build_fn_decl ("__cpu_indicator_init_local", type); |
59 |
+ call_expr = build_call_expr (fndecl, 0); |
60 |
+ return expand_expr (call_expr, target, mode, EXPAND_NORMAL); |
61 |
+ } |
62 |
+diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c |
63 |
+index 00322c586..f42bbb8af 100644 |
64 |
+--- a/libgcc/config/i386/cpuinfo.c |
65 |
++++ b/libgcc/config/i386/cpuinfo.c |
66 |
+@@ -508,7 +508,7 @@ __cpu_indicator_init (void) |
67 |
+ return 0; |
68 |
+ } |
69 |
+ |
70 |
+-#if defined SHARED && defined USE_ELF_SYMVER |
71 |
+-__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0"); |
72 |
+-__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0"); |
73 |
++#ifndef SHARED |
74 |
++int __cpu_indicator_init_local (void) |
75 |
++ __attribute__ ((weak, alias ("__cpu_indicator_init"))); |
76 |
+ #endif |
77 |
+-- |
78 |
+2.26.2 |
79 |
+ |
80 |
|
81 |
diff --git a/sys-devel/gcc/gcc-10.1.0.ebuild b/sys-devel/gcc/gcc-10.1.0.ebuild |
82 |
new file mode 100644 |
83 |
index 0000000..2212fc4 |
84 |
--- /dev/null |
85 |
+++ b/sys-devel/gcc/gcc-10.1.0.ebuild |
86 |
@@ -0,0 +1,27 @@ |
87 |
+# Copyright 1999-2020 Gentoo Authors |
88 |
+# Distributed under the terms of the GNU General Public License v2 |
89 |
+ |
90 |
+EAPI="7" |
91 |
+ |
92 |
+PATCH_VER="1" |
93 |
+ |
94 |
+inherit toolchain |
95 |
+ |
96 |
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" |
97 |
+ |
98 |
+RDEPEND="" |
99 |
+DEPEND=">=${CATEGORY}/binutils-2.20" |
100 |
+ |
101 |
+src_prepare() { |
102 |
+ toolchain_src_prepare |
103 |
+ |
104 |
+ if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then |
105 |
+ eapply "${FILESDIR}"/10.1.0/cpu_indicator.patch |
106 |
+ eapply "${FILESDIR}"/7.1.0/posix_memalign.patch |
107 |
+ case $(tc-arch) in |
108 |
+ amd64|arm64|ppc64) eapply "${FILESDIR}"/8.3.0/gcc-pure64.patch ;; |
109 |
+ esac |
110 |
+ fi |
111 |
+ |
112 |
+ eapply_user |
113 |
+} |