Received-SPF: pass (google.com: domain of linux-kernel+bounces-83319-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Tue, 27 Feb 2024 13:30:26 +0000
From: Catalin Marinas <catalin.marinas@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Huacai Chen <chenhuacai@loongson.cn>, Will Deacon <will@kernel.org>,
	Huacai Chen <chenhuacai@kernel.org>,
	Jamie Cunliffe <Jamie.Cunliffe@arm.com>,
	Jinyang He <hejinyang@loongson.cn>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Tiezhu Yang <yangtiezhu@loongson.cn>,
	Youling Tang <tangyouling@loongson.cn>
Subject: Re: linux-next: manual merge of the loongarch tree with the arm64
 tree
Message-ID: <Zd3j8g-eE02M3XCJ@arm.com>
References: <20240227100337.4e9b64c1@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240227100337.4e9b64c1@canb.auug.org.au>

On Tue, Feb 27, 2024 at 10:03:37AM +1100, Stephen Rothwell wrote:
> 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)

Thanks Stephen, it looks fine.

-- 
Catalin