aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2024-02-28 00:28:36 +0000
committerSam James <sam@gentoo.org>2024-02-28 00:29:43 +0000
commitd5e5f9b252f00c9485c34446efc01bdd2eaaa9b1 (patch)
tree28686d0675f0d79abcc72b571df507e62c01cbf5
parent12.3.0: add 77_all_riscv_PR106271-multilib-bootstrap.patch (diff)
downloadgcc-patches-d5e5f9b252f00c9485c34446efc01bdd2eaaa9b1.tar.gz
gcc-patches-d5e5f9b252f00c9485c34446efc01bdd2eaaa9b1.tar.bz2
gcc-patches-d5e5f9b252f00c9485c34446efc01bdd2eaaa9b1.zip
13.2.0: add 91_all_riscv_PR106271-multilib-bootstrap.patch
Fixes prefix bootstrap for riscv. Bug: https://gcc.gnu.org/PR106271 Bug: https://bugs.gentoo.org/890636 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--13.2.0/gentoo/91_all_riscv_PR106271-multilib-bootstrap.patch37
-rw-r--r--13.2.0/gentoo/README.history4
2 files changed, 41 insertions, 0 deletions
diff --git a/13.2.0/gentoo/91_all_riscv_PR106271-multilib-bootstrap.patch b/13.2.0/gentoo/91_all_riscv_PR106271-multilib-bootstrap.patch
new file mode 100644
index 0000000..2d2933f
--- /dev/null
+++ b/13.2.0/gentoo/91_all_riscv_PR106271-multilib-bootstrap.patch
@@ -0,0 +1,37 @@
+https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=47f95bc4be4eb14730ab3eaaaf8f6e71fda47690
+https://gcc.gnu.org/PR106271
+https://bugs.gentoo.org/890636
+
+From 976280d3fbfc5c1315befb36cebf07a6f1f0c518 Mon Sep 17 00:00:00 2001
+From: Raphael Moreira Zinsly <rzinsly@ventanamicro.com>
+Date: Tue, 22 Aug 2023 11:37:04 -0600
+Subject: [PATCH] RISC-V: Add multiarch support on riscv-linux-gnu
+
+This adds multiarch support to the RISC-V port so that bootstraps work with
+Debian out-of-the-box. Without this patch the stage1 compiler is unable to
+find headers/libraries when building the stage1 runtime.
+
+This is functionally (and possibly textually) equivalent to Debian's fix for
+the same problem.
+
+gcc/
+ * config/riscv/t-linux: Add MULTIARCH_DIRNAME.
+
+(cherry picked from commit 47f95bc4be4eb14730ab3eaaaf8f6e71fda47690)
+---
+ gcc/config/riscv/t-linux | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux
+index 216d2776a183..a6f64f88d25c 100644
+--- a/gcc/config/riscv/t-linux
++++ b/gcc/config/riscv/t-linux
+@@ -1,3 +1,5 @@
+ # Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/
+ MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
+ MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
++
++MULTIARCH_DIRNAME := $(call if_multiarch,$(firstword $(subst -, ,$(target)))-linux-gnu)
+--
+2.44.0
+
diff --git a/13.2.0/gentoo/README.history b/13.2.0/gentoo/README.history
index 125a634..3477e53 100644
--- a/13.2.0/gentoo/README.history
+++ b/13.2.0/gentoo/README.history
@@ -1,3 +1,7 @@
+14 28 Feb 2024
+
+ + 91_all_riscv_PR106271-multilib-bootstrap.patch
+
13 12 Feb 2024
- 91_all_PR113258_libstdc-Prefer-posix_memalign-for-aligned-new.patch