mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 18:32:13 +02:00
37c112ae9d
All the patches have been accepted upstream. Update the Uptream-Status tags accordingly. (From OE-Core rev: f75f8ce638f53334056cff6cae7d45d559079ec6) Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
35 lines
1.2 KiB
Diff
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: Backport [https://github.com/sigma-star/mtd-utils/commit/ac0ab65ebcd7b11739986b81343457469fbb43b0]
|
|
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 */
|
|
|