From 1331a15b06447dda35cf2b71f557c413d0209eb5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Thu, 2 May 2019 00:12:37 +0200 Subject: [PATCH] sys-devel/gcc: Dont build 32bit ABIs on riscv, not supported by glibc MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Andreas K. Hüttel --- sys-devel/gcc/files/gcc-8.3.0-norisc32.patch | 27 ++++++++++++++++++++ sys-devel/gcc/gcc-8.3.0-r1.ebuild | 3 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 sys-devel/gcc/files/gcc-8.3.0-norisc32.patch 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 000000000000..9315dc44893c --- /dev/null +++ b/sys-devel/gcc/files/gcc-8.3.0-norisc32.patch @@ -0,0 +1,27 @@ +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 22:38:37.000000000 +0100 ++++ gcc-8.3.0/gcc/config/riscv/t-linux-multilib 2019-04-28 16:37:44.377841943 +0200 +@@ -20,21 +20,9 @@ + 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 \ +-march.rv32imac/mabi.ilp32=march.rv32imafd/mabi.ilp32 \ +-march.rv32imac/mabi.ilp32=march.rv32imafc/mabi.ilp32 \ +-march.rv32imac/mabi.ilp32=march.rv32imafdc/mabi.ilp32 \ +-march.rv32imac/mabi.ilp32=march.rv32g/mabi.ilp32 \ +-march.rv32imac/mabi.ilp32=march.rv32gc/mabi.ilp32 \ +-march.rv32imafdc/mabi.ilp32d=march.rv32imafd/mabi.ilp32d \ +-march.rv32imafdc/mabi.ilp32d=march.rv32gc/mabi.ilp32d \ +-march.rv32imafdc/mabi.ilp32d=march.rv32g/mabi.ilp32d \ +-march.rv64imac/mabi.lp64=march.rv64ima/mabi.lp64 \ ++MULTILIB_REUSE = march.rv64imac/mabi.lp64=march.rv64ima/mabi.lp64 \ + march.rv64imac/mabi.lp64=march.rv64imaf/mabi.lp64 \ + march.rv64imac/mabi.lp64=march.rv64imafd/mabi.lp64 \ + march.rv64imac/mabi.lp64=march.rv64imafc/mabi.lp64 \ diff --git a/sys-devel/gcc/gcc-8.3.0-r1.ebuild b/sys-devel/gcc/gcc-8.3.0-r1.ebuild index 4ccee806e938..26b05fa3555c 100644 --- a/sys-devel/gcc/gcc-8.3.0-r1.ebuild +++ b/sys-devel/gcc/gcc-8.3.0-r1.ebuild @@ -7,7 +7,7 @@ PATCH_VER="1.1" inherit toolchain -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" RDEPEND="" DEPEND="${RDEPEND} @@ -21,4 +21,5 @@ fi src_prepare() { toolchain_src_prepare eapply "${FILESDIR}"/gcc-8.3.0-ia64-bootstrap.patch + eapply "${FILESDIR}"/gcc-8.3.0-norisc32.patch } -- 2.26.2