commit: 7820020a773084fa68917e28bf9a26b7423ca565 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Wed May 29 19:22:20 2019 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Wed May 29 19:22:41 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7820020a
sys-devel/gcc: Add patch disabling riscv 32bit ABIs For more information see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90419 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> sys-devel/gcc/files/gcc-9.1.0-norisc32.patch | 53 ++++++++++++++++++++++++++++ sys-devel/gcc/gcc-9.1.0.ebuild | 5 +++ 2 files changed, 58 insertions(+) diff --git a/sys-devel/gcc/files/gcc-9.1.0-norisc32.patch b/sys-devel/gcc/files/gcc-9.1.0-norisc32.patch new file mode 100644 index 00000000000..ad0128a0a18 --- /dev/null +++ b/sys-devel/gcc/files/gcc-9.1.0-norisc32.patch @@ -0,0 +1,53 @@ +Autogenerated patch disabling the 32bit RISCV support +See https://gcc.gnu.org/PR90419 + +diff -ruN gcc-9.1.0.orig/gcc/config/riscv/t-linux-multilib gcc-9.1.0/gcc/config/riscv/t-linux-multilib +--- gcc-9.1.0.orig/gcc/config/riscv/t-linux-multilib 2017-02-06 22:38:37.000000000 +0100 ++++ gcc-9.1.0/gcc/config/riscv/t-linux-multilib 2019-05-18 23:04:54.849400774 +0200 +@@ -1,40 +1,18 @@ + # This file was generated by multilib-generator with the command: +-# ./multilib-generator rv32imac-ilp32-rv32ima,rv32imaf,rv32imafd,rv32imafc,rv32imafdc- rv32imafdc-ilp32d-rv32imafd- rv64imac-lp64-rv64ima,rv64imaf,rv64imafd,rv64imafc,rv64imafdc- rv64imafdc-lp64d-rv64imafd- +-MULTILIB_OPTIONS = march=rv32imac/march=rv32ima/march=rv32imaf/march=rv32imafd/march=rv32imafc/march=rv32imafdc/march=rv32g/march=rv32gc/march=rv64imac/march=rv64ima/march=rv64imaf/march=rv64imafd/march=rv64imafc/march=rv64imafdc/march=rv64g/march=rv64gc mabi=ilp32/mabi=ilp32d/mabi=lp64/mabi=lp64d +-MULTILIB_DIRNAMES = rv32imac \ +-rv32ima \ +-rv32imaf \ +-rv32imafd \ +-rv32imafc \ +-rv32imafdc \ +-rv32g \ +-rv32gc \ +-rv64imac \ ++# ./multilib-generator rv64imac-lp64-rv64ima,rv64imaf,rv64imafd,rv64imafc,rv64imafdc- rv64imafdc-lp64d-rv64imafd- ++MULTILIB_OPTIONS = march=rv64imac/march=rv64ima/march=rv64imaf/march=rv64imafd/march=rv64imafc/march=rv64imafdc/march=rv64g/march=rv64gc mabi=lp64/mabi=lp64d ++MULTILIB_DIRNAMES = rv64imac \ + rv64ima \ + rv64imaf \ + rv64imafd \ + rv64imafc \ + rv64imafdc \ + rv64g \ +-rv64gc ilp32 \ +-ilp32d \ +-lp64 \ ++rv64gc 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-9.1.0.ebuild b/sys-devel/gcc/gcc-9.1.0.ebuild index fd3f2fb8c72..3653171093c 100644 --- a/sys-devel/gcc/gcc-9.1.0.ebuild +++ b/sys-devel/gcc/gcc-9.1.0.ebuild @@ -17,3 +17,8 @@ DEPEND="${RDEPEND} if [[ ${CATEGORY} != cross-* ]] ; then PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )" fi + +src_prepare() { + toolchain_src_prepare + eapply "${FILESDIR}"/gcc-9.1.0-norisc32.patch +}
