Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 D7AC2248191 for ; Mon, 23 Jun 2025 13:55:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750686902; cv=none; b=p8AtI+XboctLweSLVhFFpJVW45EyLtYE01Kqxnx3wNHJ8C+uxdNc7WpSBNBde8eL+4iG2p3SWiidsB/pQz0ohLTpATFkC9drCYF9w7pFB4YfV/8XWIAraFb7nUsUmGR4po6Tz4gUUIi7ZSFRg/jxTyFHrughAeMzo8toJj7Rt50= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750686902; c=relaxed/simple; bh=RcQ5DNWlVjg7CLphIWxzcSLDr18b2aUdJVRuqEArGsw=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=Yz+E1fCgIeyHzVOzmo9CWc1huj6hRs4bRWOv6VeVEYMHhpl+BOgg0202LgOm7pMkftA30CXb7dV5UV4wYNxOASMcBFbzmEHm1m96javGpJQsZiX7e8puyg+npvDcwglTktmgxJXn7t24MR7AgQeoabckmuOwzimCpmTremAkAKA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=Er+EQ51C; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="Er+EQ51C" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55NA7Jtu017454 for ; Mon, 23 Jun 2025 13:55:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h= content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=pp1; bh=F8fuu8Br3ZYo72Q2/Sa0Rht8hZmE6zGuUK3veIutH N4=; b=Er+EQ51ClRNrOIxdrf5haoKSkWM6gGJi3OhVavzdwy6wc6+y5Sif2JSyt DmveL94Ha8XvFfCEU7DMXm4tn4U7gNNQD2cgI25kGEpbUaalyXqM1aPhUpEBYLDj LcTwb97szfMx7/nOKx6Di6kOVCxmxfmBKrBOO1Kv2BWHaKeYno1n78L5RSqOMns1 iAEbE+/ft9uEGY5AAcwtZYFFKeAo4yIq0bLJcMd5bhxjpJGx4abTvBP2WXRIdmK2 dbGORZ9pVu6+qmntlSXozJGbd2rZ8zK7ca6Md/8Mo6BVUlPBSMWZRWhPzVw3DL2I K+vl4r6tIBawTus8o8Iz7NLL87k4Q== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 47dmfe2dtp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 23 Jun 2025 13:54:59 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 55NDK4iV015025 for ; Mon, 23 Jun 2025 13:54:59 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 47e72tf7hk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 23 Jun 2025 13:54:58 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 55NDsvCO22085896 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 23 Jun 2025 13:54:57 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3F41C20043 for ; Mon, 23 Jun 2025 13:54:57 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2628620040 for ; Mon, 23 Jun 2025 13:54:57 +0000 (GMT) Received: from tuxmaker.lnxne.boe (unknown [9.152.85.9]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTP for ; Mon, 23 Jun 2025 13:54:57 +0000 (GMT) From: Heiko Carstens To: stable@vger.kernel.org Subject: [PATCH 5.4.y] s390: Add '-std=gnu11' to decompressor and purgatory CFLAGS Date: Mon, 23 Jun 2025 15:54:56 +0200 Message-ID: <20250623135456.1264864-1-hca@linux.ibm.com> X-Mailer: git-send-email 2.48.1 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: _On0p6TN5dtfkkbYBYNG2Pg8Uh2BB4HE X-Proofpoint-GUID: _On0p6TN5dtfkkbYBYNG2Pg8Uh2BB4HE X-Authority-Analysis: v=2.4 cv=BpqdwZX5 c=1 sm=1 tr=0 ts=68595cb3 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=6IFa9wvqVegA:10 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=O4dmbfcdmyx46WCdPC8A:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjIzMDA4MiBTYWx0ZWRfXzLfmZ+wGQhGZ KWZbUOqzgHkBcSydXY5+e89Tm/tm8MnLYMz5wmKyt01FE+BcIhiBeFnO+5wK2j6GbgdyKbxATxQ soy2/nVLzu4jUkPGQ+d52G4ST2/buOtr5Cnw7EtoLH0gg13l7F10j1+FySB1vLvx2B4FFqi29NP fn3Wf0YlHwbdL+bWhrE62LTA1rgPXB7JMR7BiG/2dU5shehY+J9qwx1YEh+9pScl/jtwNC3u2hB huDWTaSiPFNsHsttjNwyfSPF1Ayv8C4FIZNjnvCzuJvuOFG4mXul7owd8PhE9rIpVZIHRWywV3J R3vaLN3I3TdMSsCvp06vkbbWQO7dRKyW4PmjvhQy0w+M1iAtZAFzdtQ+sKmy9i0oEPEiQrtomKu Fs7umLAwfIvU202AMX9X6sDQY1I+oN6ptfflcE7aH7hCBLnrF5Z0M6N/sU5mhhrEyemKX6Dk X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-23_04,2025-06-23_05,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 lowpriorityscore=0 impostorscore=0 clxscore=1015 spamscore=0 mlxlogscore=839 priorityscore=1501 phishscore=0 malwarescore=0 adultscore=0 bulkscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506230082 From: Nathan Chancellor commit 3b8b80e993766dc96d1a1c01c62f5d15fafc79b9 upstream. GCC changed the default C standard dialect from gnu17 to gnu23, which should not have impacted the kernel because it explicitly requests the gnu11 standard in the main Makefile. However, there are certain places in the s390 code that use their own CFLAGS without a '-std=' value, which break with this dialect change because of the kernel's own definitions of bool, false, and true conflicting with the C23 reserved keywords. include/linux/stddef.h:11:9: error: cannot use keyword 'false' as enumeration constant 11 | false = 0, | ^~~~~ include/linux/stddef.h:11:9: note: 'false' is a keyword with '-std=c23' onwards include/linux/types.h:35:33: error: 'bool' cannot be defined via 'typedef' 35 | typedef _Bool bool; | ^~~~ include/linux/types.h:35:33: note: 'bool' is a keyword with '-std=c23' onwards Add '-std=gnu11' to the decompressor and purgatory CFLAGS to eliminate these errors and make the C standard version of these areas match the rest of the kernel. Cc: stable@vger.kernel.org Signed-off-by: Nathan Chancellor Tested-by: Heiko Carstens Link: https://lore.kernel.org/r/20250122-s390-fix-std-for-gcc-15-v1-1-8b00cadee083@kernel.org Signed-off-by: Alexander Gordeev Signed-off-by: Heiko Carstens --- arch/s390/Makefile | 2 +- arch/s390/purgatory/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/s390/Makefile b/arch/s390/Makefile index 71e3d7c0b870..22dc393b5a83 100644 --- a/arch/s390/Makefile +++ b/arch/s390/Makefile @@ -23,7 +23,7 @@ endif aflags_dwarf := -Wa,-gdwarf-2 KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -D__ASSEMBLY__ KBUILD_AFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),$(aflags_dwarf)) -KBUILD_CFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -O2 +KBUILD_CFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -O2 -std=gnu11 KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float KBUILD_CFLAGS_DECOMPRESSOR += -fno-asynchronous-unwind-tables diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile index 9de56065f28c..2f4d8422bdfb 100644 --- a/arch/s390/purgatory/Makefile +++ b/arch/s390/purgatory/Makefile @@ -20,7 +20,7 @@ GCOV_PROFILE := n UBSAN_SANITIZE := n KASAN_SANITIZE := n -KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes +KBUILD_CFLAGS := -std=gnu11 -fno-strict-aliasing -Wall -Wstrict-prototypes KBUILD_CFLAGS += -Wno-pointer-sign -Wno-sign-compare KBUILD_CFLAGS += -fno-zero-initialized-in-bss -fno-builtin -ffreestanding KBUILD_CFLAGS += -c -MD -Os -m64 -msoft-float -fno-common -- 2.48.1