poky/meta/recipes-devtools/mtd/files/0001-Improve-check-for-GCC-compiler-version.patch
Khem Raj d7b46cb079 mtd-utils: Fix GCC version detection
Helps building with GCC with 0 in minor version e.g. 15.0.1

(From OE-Core rev: ed24490dccf348ba55816d45a2444d4bf0f574c8)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2025-03-27 11:19:03 +00:00

35 lines
1.2 KiB
Diff

From e7adb21350ff3b96dbd2de56a127e9d916c08d62 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 22 Mar 2025 19:05:32 -0700
Subject: [PATCH] Improve check for GCC compiler version
When using unreleased compiler has version like
15.0.1 and that test fails because __GNUC_MINOR__ < 1
becomes true, therefore check for full version string
which is more rubust.
Upstream-Status: Submitted [https://lists.infradead.org/pipermail/linux-mtd/2025-March/108860.html]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
ubifs-utils/common/atomic.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ubifs-utils/common/atomic.h b/ubifs-utils/common/atomic.h
index f287d43..95754b2 100644
--- a/ubifs-utils/common/atomic.h
+++ b/ubifs-utils/common/atomic.h
@@ -2,8 +2,12 @@
#ifndef __ATOMIC_H__
#define __ATOMIC_H__
+#define GCC_VERSION (__GNUC__ * 10000 \
+ + __GNUC_MINOR__ * 100 \
+ + __GNUC_PATCHLEVEL__)
+
/* Check GCC version, just to be safe */
-#if !defined(__GNUC__) || (__GNUC__ < 4) || (__GNUC_MINOR__ < 1)
+#if GCC_VERSION < 40100
# error atomic.h works only with GCC newer than version 4.1
#endif /* GNUC >= 4.1 */