Switch _PICOCRT_ENABLE_MMU to __PICOCRT_ENABLE_MMU

Use __ namespace for config options.

Signed-off-by: Keith Packard <[email protected]>

Author: keith-packard

CMakeLists.txt

@@ -143,7 +143,7 @@ set(__INIT_FINI_ARRAY 1)
 set(__INIT_FINI_FUNCS 1)
 
 # Enable MMU in pico crt startup
-set(_PICOCRT_ENABLE_MMU 1)
+set(__PICOCRT_ENABLE_MMU 1)
 
 # _set_tls and _init_tls functions available
 if(NOT DEFINED __THREAD_LOCAL_STORAGE_API OR NOT __THREAD_LOCAL_STORAGE)

meson.build

@@ -1357,10 +1357,10 @@ conf_data.set('__IO_FLOAT_EXACT', io_float_exact)
 conf_data.set('__IO_PERCENT_B', io_percent_b)
 conf_data.set('__IO_LONG_DOUBLE', io_long_double)
 conf_data.set('__IO_WCHAR', io_wchar)
-conf_data.set('__ASSERT_VERBOSE', get_option('assert-verbose'))
-conf_data.set('__SINGLE_THREAD', get_option('single-thread'))
-conf_data.set('__HAVE_FCNTL', newlib_have_fcntl)
-conf_data.set('__NANO_MALLOC', newlib_nano_malloc)
+conf_data.set('__ASSERT_VERBOSE', get_option('assert-verbose'), description: 'assert() is verbose by default')
+conf_data.set('__SINGLE_THREAD', get_option('single-thread'), description: 'Disable multi-thread support')
+conf_data.set('__HAVE_FCNTL', newlib_have_fcntl, description: 'System provides fcntl function')
+conf_data.set('__NANO_MALLOC', newlib_nano_malloc, description: 'Provide smaller malloc implementation')
 conf_data.set('__NANO_MALLOC_CLEAR_FREED', nano_malloc_clear_freed and newlib_nano_malloc)
 conf_data.set('__IEEE_LIBM', not get_option('want-math-errno'), description: 'math library does not set errno (offering only ieee semantics)')
 conf_data.set('__MATH_ERRNO', get_option('want-math-errno'), description: 'math library sets errno')
@@ -1431,7 +1431,7 @@ else
 endif
 
 if enable_picocrt
-  conf_data.set('_PICOCRT_ENABLE_MMU', picocrt_enable_mmu,
+  conf_data.set('__PICOCRT_ENABLE_MMU', picocrt_enable_mmu,
                 description: 'Turn on mmu in picocrt startup code')
   conf_data.set('__PICOLIBC_CRT_RUNTIME_SIZE',
 	        get_option('crt-runtime-size'),

picocrt/machine/arm/crt0.c

@@ -95,7 +95,7 @@ _start(void)
 
 #else /*  __ARM_ARCH_PROFILE == 'M' */
 
-#ifdef _PICOCRT_ENABLE_MMU
+#ifdef __PICOCRT_ENABLE_MMU
 
 #if __ARM_ARCH >= 7 && __ARM_ARCH_PROFILE != 'R'
 
@@ -167,7 +167,7 @@ __asm__(
 );
 #endif
 
-#endif /* _PICOCRT_ENABLE_MMU */
+#endif /* __PICOCRT_ENABLE_MMU */
 
 /*
  * Set up all of the shadow stack pointers. With Thumb 1 ISA we need
@@ -263,7 +263,7 @@ _cstart(void)
     __asm__("mcr p15, #0, %0, c12, c0, 0" : : "r"(__vector_table) :);
 #endif
 
-#ifdef _PICOCRT_ENABLE_MMU
+#ifdef __PICOCRT_ENABLE_MMU
 
 #if __ARM_ARCH >= 7 && __ARM_ARCH_PROFILE != 'R'
 
@@ -318,7 +318,7 @@ _cstart(void)
         }
 #endif
 
-#endif /* _PICOCRT_ENABLE_MMU */
+#endif /* __PICOCRT_ENABLE_MMU */
 
 	__start();
 }

picolibc.h.in

@@ -21,7 +21,7 @@
 #cmakedefine __PICOLIBC_ERRNO_FUNCTION @__PICOLIBC_ERRNO_FUNCTION@
 
 /* Turn on mmu in picocrt startup code */
-#cmakedefine _PICOCRT_ENABLE_MMU
+#cmakedefine __PICOCRT_ENABLE_MMU
 
 /* use thread local storage */
 #cmakedefine __THREAD_LOCAL_STORAGE