Skip to content

Commit

Permalink
Merge branch 'bugfix/newlib_tz_env_mutex' into 'master'
Browse files Browse the repository at this point in the history
newlib: Use correct recursive mutex for env and regular mutex for tz

Closes IDFGH-9266

See merge request espressif/esp-idf!22200
  • Loading branch information
ESP-Marius committed Feb 8, 2023
2 parents b53de7c + 7ca5fa8 commit 2e55775
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions components/newlib/locks.c
Original file line number Diff line number Diff line change
Expand Up @@ -375,9 +375,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;
Expand Down

0 comments on commit 2e55775

Please sign in to comment.