mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-10 00:04:06 -09:00
5114291fb2
Update tinycbor to the latest version. This release migrates from a hand-written Makefile to CMake, which required a number of patches to restore parity with the old system: - Fix building on toolchains without C++ support - Keep installing the json2cbor command line tool Also building on GCC versions older than 11 was fixed and subsequently broken again, so this requires a refreshed version of the patch that was already present for 0.6.1. Changelog: https://github.com/intel/tinycbor/releases/tag/v7.0 Signed-off-by: Florian Larysch <fl@n621.de> Signed-off-by: Julien Olivain <ju.o@free.fr>
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 4adba2c1cc376cbbbbc603595e2f561a21259bfb Mon Sep 17 00:00:00 2001
|
|
From: Florian Larysch <fl@n621.de>
|
|
Date: Mon, 13 Apr 2026 23:34:39 +0200
|
|
Subject: [PATCH] compilersupport: fix build with GCC < 11
|
|
|
|
Commit 45e4641 ("Fix build with GCC < 11: [[fallthrough]] is supported
|
|
but not allowed in C") introduced a fix for old GCC versions, but commit
|
|
91d1c50 ("compilersupport: fix compilation in C23 mode") reverted it,
|
|
reintroducing the build failure.
|
|
|
|
Revert the revert.
|
|
|
|
Signed-off-by: Florian Larysch <fl@n621.de>
|
|
Upstream: https://github.com/intel/tinycbor/commit/76d7a29cead0f8c1c72a6b4fb2ecbc8a9885ed89
|
|
---
|
|
src/compilersupport_p.h | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/compilersupport_p.h b/src/compilersupport_p.h
|
|
index 7f24773..670a291 100644
|
|
--- a/src/compilersupport_p.h
|
|
+++ b/src/compilersupport_p.h
|
|
@@ -52,10 +52,14 @@
|
|
# define cbor_static_assert(x) ((void)sizeof(char[2*!!(x) - 1]))
|
|
#endif
|
|
|
|
-#if defined(__has_cpp_attribute) // C23 and C++17
|
|
+#if defined(__has_cpp_attribute) && defined(__cplusplus) // C++17
|
|
# if __has_cpp_attribute(fallthrough)
|
|
# define CBOR_FALLTHROUGH [[fallthrough]]
|
|
# endif
|
|
+#elif defined(__has_c_attribute) && !defined(__cplusplus) // C23
|
|
+# if __has_c_attribute(fallthrough)
|
|
+# define CBOR_FALLTHROUGH [[fallthrough]]
|
|
+# endif
|
|
#endif
|
|
#ifndef CBOR_FALLTHROUGH
|
|
# ifdef __GNUC__
|
|
--
|
|
2.53.0
|
|
|