| 1 |
commit: 7820020a773084fa68917e28bf9a26b7423ca565 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 29 19:22:20 2019 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 29 19:22:41 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7820020a |
| 7 |
|
| 8 |
sys-devel/gcc: Add patch disabling riscv 32bit ABIs |
| 9 |
|
| 10 |
For more information see |
| 11 |
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90419 |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
| 14 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 15 |
|
| 16 |
sys-devel/gcc/files/gcc-9.1.0-norisc32.patch | 53 ++++++++++++++++++++++++++++ |
| 17 |
sys-devel/gcc/gcc-9.1.0.ebuild | 5 +++ |
| 18 |
2 files changed, 58 insertions(+) |
| 19 |
|
| 20 |
diff --git a/sys-devel/gcc/files/gcc-9.1.0-norisc32.patch b/sys-devel/gcc/files/gcc-9.1.0-norisc32.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..ad0128a0a18 |
| 23 |
--- /dev/null |
| 24 |
+++ b/sys-devel/gcc/files/gcc-9.1.0-norisc32.patch |
| 25 |
@@ -0,0 +1,53 @@ |
| 26 |
+Autogenerated patch disabling the 32bit RISCV support |
| 27 |
+See https://gcc.gnu.org/PR90419 |
| 28 |
+ |
| 29 |
+diff -ruN gcc-9.1.0.orig/gcc/config/riscv/t-linux-multilib gcc-9.1.0/gcc/config/riscv/t-linux-multilib |
| 30 |
+--- gcc-9.1.0.orig/gcc/config/riscv/t-linux-multilib 2017-02-06 22:38:37.000000000 +0100 |
| 31 |
++++ gcc-9.1.0/gcc/config/riscv/t-linux-multilib 2019-05-18 23:04:54.849400774 +0200 |
| 32 |
+@@ -1,40 +1,18 @@ |
| 33 |
+ # This file was generated by multilib-generator with the command: |
| 34 |
+-# ./multilib-generator rv32imac-ilp32-rv32ima,rv32imaf,rv32imafd,rv32imafc,rv32imafdc- rv32imafdc-ilp32d-rv32imafd- rv64imac-lp64-rv64ima,rv64imaf,rv64imafd,rv64imafc,rv64imafdc- rv64imafdc-lp64d-rv64imafd- |
| 35 |
+-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 |
| 36 |
+-MULTILIB_DIRNAMES = rv32imac \ |
| 37 |
+-rv32ima \ |
| 38 |
+-rv32imaf \ |
| 39 |
+-rv32imafd \ |
| 40 |
+-rv32imafc \ |
| 41 |
+-rv32imafdc \ |
| 42 |
+-rv32g \ |
| 43 |
+-rv32gc \ |
| 44 |
+-rv64imac \ |
| 45 |
++# ./multilib-generator rv64imac-lp64-rv64ima,rv64imaf,rv64imafd,rv64imafc,rv64imafdc- rv64imafdc-lp64d-rv64imafd- |
| 46 |
++MULTILIB_OPTIONS = march=rv64imac/march=rv64ima/march=rv64imaf/march=rv64imafd/march=rv64imafc/march=rv64imafdc/march=rv64g/march=rv64gc mabi=lp64/mabi=lp64d |
| 47 |
++MULTILIB_DIRNAMES = rv64imac \ |
| 48 |
+ rv64ima \ |
| 49 |
+ rv64imaf \ |
| 50 |
+ rv64imafd \ |
| 51 |
+ rv64imafc \ |
| 52 |
+ rv64imafdc \ |
| 53 |
+ rv64g \ |
| 54 |
+-rv64gc ilp32 \ |
| 55 |
+-ilp32d \ |
| 56 |
+-lp64 \ |
| 57 |
++rv64gc lp64 \ |
| 58 |
+ lp64d |
| 59 |
+-MULTILIB_REQUIRED = march=rv32imac/mabi=ilp32 \ |
| 60 |
+-march=rv32imafdc/mabi=ilp32d \ |
| 61 |
+-march=rv64imac/mabi=lp64 \ |
| 62 |
++MULTILIB_REQUIRED = march=rv64imac/mabi=lp64 \ |
| 63 |
+ march=rv64imafdc/mabi=lp64d |
| 64 |
+-MULTILIB_REUSE = march.rv32imac/mabi.ilp32=march.rv32ima/mabi.ilp32 \ |
| 65 |
+-march.rv32imac/mabi.ilp32=march.rv32imaf/mabi.ilp32 \ |
| 66 |
+-march.rv32imac/mabi.ilp32=march.rv32imafd/mabi.ilp32 \ |
| 67 |
+-march.rv32imac/mabi.ilp32=march.rv32imafc/mabi.ilp32 \ |
| 68 |
+-march.rv32imac/mabi.ilp32=march.rv32imafdc/mabi.ilp32 \ |
| 69 |
+-march.rv32imac/mabi.ilp32=march.rv32g/mabi.ilp32 \ |
| 70 |
+-march.rv32imac/mabi.ilp32=march.rv32gc/mabi.ilp32 \ |
| 71 |
+-march.rv32imafdc/mabi.ilp32d=march.rv32imafd/mabi.ilp32d \ |
| 72 |
+-march.rv32imafdc/mabi.ilp32d=march.rv32gc/mabi.ilp32d \ |
| 73 |
+-march.rv32imafdc/mabi.ilp32d=march.rv32g/mabi.ilp32d \ |
| 74 |
+-march.rv64imac/mabi.lp64=march.rv64ima/mabi.lp64 \ |
| 75 |
++MULTILIB_REUSE = march.rv64imac/mabi.lp64=march.rv64ima/mabi.lp64 \ |
| 76 |
+ march.rv64imac/mabi.lp64=march.rv64imaf/mabi.lp64 \ |
| 77 |
+ march.rv64imac/mabi.lp64=march.rv64imafd/mabi.lp64 \ |
| 78 |
+ march.rv64imac/mabi.lp64=march.rv64imafc/mabi.lp64 \ |
| 79 |
|
| 80 |
diff --git a/sys-devel/gcc/gcc-9.1.0.ebuild b/sys-devel/gcc/gcc-9.1.0.ebuild |
| 81 |
index fd3f2fb8c72..3653171093c 100644 |
| 82 |
--- a/sys-devel/gcc/gcc-9.1.0.ebuild |
| 83 |
+++ b/sys-devel/gcc/gcc-9.1.0.ebuild |
| 84 |
@@ -17,3 +17,8 @@ DEPEND="${RDEPEND} |
| 85 |
if [[ ${CATEGORY} != cross-* ]] ; then |
| 86 |
PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )" |
| 87 |
fi |
| 88 |
+ |
| 89 |
+src_prepare() { |
| 90 |
+ toolchain_src_prepare |
| 91 |
+ eapply "${FILESDIR}"/gcc-9.1.0-norisc32.patch |
| 92 |
+} |
Archives