From 8df460977d3099da5ac26b8e948d5d936bb8100b Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 10 Apr 2025 14:55:36 -0400 Subject: mips: Add '-std=gnu11' to vdso CFLAGS Integrating the following commit(s) to linux-yocto/6.12: 1/1 [ Author: Khem Raj Email: raj.khem@gmail.com Subject: mips: Add '-std=gnu11' to vdso CFLAGS Date: Wed, 26 Mar 2025 20:24:36 -0700 GCC 15 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, mips/vdso code uses its 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. Signed-off-by: Khem Raj Cc: stable@vger.kernel.org Signed-off-by: Bruce Ashfield ] (From OE-Core rev: 832657740c76c63b2e2e9229eb3934c04a5d5ca1) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.12.bb | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb index e0bf187823..a04bd3a95d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb @@ -14,7 +14,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "9f69ed0ac5f665d431fe52bacdda72534172712b" +SRCREV_machine ?= "15dd975f84e62ba7b866a96108aff27b97cdbf80" SRCREV_meta ?= "d034c1073cb7f88eaf3ce929ba21ba11503729b2" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb index c96874480b..5b3661a80e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb @@ -17,7 +17,7 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "b2c792d89ac51b1147810021dddab1e9f38ade9c" +SRCREV_machine ?= "2ee7ebed771b39a795c227aae81524175abf5d00" SRCREV_meta ?= "d034c1073cb7f88eaf3ce929ba21ba11503729b2" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.12.bb b/meta/recipes-kernel/linux/linux-yocto_6.12.bb index 2a8cb964d0..10350edd5e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.12.bb @@ -18,17 +18,17 @@ KBRANCH:qemux86.104 ?= "v6.12/standard/base" KBRANCH:qemuloongarch64 ?= "v6.12/standard/base" KBRANCH:qemumips64 ?= "v6.12/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "f7235e5c375b9ba3d49902dd36d4b66eefc19979" -SRCREV_machine:qemuarm64 ?= "b2c792d89ac51b1147810021dddab1e9f38ade9c" -SRCREV_machine:qemuloongarch64 ?= "b2c792d89ac51b1147810021dddab1e9f38ade9c" -SRCREV_machine:qemumips ?= "c102fc13802679cf23f6a41f9ea54294294f7a93" -SRCREV_machine:qemuppc ?= "b2c792d89ac51b1147810021dddab1e9f38ade9c" -SRCREV_machine:qemuriscv64 ?= "b2c792d89ac51b1147810021dddab1e9f38ade9c" -SRCREV_machine:qemuriscv32 ?= "b2c792d89ac51b1147810021dddab1e9f38ade9c" -SRCREV_machine:qemux86 ?= "b2c792d89ac51b1147810021dddab1e9f38ade9c" -SRCREV_machine:qemux86-64 ?= "b2c792d89ac51b1147810021dddab1e9f38ade9c" -SRCREV_machine:qemumips64 ?= "ee2d5ef2e92ca23c5b345ac50bab130c6a9ad0fc" -SRCREV_machine ?= "b2c792d89ac51b1147810021dddab1e9f38ade9c" +SRCREV_machine:qemuarm ?= "3a973aae1addba0ecd7485694d4fcfc624085f24" +SRCREV_machine:qemuarm64 ?= "2ee7ebed771b39a795c227aae81524175abf5d00" +SRCREV_machine:qemuloongarch64 ?= "2ee7ebed771b39a795c227aae81524175abf5d00" +SRCREV_machine:qemumips ?= "fc7877fe6aa5f2a445e17941a5858c7e19a1746d" +SRCREV_machine:qemuppc ?= "2ee7ebed771b39a795c227aae81524175abf5d00" +SRCREV_machine:qemuriscv64 ?= "2ee7ebed771b39a795c227aae81524175abf5d00" +SRCREV_machine:qemuriscv32 ?= "2ee7ebed771b39a795c227aae81524175abf5d00" +SRCREV_machine:qemux86 ?= "2ee7ebed771b39a795c227aae81524175abf5d00" +SRCREV_machine:qemux86-64 ?= "2ee7ebed771b39a795c227aae81524175abf5d00" +SRCREV_machine:qemumips64 ?= "9e2bc57fafb525cb3fbbfab7c7f92bca7e9a43f4" +SRCREV_machine ?= "2ee7ebed771b39a795c227aae81524175abf5d00" SRCREV_meta ?= "d034c1073cb7f88eaf3ce929ba21ba11503729b2" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll -- cgit v1.2.3-54-g00ecf