mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-30 14:01:57 -09:00
aa9ee17701
Fix the following autobuild error that started appearing with host GCC15
configs.
```
/usr/bin/gcc -DHAVE_CONFIG_H -I. -I/workdir/instance-0/output-1/host/include -O2 -I/workdir/instance-0/output-1/host/include -c -o modules/arch/x86/x86arch.o modules/arch/x86/x86arch.c
In file included from modules/arch/x86/x86arch.h:30,
from modules/arch/x86/x86arch.c:31:
./libyasm/bitvect.h:86:32: error: cannot use keyword 'false' as enumeration constant
86 | typedef enum boolean { false = FALSE, true = TRUE } boolean;
| ^~~~~
./libyasm/bitvect.h:86:32: note: 'false' is a keyword with '-std=c23' onwards
```
This is due to the change in the default C language version in GCC15.
Fixes: https://autobuild.buildroot.org/results/d1d/d1d9a6e73c2ec278941dd90c6b07cce01b372feb/
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 64ef740eb262f329e55eebadf2ce276b146d44e9 Mon Sep 17 00:00:00 2001
|
|
From: Martin Jansa <martin.jansa@gmail.com>
|
|
Date: Tue, 22 Apr 2025 19:06:24 +0200
|
|
Subject: [PATCH] bitvect: fix build with gcc-15
|
|
|
|
* fixes:
|
|
libyasm/bitvect.h:86:32: error: cannot use keyword 'false' as enumeration constant
|
|
86 | typedef enum boolean { false = FALSE, true = TRUE } boolean;
|
|
| ^~~~~
|
|
../git/libyasm/bitvect.h:86:32: note: 'false' is a keyword with '-std=c23' onwards
|
|
|
|
as suggested in:
|
|
https://github.com/yasm/yasm/issues/283#issuecomment-2661108816
|
|
|
|
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
|
|
Upstream: https://github.com/yasm/yasm/pull/287
|
|
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
|
|
---
|
|
libyasm/bitvect.h | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/libyasm/bitvect.h b/libyasm/bitvect.h
|
|
index 3aee3a531..a13470ada 100644
|
|
--- a/libyasm/bitvect.h
|
|
+++ b/libyasm/bitvect.h
|
|
@@ -83,7 +83,11 @@ typedef Z_longword *Z_longwordptr;
|
|
#ifdef MACOS_TRADITIONAL
|
|
#define boolean Boolean
|
|
#else
|
|
- typedef enum boolean { false = FALSE, true = TRUE } boolean;
|
|
+ #if __STDC_VERSION__ < 202311L
|
|
+ typedef enum boolean { false = FALSE, true = TRUE } boolean;
|
|
+ #else
|
|
+ typedef bool boolean;
|
|
+ #endif
|
|
#endif
|
|
#endif
|
|
|