| 1 |
commit: f9b5d5855dd9c335d24e085efbfeaab87bf60d90 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 28 12:19:19 2019 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 28 12:19:19 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/riscv.git/commit/?id=f9b5d585 |
| 7 |
|
| 8 |
sys-devel/gcc: When building riscv multilib, ignore 32bit abis |
| 9 |
|
| 10 |
These are not supported by glibc, and the headers #error out. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 13 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-devel/gcc/files/gcc-8.3.0-norisc32.patch | 14 ++++++++++++++ |
| 16 |
sys-devel/gcc/gcc-8.3.0-r1.ebuild | 2 ++ |
| 17 |
2 files changed, 16 insertions(+) |
| 18 |
|
| 19 |
diff --git a/sys-devel/gcc/files/gcc-8.3.0-norisc32.patch b/sys-devel/gcc/files/gcc-8.3.0-norisc32.patch |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..5835107 |
| 22 |
--- /dev/null |
| 23 |
+++ b/sys-devel/gcc/files/gcc-8.3.0-norisc32.patch |
| 24 |
@@ -0,0 +1,14 @@ |
| 25 |
+diff -ruN gcc-8.3.0.orig/gcc/config/riscv/t-linux-multilib gcc-8.3.0/gcc/config/riscv/t-linux-multilib |
| 26 |
+--- gcc-8.3.0.orig/gcc/config/riscv/t-linux-multilib 2017-02-06 21:38:37.000000000 -0000 |
| 27 |
++++ gcc-8.3.0/gcc/config/riscv/t-linux-multilib 2019-04-28 12:16:32.000000000 -0000 |
| 28 |
+@@ -20,9 +20,7 @@ |
| 29 |
+ ilp32d \ |
| 30 |
+ lp64 \ |
| 31 |
+ lp64d |
| 32 |
+-MULTILIB_REQUIRED = march=rv32imac/mabi=ilp32 \ |
| 33 |
+-march=rv32imafdc/mabi=ilp32d \ |
| 34 |
+-march=rv64imac/mabi=lp64 \ |
| 35 |
++MULTILIB_REQUIRED = march=rv64imac/mabi=lp64 \ |
| 36 |
+ march=rv64imafdc/mabi=lp64d |
| 37 |
+ MULTILIB_REUSE = march.rv32imac/mabi.ilp32=march.rv32ima/mabi.ilp32 \ |
| 38 |
+ march.rv32imac/mabi.ilp32=march.rv32imaf/mabi.ilp32 \ |
| 39 |
|
| 40 |
diff --git a/sys-devel/gcc/gcc-8.3.0-r1.ebuild b/sys-devel/gcc/gcc-8.3.0-r1.ebuild |
| 41 |
index 5e69f54..66df8b3 100644 |
| 42 |
--- a/sys-devel/gcc/gcc-8.3.0-r1.ebuild |
| 43 |
+++ b/sys-devel/gcc/gcc-8.3.0-r1.ebuild |
| 44 |
@@ -14,6 +14,8 @@ DEPEND="${RDEPEND} |
| 45 |
elibc_glibc? ( >=sys-libs/glibc-2.13 ) |
| 46 |
>=${CATEGORY}/binutils-2.20" |
| 47 |
|
| 48 |
+PATCHES=( "${FILESDIR}/${PN}-8.3.0-norisc32.patch" ) |
| 49 |
+ |
| 50 |
if [[ ${CATEGORY} != cross-* ]] ; then |
| 51 |
PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )" |
| 52 |
fi |
Archives