mirror of
https://github.com/Fishwaldo/meta-riscv.git
synced 2025-03-15 19:41:42 +00:00
linux-starfive-dev: Bump to 6.0.0
Drop lld patch, lld has implemented relaxation now in clang 15.x which is default in master meta-clang, therefore this patch is no longer needed Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
b5de81a229
commit
d5628ffd5a
2 changed files with 1 additions and 53 deletions
|
@ -9,12 +9,11 @@ SRCREV = "${AUTOREV}"
|
|||
BRANCH = "visionfive"
|
||||
FORK ?= "starfive-tech"
|
||||
SRC_URI = "git://github.com/${FORK}/linux.git;protocol=https;branch=${BRANCH} \
|
||||
file://0001-riscv-Use-mno-relax-when-using-lld-linker.patch \
|
||||
file://extra.cfg \
|
||||
file://modules.cfg \
|
||||
"
|
||||
|
||||
LINUX_VERSION ?= "5.19.0"
|
||||
LINUX_VERSION ?= "6.0.0"
|
||||
LINUX_VERSION_EXTENSION:append:beaglev-starlight-jh7100 = "-starlight"
|
||||
|
||||
KBUILD_DEFCONFIG:beaglev-starlight-jh7100 = "starfive_jh7100_fedora_defconfig"
|
||||
|
|
|
@ -1,51 +0,0 @@
|
|||
From b49fbbed96b6e5d898377020d6b717a21aad6282 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 14 May 2021 00:23:05 -0700
|
||||
Subject: [PATCH v2] riscv: Use -mno-relax when using lld linker
|
||||
|
||||
lld does not implement the RISCV relaxation optimizations like GNU ld
|
||||
therefore disable it when building with lld, Also pass it to
|
||||
assembler when using external GNU assembler ( LLVM_IAS != 1 ), this
|
||||
ensures that relevant assembler option is also enabled along. if these
|
||||
options are not used then we see following relocations in objects
|
||||
|
||||
0000000000000000 R_RISCV_ALIGN *ABS*+0x0000000000000002
|
||||
|
||||
These are then rejected by lld
|
||||
ld.lld: error: capability.c:(.fixup+0x0): relocation R_RISCV_ALIGN requires unimplemented linker relaxation; recompile with -mno-relax but the .o is already compiled with -mno-relax
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Cc: Paul Walmsley <paul.walmsley@sifive.com>
|
||||
Cc: Palmer Dabbelt <palmer@dabbelt.com>
|
||||
Cc: Albert Ou <aou@eecs.berkeley.edu>
|
||||
Cc: Nathan Chancellor <nathan@kernel.org>
|
||||
Cc: Nick Desaulniers <ndesaulniers@google.com>
|
||||
---
|
||||
v2: Use CONFIG_LD_IS_LLD instead of LLVM check
|
||||
|
||||
arch/riscv/Makefile | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
|
||||
index 3eb9590a0775..4be020695428 100644
|
||||
--- a/arch/riscv/Makefile
|
||||
+++ b/arch/riscv/Makefile
|
||||
@@ -38,6 +38,15 @@ else
|
||||
KBUILD_LDFLAGS += -melf32lriscv
|
||||
endif
|
||||
|
||||
+ifeq ($(CONFIG_LD_IS_LLD),y)
|
||||
+ KBUILD_CFLAGS += -mno-relax
|
||||
+ KBUILD_AFLAGS += -mno-relax
|
||||
+ifneq ($(LLVM_IAS),1)
|
||||
+ KBUILD_CFLAGS += -Wa,-mno-relax
|
||||
+ KBUILD_AFLAGS += -Wa,-mno-relax
|
||||
+endif
|
||||
+endif
|
||||
+
|
||||
# ISA string setting
|
||||
riscv-march-$(CONFIG_ARCH_RV32I) := rv32ima
|
||||
riscv-march-$(CONFIG_ARCH_RV64I) := rv64ima
|
||||
--
|
||||
2.31.1
|
||||
|
Loading…
Add table
Reference in a new issue