From d20b5f751ff9c54b7fd3fb5349bc77376034682a Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.maroneze@cea.fr>
Date: Fri, 6 Jan 2023 18:04:32 +0100
Subject: [PATCH] [libc] prefer generic atomic builtin in tests

---
 tests/libc/more_gcc_builtins.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/libc/more_gcc_builtins.c b/tests/libc/more_gcc_builtins.c
index 20f44ab4963..875f454c827 100644
--- a/tests/libc/more_gcc_builtins.c
+++ b/tests/libc/more_gcc_builtins.c
@@ -74,15 +74,15 @@ int main() {
   __UINT8_T u8_1, u8_2 = 42;
   u8_1 = __atomic_load_1(&u8_2, __ATOMIC_RELAXED);
   __UINT16_T u16_1, u16_2 = 4200;
-  __atomic_store_2(&u16_1, u16_2, __ATOMIC_ACQ_REL);
+  __atomic_store(&u16_1, u16_2, __ATOMIC_ACQ_REL);
   __UINT32_T u32_1, u32_2 = 1234567, u32_3 = 420000;
   u32_1 = __atomic_exchange_4(&u32_2, u32_3, __ATOMIC_RELEASE);
   __UINT64_T u64_1 = 12345678901UL, u64_2 = 42000000000UL, u64_3 = 42000000001UL;
-  r = __atomic_compare_exchange_8(&u64_1, &u64_2, u64_3, 1, __ATOMIC_SEQ_CST, __ATOMIC_ACQUIRE);
-  u8_2 = __atomic_add_fetch_1(&u8_1, u8_2, __ATOMIC_CONSUME);
-  u16_2 = __atomic_fetch_sub_2(&u16_1, u16_2, __ATOMIC_RELAXED);
-  u32_2 = __atomic_fetch_xor_4(&u32_1, u32_2, __ATOMIC_RELAXED);
-  u64_2 = __atomic_fetch_nand_8(&u64_1, u64_2, __ATOMIC_RELAXED);
+  r = __atomic_compare_exchange(&u64_1, &u64_2, u64_3, 1, __ATOMIC_SEQ_CST, __ATOMIC_ACQUIRE);
+  u8_2 = __atomic_add_fetch(&u8_1, u8_2, __ATOMIC_CONSUME);
+  u16_2 = __atomic_fetch_sub(&u16_1, u16_2, __ATOMIC_RELAXED);
+  u32_2 = __atomic_fetch_xor(&u32_1, u32_2, __ATOMIC_RELAXED);
+  u64_2 = __atomic_fetch_nand(&u64_1, u64_2, __ATOMIC_RELAXED);
   r = __atomic_test_and_set(&u32_3, __ATOMIC_ACQUIRE);
   __atomic_clear(&r, __ATOMIC_ACQ_REL);
   r = __atomic_always_lock_free(sizeof(long long), 0);
-- 
GitLab