Switch __PICOLIBC_CRT_RUNTIME_SIZE to __PICOCRT_RUNTIME_SIZE

Use more consistent naming for this option

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

Author: keith-packard

CMakeLists.txt

@@ -284,7 +284,7 @@ set(__OBSOLETE_MATH_FLOAT ON)
 set(__OBSOLETE_MATH_DOUBLE ON)
 
 # Compute static memory area sizes at runtime instead of link time
-set(__PICOLIBC_CRT_RUNTIME_SIZE OFF)
+set(__PICOCRT_RUNTIME_SIZE OFF)
 
 if(NOT DEFINED __SINGLE_THREAD)
   option(__SINGLE_THREAD "Disable multithreading support" OFF)

meson.build

@@ -1433,7 +1433,7 @@ endif
 if enable_picocrt
   conf_data.set('__PICOCRT_ENABLE_MMU', picocrt_enable_mmu,
                 description: 'Turn on mmu in picocrt startup code')
-  conf_data.set('__PICOLIBC_CRT_RUNTIME_SIZE',
+  conf_data.set('__PICOCRT_RUNTIME_SIZE',
 	        get_option('crt-runtime-size'),
 	        description: 'Compute static memory area sizes at runtime instead of link time')
 endif

newlib/libc/picolib/inittls.c

@@ -51,7 +51,7 @@ extern char __tdata_end[];      /* End of static tdata area */
 extern char __tbss_start[];     /* Start of static zero-initialized TLS data */
 extern char __tbss_end[];       /* End of static zero-initialized TLS data */
 
-#ifdef __PICOLIBC_CRT_RUNTIME_SIZE
+#ifdef __PICOCRT_RUNTIME_SIZE
 #define __tdata_size (__tdata_end - __tdata_start)
 #define __tbss_size (__tbss_end - __tbss_start)
 #define __tbss_offset (__tbss_start - __tdata_start)

picocrt/crt0.h

@@ -49,7 +49,7 @@ extern char __tls_base[];
 extern char __tdata_end[];
 extern char __tls_end[];
 
-#ifdef __PICOLIBC_CRT_RUNTIME_SIZE
+#ifdef __PICOCRT_RUNTIME_SIZE
 #define __data_size (__data_end - __data_start)
 #define __bss_size (__bss_end - __bss_start)
 #endif

picolibc.h.in

@@ -171,7 +171,7 @@
 #define __OBSOLETE_MATH_DOUBLE @__OBSOLETE_MATH_DOUBLE@
 
 /* Compute static memory area sizes at runtime instead of link time */
-#cmakedefine __PICOLIBC_CRT_RUNTIME_SIZE
+#cmakedefine __PICOCRT_RUNTIME_SIZE
 
 /* The Picolibc minor version number. */
 #define __PICOLIBC_MINOR__ @PROJECT_VERSION_MINOR@