Merge branch 'fix/__atomic_test_and_set_v5.1' into 'release/v5.1'

fix(newlib): fix __atomic_test_and_set to ensure atomicity (v5.1)

See merge request espressif/esp-idf!37453
This commit is contained in:
Jiang Jiang Jian
2025-08-01 17:35:48 +08:00
2 changed files with 38 additions and 2 deletions
@@ -0,0 +1,24 @@
/*
* SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
#include_next "stdatomic.h"
#ifndef __clang__
#include <stdbool.h>
#ifdef __cplusplus
extern "C" {
#endif
static inline bool __atomic_test_and_set(volatile void *ptr, int memorder)
{
return __atomic_exchange_1((bool *)ptr, true, memorder);
}
#ifdef __cplusplus
}
#endif
#endif
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
@@ -21,6 +21,18 @@ atomic_ushort g_atomic16;
atomic_uchar g_atomic8;
TEST_CASE("stdatomic - test_atomic_flag", "[newlib_stdatomic]")
{
bool x8 = 0;
g_atomic8 = 0;
x8 = atomic_flag_test_and_set(&g_atomic8);
TEST_ASSERT_EQUAL_HEX8(0x00, x8);
TEST_ASSERT_EQUAL_HEX8(0x01, g_atomic8);
atomic_flag_clear(&g_atomic8);
TEST_ASSERT_EQUAL_HEX8(0x00, g_atomic8);
}
TEST_CASE("stdatomic - test_64bit_atomics", "[newlib_stdatomic]")
{
unsigned long long x64 = 0;
@@ -248,7 +260,7 @@ TEST_CASE("stdatomic - test_" #NAME, "[newlib_stdatomic]")
TEST_ASSERT_EQUAL##ASSERT_SUFFIX((FINAL), var_##NAME); \
}
// Note that the assert at the end is doing an excat bitwise comparison.
// Note that the assert at the end is doing an exact bitwise comparison.
// This easily can fail due to rounding errors. However, there is currently
// no corresponding Unity assert macro for long double. USE THIS WITH CARE!
#define TEST_RACE_OPERATION_LONG_DOUBLE(NAME, LHSTYPE, PRE, POST, INIT, FINAL) \