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 3ADD7152532; Thu, 13 Feb 2025 15:27:51 +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=1739460471; cv=none; b=mFZuHBmgJPWfdZ6/ymrX50swdczi8XgUb/s62uE2tP65nTDj5R+5EtUPf6pItBSAnRXQfwQh8LEIo9YNBMKjoaC1hNOgyTfawFUTixEltpCIJ7+oN7IQ96ud3qCQ8UOs0w0J/HbS/kbVNwO1tffiVzoONBTb/rBFmvOMYdiCgcI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739460471; c=relaxed/simple; bh=MYMhQVICxteBfQCUdY7lO/RcV4ITK/63+XzVjGuL5yU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tYIDuD/e0qVpuCddNl4OB2L7B9J8jB3j8Zd/tlnvgeU9xGiKhcBsmMVnDW132n3ZmgE96BeawQeais8EHRlkHW65qVQ4E/zLRAvdbOIbiMPGGzWnbBQ2DpOVQ/QsioJWLE5HdUG/JLqKKWK1bPz21r+AMmcXGyaG5qZA9ixzT7M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=P2a3aIP4; 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="P2a3aIP4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B5B2C4CEE4; Thu, 13 Feb 2025 15:27:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739460471; bh=MYMhQVICxteBfQCUdY7lO/RcV4ITK/63+XzVjGuL5yU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P2a3aIP4WjZ6MmiytsFNFb6cIU4gbNOrlgnOsNn6geO07iugytjpLvJtoZ1A9hEjF WDvStw5OxyPa4hMyqrrNAxhfIMCuqsU3BxUW5Gko9iqvsYkyzvTCu9jrfTgs+UyHPu p1GkKM6nIOXXeB4WPSFbmviGz16DdE33Euvjq29Q= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kostadin Shishmanov , Jakub Jelinek , Nathan Chancellor , Ard Biesheuvel Subject: [PATCH 6.6 120/273] efi: libstub: Use -std=gnu11 to fix build with GCC 15 Date: Thu, 13 Feb 2025 15:28:12 +0100 Message-ID: <20250213142412.084503497@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250213142407.354217048@linuxfoundation.org> References: <20250213142407.354217048@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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nathan Chancellor commit 8ba14d9f490aef9fd535c04e9e62e1169eb7a055 upstream. GCC 15 changed the default C standard version to C23, which should not have impacted the kernel because it requests the gnu11 standard via '-std=' in the main Makefile. However, the EFI libstub Makefile uses its own set of KBUILD_CFLAGS for x86 without a '-std=' value (i.e., using the default), resulting in errors from the kernel's definitions of bool, true, and false in stddef.h, which are reserved keywords under C23. ./include/linux/stddef.h:11:9: error: expected identifier before ‘false’ 11 | false = 0, ./include/linux/types.h:35:33: error: two or more data types in declaration specifiers 35 | typedef _Bool bool; Set '-std=gnu11' in the x86 cflags to resolve the error and consistently use the same C standard version for the entire kernel. All other architectures reuse KBUILD_CFLAGS from the rest of the kernel, so this issue is not visible for them. Cc: stable@vger.kernel.org Reported-by: Kostadin Shishmanov Closes: https://lore.kernel.org/4OAhbllK7x4QJGpZjkYjtBYNLd_2whHx9oFiuZcGwtVR4hIzvduultkgfAIRZI3vQpZylu7Gl929HaYFRGeMEalWCpeMzCIIhLxxRhq4U-Y=@protonmail.com/ Reported-by: Jakub Jelinek Closes: https://lore.kernel.org/Z4467umXR2PZ0M1H@tucnak/ Signed-off-by: Nathan Chancellor Signed-off-by: Ard Biesheuvel Signed-off-by: Greg Kroah-Hartman --- drivers/firmware/efi/libstub/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile @@ -11,7 +11,7 @@ cflags-y := $(KBUILD_CFLAGS) cflags-$(CONFIG_X86_32) := -march=i386 cflags-$(CONFIG_X86_64) := -mcmodel=small -cflags-$(CONFIG_X86) += -m$(BITS) -D__KERNEL__ \ +cflags-$(CONFIG_X86) += -m$(BITS) -D__KERNEL__ -std=gnu11 \ -fPIC -fno-strict-aliasing -mno-red-zone \ -mno-mmx -mno-sse -fshort-wchar \ -Wno-pointer-sign \