1 |
commit: 1331a15b06447dda35cf2b71f557c413d0209eb5 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 1 22:12:37 2019 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 3 21:43:57 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1331a15b |
7 |
|
8 |
sys-devel/gcc: Dont build 32bit ABIs on riscv, not supported by glibc |
9 |
|
10 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
12 |
|
13 |
sys-devel/gcc/files/gcc-8.3.0-norisc32.patch | 27 +++++++++++++++++++++++++++ |
14 |
sys-devel/gcc/gcc-8.3.0-r1.ebuild | 3 ++- |
15 |
2 files changed, 29 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/sys-devel/gcc/files/gcc-8.3.0-norisc32.patch b/sys-devel/gcc/files/gcc-8.3.0-norisc32.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..9315dc44893 |
20 |
--- /dev/null |
21 |
+++ b/sys-devel/gcc/files/gcc-8.3.0-norisc32.patch |
22 |
@@ -0,0 +1,27 @@ |
23 |
+diff -ruN gcc-8.3.0.orig/gcc/config/riscv/t-linux-multilib gcc-8.3.0/gcc/config/riscv/t-linux-multilib |
24 |
+--- gcc-8.3.0.orig/gcc/config/riscv/t-linux-multilib 2017-02-06 22:38:37.000000000 +0100 |
25 |
++++ gcc-8.3.0/gcc/config/riscv/t-linux-multilib 2019-04-28 16:37:44.377841943 +0200 |
26 |
+@@ -20,21 +20,9 @@ |
27 |
+ ilp32d \ |
28 |
+ lp64 \ |
29 |
+ lp64d |
30 |
+-MULTILIB_REQUIRED = march=rv32imac/mabi=ilp32 \ |
31 |
+-march=rv32imafdc/mabi=ilp32d \ |
32 |
+-march=rv64imac/mabi=lp64 \ |
33 |
++MULTILIB_REQUIRED = march=rv64imac/mabi=lp64 \ |
34 |
+ march=rv64imafdc/mabi=lp64d |
35 |
+-MULTILIB_REUSE = march.rv32imac/mabi.ilp32=march.rv32ima/mabi.ilp32 \ |
36 |
+-march.rv32imac/mabi.ilp32=march.rv32imaf/mabi.ilp32 \ |
37 |
+-march.rv32imac/mabi.ilp32=march.rv32imafd/mabi.ilp32 \ |
38 |
+-march.rv32imac/mabi.ilp32=march.rv32imafc/mabi.ilp32 \ |
39 |
+-march.rv32imac/mabi.ilp32=march.rv32imafdc/mabi.ilp32 \ |
40 |
+-march.rv32imac/mabi.ilp32=march.rv32g/mabi.ilp32 \ |
41 |
+-march.rv32imac/mabi.ilp32=march.rv32gc/mabi.ilp32 \ |
42 |
+-march.rv32imafdc/mabi.ilp32d=march.rv32imafd/mabi.ilp32d \ |
43 |
+-march.rv32imafdc/mabi.ilp32d=march.rv32gc/mabi.ilp32d \ |
44 |
+-march.rv32imafdc/mabi.ilp32d=march.rv32g/mabi.ilp32d \ |
45 |
+-march.rv64imac/mabi.lp64=march.rv64ima/mabi.lp64 \ |
46 |
++MULTILIB_REUSE = march.rv64imac/mabi.lp64=march.rv64ima/mabi.lp64 \ |
47 |
+ march.rv64imac/mabi.lp64=march.rv64imaf/mabi.lp64 \ |
48 |
+ march.rv64imac/mabi.lp64=march.rv64imafd/mabi.lp64 \ |
49 |
+ march.rv64imac/mabi.lp64=march.rv64imafc/mabi.lp64 \ |
50 |
|
51 |
diff --git a/sys-devel/gcc/gcc-8.3.0-r1.ebuild b/sys-devel/gcc/gcc-8.3.0-r1.ebuild |
52 |
index 4ccee806e93..26b05fa3555 100644 |
53 |
--- a/sys-devel/gcc/gcc-8.3.0-r1.ebuild |
54 |
+++ b/sys-devel/gcc/gcc-8.3.0-r1.ebuild |
55 |
@@ -7,7 +7,7 @@ PATCH_VER="1.1" |
56 |
|
57 |
inherit toolchain |
58 |
|
59 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" |
60 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" |
61 |
|
62 |
RDEPEND="" |
63 |
DEPEND="${RDEPEND} |
64 |
@@ -21,4 +21,5 @@ fi |
65 |
src_prepare() { |
66 |
toolchain_src_prepare |
67 |
eapply "${FILESDIR}"/gcc-8.3.0-ia64-bootstrap.patch |
68 |
+ eapply "${FILESDIR}"/gcc-8.3.0-norisc32.patch |
69 |
} |