Browse Source

uclibc: Fix double promotion warning

Add casts where necessary to convince clang that the promotion of float
to double is intentional.

Co-authored-by: Sven Linker <sven.linker@kernkonzept.com>
Signed-off-by: Marcus Haehnel <marcus.haehnel@kernkonzept.com>
Marcus Haehnel 9 months ago
parent
commit
5820f4b586
6 changed files with 14 additions and 14 deletions
  1. 2 2
      libc/stdio/_fpmaxtostr.c
  2. 5 5
      libc/stdlib/_strtod.c
  3. 3 3
      libm/cexp.c
  4. 1 1
      libm/float_wrappers.c
  5. 2 2
      libm/nan.c
  6. 1 1
      libm/w_cabs.c

+ 2 - 2
libc/stdio/_fpmaxtostr.c

@@ -318,8 +318,8 @@ ssize_t _fpmaxtostr(FILE * fp, __fpmax_t x, struct printf_info *info,
 
 #else  /* __UCLIBC_HAS_HEXADECIMAL_FLOATS__ */
 
-#define lower_bnd    1e8
-#define upper_bnd    1e9
+#define lower_bnd    (__fpmax_t)1e8
+#define upper_bnd    (__fpmax_t)1e9
 #define power_table  exp10_table
 #define dpb          DIGITS_PER_BLOCK
 #define base         10

+ 5 - 5
libc/stdlib/_strtod.c

@@ -256,7 +256,7 @@ __fpmax_t attribute_hidden __XL_NPP(__strtofpmax)(const Wchar *str, Wchar **endp
 	}
 #endif
 
-	number = 0.;
+	number = (__fpmax_t)0;
 #ifdef _STRTOD_NEED_NUM_DIGITS
 	num_digits = -1;
 #endif
@@ -339,7 +339,7 @@ __fpmax_t attribute_hidden __XL_NPP(__strtofpmax)(const Wchar *str, Wchar **endp
 				while ((pos[j] | 0x20) == nan_inf_str[i+1+j]) {
 					++j;
 					if (!nan_inf_str[i+1+j]) {
-						number = i / 0.;
+						number = i / (__fpmax_t)0.;
 						if (negative) {	/* Correct for sign. */
 							number = -number;
 						}
@@ -414,7 +414,7 @@ __fpmax_t attribute_hidden __XL_NPP(__strtofpmax)(const Wchar *str, Wchar **endp
 	}
 
 #ifdef _STRTOD_ZERO_CHECK
-	if (number == 0.) {
+	if (number == (__fpmax_t)0.) {
 		goto DONE;
 	}
 #endif
@@ -515,7 +515,7 @@ float __XL_NPP(strtof)(const Wchar *str, Wchar **endptr   __LOCALE_PARAM )
 	x = __XL_NPP(__strtofpmax)(str, endptr, 0   __LOCALE_ARG );
 	y = (float) x;
 
-	__fp_range_check(y, x);
+	__fp_range_check((__fpmax_t)y, x);
 
 	return y;
 #endif
@@ -549,7 +549,7 @@ double __XL_NPP(strtod)(const Wchar *__restrict str,
 	x = __XL_NPP(__strtofpmax)(str, endptr, 0   __LOCALE_ARG );
 	y = (double) x;
 
-	__fp_range_check(y, x);
+	__fp_range_check((__fpmax_t)y, x);
 
 	return y;
 #endif

+ 3 - 3
libm/cexp.c

@@ -38,10 +38,10 @@ libm_hidden_proto(cexpf)
 __complex__ float cexpf(__complex__ float z)
 {
 	__complex__ float ret;
-	double r_exponent = exp(__real__ z);
+	double r_exponent = exp((double)__real__ z);
 
-	__real__ ret = r_exponent * cosf(__imag__ z);
-	__imag__ ret = r_exponent * sinf(__imag__ z);
+	__real__ ret = r_exponent * (double) cosf(__imag__ z);
+	__imag__ ret = r_exponent * (double) sinf(__imag__ z);
 
 	return ret;
 }

+ 1 - 1
libm/float_wrappers.c

@@ -230,7 +230,7 @@ long_WRAPPER1(lround)
 float modff (float x, float *iptr)
 {
 	double y, result;
-	result = modf( x, &y );
+	result = modf( (double)x, &y );
 	*iptr = (float)y;
 	return (float) result;
 }

+ 2 - 2
libm/nan.c

@@ -28,7 +28,7 @@ double nan (const char *tagp)
 		sprintf (buf, "NAN(%s)", tagp);
 		return strtod (buf, NULL);
 	}
-	return NAN;
+	return (double)NAN;
 }
 libm_hidden_def(nan)
 
@@ -53,7 +53,7 @@ long double nanl (const char *tagp)
 		sprintf (buf, "NAN(%s)", tagp);
 		return strtold (buf, NULL);
 	}
-	return NAN;
+	return (long double)NAN;
 }
 libm_hidden_def(nanl)
 #endif

+ 1 - 1
libm/w_cabs.c

@@ -17,7 +17,7 @@ libm_hidden_def(cabs)
 libm_hidden_proto(cabsf)
 float cabsf(float _Complex z)
 {
-	return (float) hypot(__real__ z, __imag__ z);
+	return (float) hypot((double)__real__ z, (double)__imag__ z);
 }
 libm_hidden_def(cabsf)