[gentoo-commits] proj/riscv:master commit in: sys-devel/gcc/, sys-devel/gcc/files/

[gentoo-commits] proj/riscv:master commit in: sys-devel/gcc/, sys-devel/gcc/files/

[Andreas K. Hüttel]

commit:     f9b5d5855dd9c335d24e085efbfeaab87bf60d90
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 12:19:19 2019 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 12:19:19 2019 +0000
URL:        https://gitweb.gentoo.org/proj/riscv.git/commit/?id=f9b5d585

sys-devel/gcc: When building riscv multilib, ignore 32bit abis

These are not supported by glibc, and the headers #error out.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 sys-devel/gcc/files/gcc-8.3.0-norisc32.patch | 14 ++++++++++++++
 sys-devel/gcc/gcc-8.3.0-r1.ebuild            |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/sys-devel/gcc/files/gcc-8.3.0-norisc32.patch b/sys-devel/gcc/files/gcc-8.3.0-norisc32.patch
new file mode 100644
index 0000000..5835107
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-8.3.0-norisc32.patch
@@ -0,0 +1,14 @@
+diff -ruN gcc-8.3.0.orig/gcc/config/riscv/t-linux-multilib gcc-8.3.0/gcc/config/riscv/t-linux-multilib
+--- gcc-8.3.0.orig/gcc/config/riscv/t-linux-multilib	2017-02-06 21:38:37.000000000 -0000
++++ gcc-8.3.0/gcc/config/riscv/t-linux-multilib	2019-04-28 12:16:32.000000000 -0000
+@@ -20,9 +20,7 @@
+ ilp32d \
+ lp64 \
+ lp64d
+-MULTILIB_REQUIRED = march=rv32imac/mabi=ilp32 \
+-march=rv32imafdc/mabi=ilp32d \
+-march=rv64imac/mabi=lp64 \
++MULTILIB_REQUIRED = march=rv64imac/mabi=lp64 \
+ march=rv64imafdc/mabi=lp64d
+ MULTILIB_REUSE = march.rv32imac/mabi.ilp32=march.rv32ima/mabi.ilp32 \
+ march.rv32imac/mabi.ilp32=march.rv32imaf/mabi.ilp32 \

diff --git a/sys-devel/gcc/gcc-8.3.0-r1.ebuild b/sys-devel/gcc/gcc-8.3.0-r1.ebuild
index 5e69f54..66df8b3 100644
--- a/sys-devel/gcc/gcc-8.3.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-8.3.0-r1.ebuild
@@ -14,6 +14,8 @@ DEPEND="${RDEPEND}
 	elibc_glibc? ( >=sys-libs/glibc-2.13 )
 	>=${CATEGORY}/binutils-2.20"
 
+PATCHES=( "${FILESDIR}/${PN}-8.3.0-norisc32.patch" )
+
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
 fi