From 74949b1d3578873af031f9ad67a8fdb571c5f1bc Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 11 Jan 2021 22:42:26 -0800
Subject: picolibc: Clean up configuration a bit

Use LIBC_PICOLIBC_CXA_ATEXIT to keep this name in the same 'namespace'
as the other picolibc config names.

Enable retargetable locking by default. This allows the few locks in
picolibc to be implemented by the execution environment, rather than
disabling the locking code.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/config/comp_libs/picolibc.in b/config/comp_libs/picolibc.in
index a3f07d6..62ab22b 100644
--- a/config/comp_libs/picolibc.in
+++ b/config/comp_libs/picolibc.in
@@ -10,7 +10,7 @@
 ## help conglomeration of several library parts, all under BSD-compatible software
 ## help licenses that make them easily usable on embedded products.
 
-config PICOLIBC_CXA_ATEXIT
+config LIBC_PICOLIBC_CXA_ATEXIT
     def_bool y
     select LIBC_PROVIDES_CXA_ATEXIT
 
@@ -72,6 +72,7 @@ config LIBC_PICOLIBC_MULTITHREAD
 config LIBC_PICOLIBC_RETARGETABLE_LOCKING
     bool
     prompt "Enable retargetable locking"
+    default y
     help
         Enable retargetable locking to allow the operating system to override
         the dummy lock functions defined within picolibc.
-- 
cgit v0.10.2-6-g49f6