Skip to contentSkip to conversation

linux-next: manual merge of the loongarch tree with the arm64 tree

DISCUSSION Stephen Rothwell 2 participants 2 messages Feb 26, 2024 – Feb 27, 2024 Linux-next tree

lore
Share & tools
lore
#0 lore raw

Hi all,

Today's linux-next merge of the loongarch tree got a conflict in:

arch/loongarch/Makefile

between commit:

f82811e22b48 ("rust: Refactor the build target to allow the use of builtin targets")

from the arm64 tree and commit:

58aeb61a338e ("LoongArch: Add ORC stack unwinder support")

from the loongarch tree.

I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.

Signature · 24 lines
Cheers,
Stephen Rothwell

diff --cc arch/loongarch/Makefile
index fa4fb09909ae,e3bc02fb7fdc..000000000000
--- a/arch/loongarch/Makefile
+++ b/arch/loongarch/Makefile
@@@ -82,7 -92,15 +92,16 @@@ KBUILD_AFLAGS_MODULE		+= -Wa,-mla-globa
  KBUILD_CFLAGS_MODULE		+= -fplt -Wa,-mla-global-with-abs,-mla-local-with-abs
  endif
  
+ KBUILD_AFLAGS			+= $(call cc-option,-mno-relax) $(call cc-option,-Wa$(comma)-mno-relax)
+ KBUILD_CFLAGS			+= $(call cc-option,-mno-relax) $(call cc-option,-Wa$(comma)-mno-relax)
+ KBUILD_AFLAGS			+= $(call cc-option,-mthin-add-sub) $(call cc-option,-Wa$(comma)-mthin-add-sub)
+ KBUILD_CFLAGS			+= $(call cc-option,-mthin-add-sub) $(call cc-option,-Wa$(comma)-mthin-add-sub)
+ 
+ ifdef CONFIG_OBJTOOL
+ KBUILD_CFLAGS			+= -fno-jump-tables
+ endif
+ 
 +KBUILD_RUSTFLAGS			+= --target=$(objtree)/scripts/target.json
  KBUILD_RUSTFLAGS_MODULE		+= -Crelocation-model=pic
  
  ifeq ($(CONFIG_RELOCATABLE),y)
#1 lore raw
Quoted 11 lines · Stephen Rothwell
arch/loongarch/Makefile +3 -0
diff --cc arch/loongarch/Makefile
index fa4fb09909ae,e3bc02fb7fdc..000000000000
@@@ -82,7 -92,15 +92,16 @@@ KBUILD_AFLAGS_MODULE		+= -Wa,-mla-globa
  KBUILD_CFLAGS_MODULE		+= -fplt -Wa,-mla-global-with-abs,-mla-local-with-abs
  endif
 
+ KBUILD_AFLAGS			+= $(call cc-option,-mno-relax) $(call cc-option,-Wa$(comma)-mno-relax)
+ KBUILD_CFLAGS			+= $(call cc-option,-mno-relax) $(call cc-option,-Wa$(comma)-mno-relax)
+ KBUILD_AFLAGS			+= $(call cc-option,-mthin-add-sub) $(call cc-option,-Wa$(comma)-mthin-add-sub)

arch/loongarch/Makefile

Quoted 10 lines
arch/loongarch/Makefile +6 -0
+ KBUILD_CFLAGS			+= $(call cc-option,-mthin-add-sub) $(call cc-option,-Wa$(comma)-mthin-add-sub)
+ 
+ ifdef CONFIG_OBJTOOL
+ KBUILD_CFLAGS			+= -fno-jump-tables
+ endif
+ 
 +KBUILD_RUSTFLAGS			+= --target=$(objtree)/scripts/target.json
  KBUILD_RUSTFLAGS_MODULE		+= -Crelocation-model=pic
 
  ifeq ($(CONFIG_RELOCATABLE),y)

Thanks Stephen, it looks fine.

Signature · 1 line
Catalin