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 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