espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 02:37:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/newlib_tz_env_mutex_v4.4' into 'release/v4.4'

Browse Source 
newlib: Use correct recursive mutex for env and regular mutex for tz (v4.4)

See merge request espressif/esp-idf!22294
This commit is contained in:
Marius Vikhammer
2023-02-20 14:38:57 +08:00
parent 4a466ca518 614b06341f
commit 896d16b1fd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/newlib/locks.c
View File

@ -384,9 +384,9 @@ void esp_newlib_locks_init(void)
extern _lock_t __sinit_lock; extern _lock_t __sinit_lock;
__sinit_lock = (_lock_t) &s_common_recursive_mutex; __sinit_lock = (_lock_t) &s_common_recursive_mutex;
extern _lock_t __env_lock_object; extern _lock_t __env_lock_object;
__env_lock_object = (_lock_t) &s_common_mutex; __env_lock_object = (_lock_t) &s_common_recursive_mutex;
extern _lock_t __tz_lock_object; extern _lock_t __tz_lock_object;
__tz_lock_object = (_lock_t) &s_common_recursive_mutex; __tz_lock_object = (_lock_t) &s_common_mutex;
#elif defined(CONFIG_IDF_TARGET_ESP32S2) #elif defined(CONFIG_IDF_TARGET_ESP32S2)
/* Newlib 3.0.0 is used in ROM, the following lock symbols are defined: */ /* Newlib 3.0.0 is used in ROM, the following lock symbols are defined: */
extern _lock_t __sinit_recursive_mutex; extern _lock_t __sinit_recursive_mutex;