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

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

See merge request espressif/esp-idf!22294
pull/11147/head
Marius Vikhammer 2023-02-20 14:38:57 +08:00
commit 896d16b1fd
1 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

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