[atomic] add stdc atomic detection. (#7536)

3 files changed, 49 insertions, 18 deletions

diff --git a/include/rtatomic.h b/include/rtatomic.h
index dc7c79e208..d711a64a05 100644
--- a/include/rtatomic.h
+++ b/include/rtatomic.h
@@ -6,10 +6,13 @@
  * Change Logs:
  * Date           Author       Notes
  * 2023-03-14     WangShun     first version
+ * 2023-05-20     Bernard      add stdc atomic detection.
  */
 #ifndef __RT_ATOMIC_H__
 #define __RT_ATOMIC_H__
 
+#if !defined(__cplusplus)
+
 rt_atomic_t rt_hw_atomic_load(volatile rt_atomic_t *ptr);
 void rt_hw_atomic_store(volatile rt_atomic_t *ptr, rt_atomic_t val);
 rt_atomic_t rt_hw_atomic_add(volatile rt_atomic_t *ptr, rt_atomic_t val);
@@ -20,9 +23,30 @@ rt_atomic_t rt_hw_atomic_xor(volatile rt_atomic_t *ptr, rt_atomic_t val);
 rt_atomic_t rt_hw_atomic_exchange(volatile rt_atomic_t *ptr, rt_atomic_t val);
 void rt_hw_atomic_flag_clear(volatile rt_atomic_t *ptr);
 rt_atomic_t rt_hw_atomic_flag_test_and_set(volatile rt_atomic_t *ptr);
-rt_atomic_t rt_hw_atomic_compare_exchange_strong(volatile rt_atomic_t *ptr, rt_atomic_t *old, rt_atomic_t new);
+rt_atomic_t rt_hw_atomic_compare_exchange_strong(volatile rt_atomic_t *ptr, rt_atomic_t *expected, rt_atomic_t desired);
+
+/* To detect stdatomic */
+#if !defined(RT_USING_HW_ATOMIC) && !defined(RT_USING_STDC_ATOMIC)
+#if defined(__GNUC__) && defined(RT_USING_LIBC) && !defined(__STDC_NO_ATOMICS__)
+#define RT_USING_STDC_ATOMIC
+#endif /* __GNUC__ && .. */
+#endif /* !RT_USING_HW_ATOMIC && !RT_USING_STDC_ATOMIC */
+
+#if defined(RT_USING_HW_ATOMIC)
+#define rt_atomic_load(ptr) rt_hw_atomic_load(ptr)
+#define rt_atomic_store(ptr, v) rt_hw_atomic_store(ptr, v)
+#define rt_atomic_add(ptr, v) rt_hw_atomic_add(ptr, v)
+#define rt_atomic_sub(ptr, v) rt_hw_atomic_sub(ptr, v)
+#define rt_atomic_and(ptr, v) rt_hw_atomic_and(ptr, v)
+#define rt_atomic_or(ptr, v)  rt_hw_atomic_or(ptr, v)
+#define rt_atomic_xor(ptr, v) rt_hw_atomic_xor(ptr, v)
+#define rt_atomic_exchange(ptr, v) rt_hw_atomic_exchange(ptr, v)
+#define rt_atomic_flag_clear(ptr) rt_hw_atomic_flag_clear(ptr)
+#define rt_atomic_flag_test_and_set(ptr) rt_hw_atomic_flag_test_and_set(ptr)
+#define rt_atomic_compare_exchange_strong(ptr, v,des) rt_hw_atomic_compare_exchange_strong(ptr, v ,des)
+
+#elif defined(RT_USING_STDC_ATOMIC)
 
-#if defined(RT_USING_STDC_ATOMIC)
 #ifndef __STDC_NO_ATOMICS__
 #define rt_atomic_load(ptr) atomic_load(ptr)
 #define rt_atomic_store(ptr, v) atomic_store(ptr, v)
@@ -38,18 +62,7 @@ rt_atomic_t rt_hw_atomic_compare_exchange_strong(volatile rt_atomic_t *ptr, rt_a
 #else
 #error "The standard library C doesn't support the atomic operation"
 #endif /* __STDC_NO_ATOMICS__ */
-#elif defined(RT_USING_HW_ATOMIC)
-#define rt_atomic_load(ptr) rt_hw_atomic_load(ptr)
-#define rt_atomic_store(ptr, v) rt_hw_atomic_store(ptr, v)
-#define rt_atomic_add(ptr, v) rt_hw_atomic_add(ptr, v)
-#define rt_atomic_sub(ptr, v) rt_hw_atomic_sub(ptr, v)
-#define rt_atomic_and(ptr, v) rt_hw_atomic_and(ptr, v)
-#define rt_atomic_or(ptr, v)  rt_hw_atomic_or(ptr, v)
-#define rt_atomic_xor(ptr, v) rt_hw_atomic_xor(ptr, v)
-#define rt_atomic_exchange(ptr, v) rt_hw_atomic_exchange(ptr, v)
-#define rt_atomic_flag_clear(ptr) rt_hw_atomic_flag_clear(ptr)
-#define rt_atomic_flag_test_and_set(ptr) rt_hw_atomic_flag_test_and_set(ptr)
-#define rt_atomic_compare_exchange_strong(ptr, v,des) rt_hw_atomic_compare_exchange_strong(ptr, v ,des)
+
 #else
 #include <rthw.h>
 #define rt_atomic_load(ptr) rt_soft_atomic_load(ptr)
@@ -192,4 +205,7 @@ rt_inline rt_atomic_t rt_soft_atomic_compare_exchange_strong(volatile rt_atomic_
     return temp;
 }
 #endif /* RT_USING_STDC_ATOMIC */
+
+#endif /* __cplusplus */
+
 #endif /* __RT_ATOMIC_H__ */
diff --git a/include/rtdef.h b/include/rtdef.h
index 1c3b1a5027..e70a9cac98 100644
--- a/include/rtdef.h
+++ b/include/rtdef.h
@@ -48,6 +48,7 @@
  * 2022-09-12     Meco Man     define rt_ssize_t
  * 2022-12-20     Meco Man     add const name for rt_object
  * 2023-04-01     Chushicheng  change version number to v5.0.1
+ * 2023-05-20     Bernard      add stdc atomic detection.
  */
 
 #ifndef __RT_DEF_H__
@@ -126,12 +127,24 @@ typedef rt_base_t                       rt_flag_t;      /**< Type for flags */
 typedef rt_ubase_t                      rt_dev_t;       /**< Type for device */
 typedef rt_base_t                       rt_off_t;       /**< Type for offset */
 
+#if !defined(__cplusplus)
 #if defined(RT_USING_STDC_ATOMIC)
-#include <stdatomic.h>
-typedef atomic_size_t rt_atomic_t;
+    #include <stdatomic.h>
+    typedef atomic_size_t rt_atomic_t;
+#elif defined(RT_USING_HW_ATOMIC)
+    typedef volatile rt_base_t rt_atomic_t;
 #else
-typedef volatile rt_base_t rt_atomic_t;
-#endif
+
+    /* To detect std atomic */
+    #if defined(RT_USING_LIBC) && defined(__GNUC__) && !defined(__STDC_NO_ATOMICS__)
+        #include <stdatomic.h>
+        typedef atomic_size_t rt_atomic_t;
+    #else
+        typedef volatile rt_base_t rt_atomic_t;
+    #endif /* __GNUC__ && !__STDC_NO_ATOMICS__ */
+
+#endif /* RT_USING_STDC_ATOMIC */
+#endif /* __cplusplus */
 
 /* boolean type definitions */
 #define RT_TRUE                         1               /**< boolean true  */
diff --git a/include/rtthread.h b/include/rtthread.h
index 5d44164f51..ac1b8f12c2 100644
--- a/include/rtthread.h
+++ b/include/rtthread.h
@@ -17,6 +17,7 @@
  * 2021-02-28     Meco Man     add RT_KSERVICE_USING_STDLIB
  * 2021-11-14     Meco Man     add rtlegacy.h for compatibility
  * 2022-06-04     Meco Man     remove strnlen
+ * 2023-05-20     Bernard      add rtatomic.h header file to included files.
  */
 
 #ifndef __RT_THREAD_H__
@@ -27,6 +28,7 @@
 #include <rtdef.h>
 #include <rtservice.h>
 #include <rtm.h>
+#include <rtatomic.h>
 #ifdef RT_USING_LEGACY
 #include <rtlegacy.h>
 #endif