From f373ff919da62443ca59681f219b4899e72a6f2f Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 28 Feb 2024 00:27:00 +0000 Subject: 12.3.0: add 77_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 --- .../77_all_riscv_PR106271-multilib-bootstrap.patch | 36 ++++++++++++++++++++++ 12.3.0/gentoo/README.history | 5 +++ 2 files changed, 41 insertions(+) create mode 100644 12.3.0/gentoo/77_all_riscv_PR106271-multilib-bootstrap.patch diff --git a/12.3.0/gentoo/77_all_riscv_PR106271-multilib-bootstrap.patch b/12.3.0/gentoo/77_all_riscv_PR106271-multilib-bootstrap.patch new file mode 100644 index 0000000..a333dc8 --- /dev/null +++ b/12.3.0/gentoo/77_all_riscv_PR106271-multilib-bootstrap.patch @@ -0,0 +1,36 @@ +https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=47f95bc4be4eb14730ab3eaaaf8f6e71fda47690 +https://gcc.gnu.org/PR106271 +https://bugs.gentoo.org/890636 + +From 7cb2eddfcd84d6e4a1bc1b19fa7ace0927db6bbc Mon Sep 17 00:00:00 2001 +From: Raphael Moreira Zinsly +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/12.3.0/gentoo/README.history b/12.3.0/gentoo/README.history index f65edb4..6699fd4 100644 --- a/12.3.0/gentoo/README.history +++ b/12.3.0/gentoo/README.history @@ -1,4 +1,9 @@ +3 28 Feb 2024 + + + 77_all_riscv_PR106271-multilib-bootstrap.patch + 2 29 Apr 2023 + + 76_all_all_PR107087_12_Wstringop-overread-libstdc++-cow-empty.patch 1 28 Apr 2023 -- cgit v1.2.3-65-gdbad