diff mbox series

[1/2] configs/beagleboneai_defconfig: bump Linux to 5.10.217 to fix gcc 13.x build

Message ID 20240521064045.2126436-1-peter@korsgaard.com
State Accepted
Headers show
Series [1/2] configs/beagleboneai_defconfig: bump Linux to 5.10.217 to fix gcc 13.x build | expand

Commit Message

Peter Korsgaard May 21, 2024, 6:40 a.m. UTC
The 5.10.79 kernel fails to build with GCC 13.x:

In file included from <command-line>:
drivers/ata/libahci.c: In function ‘ahci_led_store’:
././include/linux/compiler_types.h:315:45: error: call to ‘__compiletime_assert_321’ declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long)
  315 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
      |                                             ^
././include/linux/compiler_types.h:296:25: note: in definition of macro ‘__compiletime_assert’
  296 |                         prefix ## suffix();                             \
      |                         ^~~~~~
././include/linux/compiler_types.h:315:9: note: in expansion of macro ‘_compiletime_assert’
  315 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
      |         ^~~~~~~~~~~~~~~~~~~
./include/linux/build_bug.h:39:37: note: in expansion of macro ‘compiletime_assert’
   39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
      |                                     ^~~~~~~~~~~~~~~~~~
./include/linux/build_bug.h:50:9: note: in expansion of macro ‘BUILD_BUG_ON_MSG’
   50 |         BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
      |         ^~~~~~~~~~~~~~~~
./include/linux/nospec.h:58:9: note: in expansion of macro ‘BUILD_BUG_ON’
   58 |         BUILD_BUG_ON(sizeof(_s) > sizeof(long));                        \
      |         ^~~~~~~~~~~~
drivers/ata/libahci.c:1137:23: note: in expansion of macro ‘array_index_nospec’
 1137 |                 pmp = array_index_nospec(pmp, EM_MAX_SLOTS);
      |                       ^~~~~~~~~~~~~~~~~~

This is fixed upstream by commit f07788079f515ca (ata: ahci: fix enum
constants for gcc-13), which has been backported to 5.10.x as of 5.10.184,
so bump to v5.10.217 to fix the build.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 configs/beagleboneai_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Peter Korsgaard May 21, 2024, 7:01 a.m. UTC | #1
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > The 5.10.79 kernel fails to build with GCC 13.x:

Ups, forgot a:

Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6865596946

> In file included from <command-line>:
 > drivers/ata/libahci.c: In function ‘ahci_led_store’:
 > ././include/linux/compiler_types.h:315:45: error: call to
 > ‘__compiletime_assert_321’ declared with attribute error: BUILD_BUG_ON
 > failed: sizeof(_s) > sizeof(long)
 >   315 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
 >       |                                             ^
 > ././include/linux/compiler_types.h:296:25: note: in definition of macro ‘__compiletime_assert’
 >   296 |                         prefix ## suffix();                             \
 >       |                         ^~~~~~
 > ././include/linux/compiler_types.h:315:9: note: in expansion of macro ‘_compiletime_assert’
 >   315 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
 >       |         ^~~~~~~~~~~~~~~~~~~
 > ./include/linux/build_bug.h:39:37: note: in expansion of macro ‘compiletime_assert’
 >    39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
 >       |                                     ^~~~~~~~~~~~~~~~~~
 > ./include/linux/build_bug.h:50:9: note: in expansion of macro ‘BUILD_BUG_ON_MSG’
 >    50 |         BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
 >       |         ^~~~~~~~~~~~~~~~
 > ./include/linux/nospec.h:58:9: note: in expansion of macro ‘BUILD_BUG_ON’
 >    58 |         BUILD_BUG_ON(sizeof(_s) > sizeof(long));                        \
 >       |         ^~~~~~~~~~~~
 > drivers/ata/libahci.c:1137:23: note: in expansion of macro ‘array_index_nospec’
 >  1137 |                 pmp = array_index_nospec(pmp, EM_MAX_SLOTS);
 >       |                       ^~~~~~~~~~~~~~~~~~

 > This is fixed upstream by commit f07788079f515ca (ata: ahci: fix enum
 > constants for gcc-13), which has been backported to 5.10.x as of 5.10.184,
 > so bump to v5.10.217 to fix the build.

 > Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 > ---
 >  configs/beagleboneai_defconfig | 2 +-
 >  1 file changed, 1 insertion(+), 1 deletion(-)

 > diff --git a/configs/beagleboneai_defconfig b/configs/beagleboneai_defconfig
 > index 586a75317e..1373ba662e 100644
 > --- a/configs/beagleboneai_defconfig
 > +++ b/configs/beagleboneai_defconfig
 > @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 >  BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboneai/genimage.cfg"
 >  BR2_LINUX_KERNEL=y
 >  BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.79"
 > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.217"
 >  BR2_LINUX_KERNEL_DEFCONFIG="omap2plus"
 >  BR2_LINUX_KERNEL_DTS_SUPPORT=y
 >  BR2_LINUX_KERNEL_INTREE_DTS_NAME="am5729-beagleboneai"
 > -- 

 > 2.39.2
Romain Naour May 22, 2024, 1:15 p.m. UTC | #2
Hello Peter,

Le 21/05/2024 à 08:40, Peter Korsgaard a écrit :
> The 5.10.79 kernel fails to build with GCC 13.x:
> 
> In file included from <command-line>:
> drivers/ata/libahci.c: In function ‘ahci_led_store’:
> ././include/linux/compiler_types.h:315:45: error: call to ‘__compiletime_assert_321’ declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long)
>   315 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
>       |                                             ^
> ././include/linux/compiler_types.h:296:25: note: in definition of macro ‘__compiletime_assert’
>   296 |                         prefix ## suffix();                             \
>       |                         ^~~~~~
> ././include/linux/compiler_types.h:315:9: note: in expansion of macro ‘_compiletime_assert’
>   315 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
>       |         ^~~~~~~~~~~~~~~~~~~
> ./include/linux/build_bug.h:39:37: note: in expansion of macro ‘compiletime_assert’
>    39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
>       |                                     ^~~~~~~~~~~~~~~~~~
> ./include/linux/build_bug.h:50:9: note: in expansion of macro ‘BUILD_BUG_ON_MSG’
>    50 |         BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
>       |         ^~~~~~~~~~~~~~~~
> ./include/linux/nospec.h:58:9: note: in expansion of macro ‘BUILD_BUG_ON’
>    58 |         BUILD_BUG_ON(sizeof(_s) > sizeof(long));                        \
>       |         ^~~~~~~~~~~~
> drivers/ata/libahci.c:1137:23: note: in expansion of macro ‘array_index_nospec’
>  1137 |                 pmp = array_index_nospec(pmp, EM_MAX_SLOTS);
>       |                       ^~~~~~~~~~~~~~~~~~
> 
> This is fixed upstream by commit f07788079f515ca (ata: ahci: fix enum
> constants for gcc-13), which has been backported to 5.10.x as of 5.10.184,
> so bump to v5.10.217 to fix the build.

Both patch applied to master, thanks.

Best regards,
Romain

> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
>  configs/beagleboneai_defconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configs/beagleboneai_defconfig b/configs/beagleboneai_defconfig
> index 586a75317e..1373ba662e 100644
> --- a/configs/beagleboneai_defconfig
> +++ b/configs/beagleboneai_defconfig
> @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
>  BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboneai/genimage.cfg"
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.79"
> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.217"
>  BR2_LINUX_KERNEL_DEFCONFIG="omap2plus"
>  BR2_LINUX_KERNEL_DTS_SUPPORT=y
>  BR2_LINUX_KERNEL_INTREE_DTS_NAME="am5729-beagleboneai"
diff mbox series

Patch

diff --git a/configs/beagleboneai_defconfig b/configs/beagleboneai_defconfig
index 586a75317e..1373ba662e 100644
--- a/configs/beagleboneai_defconfig
+++ b/configs/beagleboneai_defconfig
@@ -8,7 +8,7 @@  BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboneai/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.79"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.217"
 BR2_LINUX_KERNEL_DEFCONFIG="omap2plus"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="am5729-beagleboneai"