Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795055418; b=5Yf5OS+vUU39gyf+183vfX/e3s7c+XS4TqFLpKLRCGJ7Z0yThiLBuhd3Aly/0DvjpZVV YMSlHp6XCpzvRkuXazn780Qbayqrc13Qr5hOnTGLckD9OVpis0mrym/9wY9o+2NYvkznB oQONDRJYTwd057Dlq8u+3FA/tUzYYqAFteH/IcaNNltUXFNo4gD+/zgAPdEuZIkAbZ1+L P5ghqsxjupFqT8mO7LVCZ3yZCnjdDVVgIj9OlWXmkEmaeJuquvMk1tEcH2WpDN54x+Fmr xAwU3bm8wj9GTL+1GnvNVx0UVCv9pyVFuwtb1SVXSUZY+jQCk1JHoVsXGXJf1G4ylBg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795055418; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=dZbSs6bE9aX+iubbimsLxxmkzSyP76UT6gOZgKBLkHk=; b=eFT9arIo4nP+cb1BIZuGpPTF1FkB78/Z138yUtrQA8GhsaHUk56cwTq+7FJfv+mN5MpX 6BPEVZ6XzLHq7w16ZiR2fO6TzCO4GGaMUGQwFdLpcOLh7SXKxftXv6QiKCSLxjALCFiQZ L744+WyBlVb88hgOGG2P8hfEAW77Jdy2vo/Nt5yRNMtyi/Inut1FyMthcXD4fiXBxMNJ4 CsadLaNS5bf72q8jJudJZSZTadYAVbPhLI3IeshZB5KNkVQ6duQVYsR0j6oo5gpVseaOM +mXFdYwBNnjyswZj0LFvhp9EXhTdDU+kn/Jw8QtGXaLh5uPh1ou1P0sQhiGc5VwZGwg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=tl8J8yqt; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 195A3606A32A; Thu, 19 Nov 2026 02:30:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=tl8J8yqt Received: by smtp.kernel.org (Postfix) with ESMTPSA id 788B31F000C7; Thu, 19 Nov 2026 02:30:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795055418; bh=dZbSs6bE9aX+iubbimsLxxmkzSyP76UT6gOZgKBLkHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tl8J8yqtmOa0wmSnp7r6X0quex/F6+ic17wHUWmxrTD4yAQ5YJSeuYH6Ucw98H/L4 xsd4fSAXPF1kox4WcJxv/+wvGYkALYGzCB3R4UdREFCeAzf/wcLxh9Hqdsb4ER144j gmMl+55J0NAD2zh2xJo1CeSIkuNHAmzgL87t54As= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Maciej W. Rozycki" , Chen Linxuan , WangYuli , Chen Linxuan , Thomas Bogendoerfer , Sasha Levin Subject: [PATCH 5.15 1623/2214] MIPS: Only check -msym32 when need-compiler Date: Wed, 18 Nov 2026 15:54:59 +0100 Message-ID: <20261118150116.900735788@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: WangYuli [ Upstream commit 7a8f286c235f5d308208cfdcb025b2a0e0c84742 ] During 'make modules_install', the need-compiler variable is null, so Makefile.compiler isn't included. This results in call cc-option-yn returning nothing and consequently an error is issued: *** CONFIG_CPU_DADDI_WORKAROUNDS unsupported without -msym32. Stop. and the invocation terminated for configurations that set the Kconfig option named. Previously commit a79a404e6c22 ("MIPS: Fix CONFIG_CPU_DADDI_WORKAROUNDS `modules_install' regression") addressed the same issue for GCC versions now supported for Linux compilation, but caused a build error with Clang because it doesn't support '-msym32'. Then commit 18ca63a2e23c ("MIPS: Probe toolchain support of -msym32") fixed the issue with Clang, but reintroduced the 'make modules_install' error listed above. Wrap the handling of the '-msym32' option then with ifdef need-compiler, fixing said error for 'make modules_install'. For more technical details on why need-compiler is null during 'make modules_install' and why no compiler invocation is actually needed at this point, please refer to commit 4fe4a6374c4d ("MIPS: Only fiddle with CHECKFLAGS if need-compiler") and commit 805b2e1d427a ("kbuild: include Makefile.compiler only when compiler is needed"). NB leading 8 spaces rather than tabs required due to `make' syntax. Link: https://lore.kernel.org/all/alpine.DEB.2.21.2502120612000.65342@angie.orcam.me.uk/ Link: https://lore.kernel.org/all/alpine.DEB.2.21.2307180025120.62448@angie.orcam.me.uk/ Fixes: a79a404e6c22 ("MIPS: Fix CONFIG_CPU_DADDI_WORKAROUNDS `modules_install' regression") Reported-by: Maciej W. Rozycki Closes: https://lore.kernel.org/all/alpine.DEB.2.21.2501030535080.49841@angie.orcam.me.uk/ Co-developed-by: Chen Linxuan Signed-off-by: Chen Linxuan Signed-off-by: WangYuli Signed-off-by: Maciej W. Rozycki Reviewed-by: Chen Linxuan Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- arch/mips/Makefile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 8d1b1d7b8e025..20cdff5f457b8 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -272,18 +272,20 @@ drivers-$(CONFIG_PCI) += arch/mips/pci/ # We can always force a build with a 64-bits symbol format by # passing 'KBUILD_SYM32=no' option to the make's command line. # -ifdef CONFIG_64BIT - ifndef KBUILD_SYM32 - ifeq ($(shell expr $(load-y) \< 0xffffffff80000000), 0) - KBUILD_SYM32 = $(call cc-option-yn, -msym32) +ifdef need-compiler + ifdef CONFIG_64BIT + ifndef KBUILD_SYM32 + ifeq ($(shell expr $(load-y) \< 0xffffffff80000000), 0) + KBUILD_SYM32 = $(call cc-option-yn, -msym32) + endif endif - endif - ifeq ($(KBUILD_SYM32), y) - cflags-$(KBUILD_SYM32) += -msym32 -DKBUILD_64BIT_SYM32 - else - ifeq ($(CONFIG_CPU_DADDI_WORKAROUNDS), y) - $(error CONFIG_CPU_DADDI_WORKAROUNDS unsupported without -msym32) + ifeq ($(KBUILD_SYM32), y) + cflags-$(KBUILD_SYM32) += -msym32 -DKBUILD_64BIT_SYM32 + else + ifeq ($(CONFIG_CPU_DADDI_WORKAROUNDS), y) + $(error CONFIG_CPU_DADDI_WORKAROUNDS unsupported without -msym32) + endif endif endif endif -- 2.53.0