forked from easybuilders/easybuild-easyconfigs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
patch for adding/fixing RISC-V multiarch support
- Loading branch information
Showing
1 changed file
with
33 additions
and
0 deletions.
There are no files selected for viewing
33 changes: 33 additions & 0 deletions
33
easybuild/easyconfigs/g/GCCcore/GCCcore-12.x_riscv_multiarch_support.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=47f95bc4be4eb14730ab3eaaaf8f6e71fda47690 | ||
https://gcc.gnu.org/PR106271 | ||
|
||
From 47f95bc4be4eb14730ab3eaaaf8f6e71fda47690 Mon Sep 17 00:00:00 2001 | ||
From: Raphael Moreira Zinsly <[email protected]> | ||
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. | ||
--- | ||
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 216d2776a18..a6f64f88d25 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.39.3 |