X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=arch%2Friscv%2FMakefile;h=4be02069542894aa3d299bb374b66531338ecaed;hb=b2568eeb961c1bb79ada9c2b90f65f625054adaf;hp=3eb9590a077591af541e79eebe83785e170955bc;hpb=939b7cbc00906b02c6eae6a380ad6c24c7a1e043;p=linux-2.6-microblaze.git

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