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
espressif · Feb 20, 2023 · 896d16b · 896d16b
2 parents 4a466ca + 614b063
commit 896d16b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/components/newlib/locks.c b/components/newlib/locks.c
@@ -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;