From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 52AF42AE7F; Tue, 26 Aug 2025 14:42:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756219368; cv=none; b=QqPI3nxsRfZmLrnz6hoocyYeao8UWB/0GOP8ZOAiLvVOscEpfPxCBoJe43F5KEfo3rOn4C4C5+AzRYdC5GjjCGFJNDfFF4nxi2us9koiBJG/X5S4GM2XaggJ9xGOjWd9uSpVIrRzY1ZR5yuIhWNqhK93D1njxGNCJHRf9+bjiZ8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756219368; c=relaxed/simple; bh=gzwpI30xlvKfkC4UIrN2+yfmzUi+bkMLxtkOaLzezZU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TjMEk4vuR6j1l2OZn1+I0xk4VV2bSmP71/spdTQxu2KOZQrYYBTn3koPf7qSaS0T/bb8I61F2+uEbtjtfYRhcdOZm71l/WwreTiybHHFtX+ryOTOAmT31koc0HlqCw9ujf2pmn6DW0DXb/lqn60I+/3KI/22fG9djqqyeA3sG+U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=N/rxbOTT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="N/rxbOTT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECE66C4CEF1; Tue, 26 Aug 2025 14:42:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756219367; bh=gzwpI30xlvKfkC4UIrN2+yfmzUi+bkMLxtkOaLzezZU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N/rxbOTTJLaVyVzWUzzpBkkbOi1Y0WC6vLRM0Iq0WaMFe5PUFGh3vxPtHuEaet5h2 uVKWM9YgG89XkFEMRQRYriEZSarWY5Z37/l7dnWfykW5Qgk113FcEi8Gb4oI17f0bq +UMj2YSPfrfOg87KdVFWE319kF3x5/a7t5uLrsDU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, KernelCI bot , Masahiro Yamada , Nathan Chancellor , "Russell King (Oracle)" Subject: [PATCH 5.4 323/403] ARM: 9448/1: Use an absolute path to unified.h in KBUILD_AFLAGS Date: Tue, 26 Aug 2025 13:10:49 +0200 Message-ID: <20250826110915.734392377@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110905.607690791@linuxfoundation.org> References: <20250826110905.607690791@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nathan Chancellor commit 87c4e1459e80bf65066f864c762ef4dc932fad4b upstream. After commit d5c8d6e0fa61 ("kbuild: Update assembler calls to use proper flags and language target"), which updated as-instr to use the 'assembler-with-cpp' language option, the Kbuild version of as-instr always fails internally for arch/arm with : fatal error: asm/unified.h: No such file or directory compilation terminated. because '-include' flags are now taken into account by the compiler driver and as-instr does not have '$(LINUXINCLUDE)', so unified.h is not found. This went unnoticed at the time of the Kbuild change because the last use of as-instr in Kbuild that arch/arm could reach was removed in 5.7 by commit 541ad0150ca4 ("arm: Remove 32bit KVM host support") but a stable backport of the Kbuild change to before that point exposed this potential issue if one were to be reintroduced. Follow the general pattern of '-include' paths throughout the tree and make unified.h absolute using '$(srctree)' to ensure KBUILD_AFLAGS can be used independently. Closes: https://lore.kernel.org/CACo-S-1qbCX4WAVFA63dWfHtrRHZBTyyr2js8Lx=Az03XHTTHg@mail.gmail.com/ Cc: stable@vger.kernel.org Fixes: d5c8d6e0fa61 ("kbuild: Update assembler calls to use proper flags and language target") Reported-by: KernelCI bot Reviewed-by: Masahiro Yamada Signed-off-by: Nathan Chancellor Signed-off-by: Russell King (Oracle) [nathan: Fix conflicts] Signed-off-by: Nathan Chancellor Signed-off-by: Greg Kroah-Hartman --- arch/arm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -136,7 +136,7 @@ endif # Need -Uarm for gcc < 3.x KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm -KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float +KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include $(srctree)/arch/arm/include/asm/unified.h -msoft-float CHECKFLAGS += -D__arm__