Switch _WANT_MATH_ERRNO to __MATH_ERRNO

keith-packard · keith-packard · commit 0f3b29b01b62 · 2025-03-22T21:30:13.000-07:00
Use __ namespace for config options.

Signed-off-by: Keith Packard &lt;keithp@keithp.com&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -267,7 +267,7 @@ if(NOT DEFINED __IO_DEFAULT_INTEGER)
 endif()
 
 # math library sets errno
-set(_WANT_MATH_ERRNO OFF)
+set(__MATH_ERRNO OFF)
 
 set(_WANT_REGISTER_FINI OFF)
 
diff --git a/meson.build b/meson.build
@@ -1363,7 +1363,7 @@ conf_data.set('__HAVE_FCNTL', newlib_have_fcntl)
 conf_data.set('__NANO_MALLOC', newlib_nano_malloc)
 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('_WANT_MATH_ERRNO', get_option('want-math-errno'), description: 'math library sets errno')
+conf_data.set('__MATH_ERRNO', get_option('want-math-errno'), description: 'math library sets errno')
 conf_data.set('__PREFER_SIZE_OVER_SPEED', get_option('optimization') == 's', description: 'Optimize for space over speed')
 conf_data.set('__FAST_STRCMP', fast_strcmp, description: 'Always optimize strcmp for performance')
 conf_data.set('__GLOBAL_ERRNO', get_option('newlib-global-errno'), description: 'use global errno variable')
diff --git a/newlib/libc/machine/aarch64/machine/math.h b/newlib/libc/machine/aarch64/machine/math.h
@@ -46,7 +46,7 @@
 
 #ifdef __declare_extern_inline
 
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
 #include <errno.h>
 #endif
 
@@ -56,7 +56,7 @@ __declare_extern_inline(double)
 sqrt (double x)
 {
     double result;
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
     if (isless(x, 0.0))
         errno = EDOM;
 #endif
@@ -79,7 +79,7 @@ __declare_extern_inline(float)
 sqrtf (float x)
 {
     float result;
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
     if (isless(x, 0.0f))
         errno = EDOM;
 #endif
diff --git a/newlib/libc/machine/arm/machine/math.h b/newlib/libc/machine/arm/machine/math.h
@@ -48,7 +48,7 @@
 
 #ifdef __declare_extern_inline
 
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
 #include <errno.h>
 #endif
 
@@ -62,7 +62,7 @@ __declare_extern_inline(double)
 sqrt(double x)
 {
 	double result;
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
         if (isless(x, 0.0))
             errno = EDOM;
 #endif
@@ -163,7 +163,7 @@ __declare_extern_inline(float)
 sqrtf(float x)
 {
 	float result;
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
         if (isless(x, 0.0f))
             errno = EDOM;
 #endif
diff --git a/newlib/libc/machine/loongarch/machine/math.h b/newlib/libc/machine/loongarch/machine/math.h
@@ -38,7 +38,7 @@
 
 #ifndef __loongarch_soft_float
 
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
 #include <errno.h>
 #endif
 
@@ -183,7 +183,7 @@ __declare_extern_inline(double)
 sqrt (double x)
 {
 	double result;
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
         if (isless(x, 0.0))
             errno = EDOM;
 #endif
@@ -290,7 +290,7 @@ __declare_extern_inline(float)
 sqrtf (float x)
 {
 	float result;
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
         if (isless(x, 0.0f))
             errno = EDOM;
 #endif
diff --git a/newlib/libc/machine/riscv/machine/math.h b/newlib/libc/machine/riscv/machine/math.h
@@ -44,7 +44,7 @@
 #define __RISCV_HARD_FLOAT 32
 #endif
 
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
 #include <errno.h>
 #endif
 
@@ -189,7 +189,7 @@ __declare_extern_inline(double)
 sqrt (double x)
 {
 	double result;
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
         if (isless(x, 0.0))
             errno = EDOM;
 #endif
@@ -296,7 +296,7 @@ __declare_extern_inline(float)
 sqrtf (float x)
 {
 	float result;
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
         if (isless(x, 0.0f))
             errno = EDOM;
 #endif
diff --git a/newlib/libm/common/fma_inc.h b/newlib/libm/common/fma_inc.h
@@ -149,7 +149,7 @@ dd_mul(FLOAT_T a, FLOAT_T b)
 	return (ret);
 }
 
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
 static FLOAT_T
 _scalbn_no_errno(FLOAT_T x, int n)
 {
diff --git a/newlib/libm/machine/aarch64/s_sqrt.c b/newlib/libm/machine/aarch64/s_sqrt.c
@@ -31,7 +31,7 @@ double
 sqrt (double x)
 {
   double result;
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
   if (isless(x, 0.0))
       return __math_invalid(x);
 #endif
diff --git a/newlib/libm/machine/aarch64/sf_sqrt.c b/newlib/libm/machine/aarch64/sf_sqrt.c
@@ -31,7 +31,7 @@ float
 sqrtf (float x)
 {
   float result;
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
   if (isless(x, 0.0f))
       return __math_invalidf(x);
 #endif
diff --git a/newlib/libm/machine/arm/s_sqrt.c b/newlib/libm/machine/arm/s_sqrt.c
@@ -31,7 +31,7 @@ double
 sqrt(double x)
 {
 	double result;
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
         if (isless(x, 0.0))
             return __math_invalid(x);
 #endif
diff --git a/newlib/libm/machine/arm/sf_sqrt.c b/newlib/libm/machine/arm/sf_sqrt.c
@@ -32,7 +32,7 @@ float
 sqrtf(float x)
 {
 	float result;
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
         if (isless(x, 0.0f))
             errno = EDOM;
 #endif
diff --git a/newlib/libm/machine/riscv/s_sqrt.c b/newlib/libm/machine/riscv/s_sqrt.c
@@ -40,7 +40,7 @@ __float64
 sqrt64(__float64 x)
 {
 	__float64 result;
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
         if (isless(x, 0.0))
             return __math_invalid(x);
 #endif
diff --git a/newlib/libm/machine/riscv/sf_sqrt.c b/newlib/libm/machine/riscv/sf_sqrt.c
@@ -41,7 +41,7 @@ float
 sqrtf (float x)
 {
 	float result;
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
         if (isless(x, 0.0f))
             return __math_invalidf(x);
 #endif
diff --git a/newlib/libm/math/sl_hypot.c b/newlib/libm/math/sl_hypot.c
@@ -17,7 +17,7 @@ hypotl(long double x, long double y)
 
     /* Keep it simple for now...  */
     long double z = sqrtl((x * x) + (y * y));
-#ifdef _WANT_MATH_ERRNO
+#ifdef __MATH_ERRNO
     if (!finite(z) && finite(x) && finite(y))
         errno = ERANGE;
 #endif
diff --git a/picolibc.h.in b/picolibc.h.in
@@ -144,7 +144,7 @@
 #cmakedefine __IO_DEFAULT_MINIMAL
 
 /* math library sets errno */
-#cmakedefine _WANT_MATH_ERRNO
+#cmakedefine __MATH_ERRNO
 
 #cmakedefine _WANT_REGISTER_FINI
 

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ dd_mul(FLOAT_T a, FLOAT_T b)`
`149`	`149`	`return (ret);`
`150`	`150`	`}`
`151`	`151`
`152`		`-#ifdef _WANT_MATH_ERRNO`
	`152`	`+#ifdef __MATH_ERRNO`
`153`	`153`	`static FLOAT_T`
`154`	`154`	`_scalbn_no_errno(FLOAT_T x, int n)`
`155`	`155`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ double`
`31`	`31`	`sqrt (double x)`
`32`	`32`	`{`
`33`	`33`	`double result;`
`34`		`-#ifdef _WANT_MATH_ERRNO`
	`34`	`+#ifdef __MATH_ERRNO`
`35`	`35`	`if (isless(x, 0.0))`
`36`	`36`	`return __math_invalid(x);`
`37`	`37`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ float`
`31`	`31`	`sqrtf (float x)`
`32`	`32`	`{`
`33`	`33`	`float result;`
`34`		`-#ifdef _WANT_MATH_ERRNO`
	`34`	`+#ifdef __MATH_ERRNO`
`35`	`35`	`if (isless(x, 0.0f))`
`36`	`36`	`return __math_invalidf(x);`
`37`	`37`	`#endif`