diff options
| -rw-r--r-- | stdlib/strfrom-skeleton.c | 3 | ||||
| -rw-r--r-- | sysdeps/generic/fix-float-double-convert-nan.h | 31 | ||||
| -rw-r--r-- | sysdeps/riscv/rvd/fix-float-double-convert-nan.h | 37 |
3 files changed, 70 insertions, 1 deletions
diff --git a/stdlib/strfrom-skeleton.c b/stdlib/strfrom-skeleton.c index 1fba04bf6a..36e9adcad5 100644 --- a/stdlib/strfrom-skeleton.c +++ b/stdlib/strfrom-skeleton.c @@ -27,6 +27,7 @@ #include <printf.h> #include <string.h> #include <locale/localeinfo.h> +#include <fix-float-double-convert-nan.h> #define UCHAR_T char #define L_(Str) Str @@ -61,7 +62,7 @@ STRFROM (char *dest, size_t size, const char *format, FLOAT f) because __printf_fp and __printf_fphex only accept double and long double as the floating-point argument. */ if (__builtin_types_compatible_p (FLOAT, float)) - fpnum.flt = f; + fpnum.flt = keep_sign_conversion (f); else fpnum.value = f; diff --git a/sysdeps/generic/fix-float-double-convert-nan.h b/sysdeps/generic/fix-float-double-convert-nan.h new file mode 100644 index 0000000000..66692262fc --- /dev/null +++ b/sysdeps/generic/fix-float-double-convert-nan.h @@ -0,0 +1,31 @@ +/* Fix for conversion of float NAN to double. Generic version. + Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library. If not, see + <https://www.gnu.org/licenses/>. */ + +#ifndef FIX_FLOAT_DOUBLE_CONVERT_NAN_H +#define FIX_FLOAT_DOUBLE_CONVERT_NAN_H + +/* This function aims to work around conversions of float -NAN + to double returning NAN instead of the correct -NAN in some + architectures. */ +static inline double __attribute__ ((always_inline)) +keep_sign_conversion (float flt) +{ + return flt; +} + +#endif diff --git a/sysdeps/riscv/rvd/fix-float-double-convert-nan.h b/sysdeps/riscv/rvd/fix-float-double-convert-nan.h new file mode 100644 index 0000000000..cab003f3c1 --- /dev/null +++ b/sysdeps/riscv/rvd/fix-float-double-convert-nan.h @@ -0,0 +1,37 @@ +/* Fix for conversion of float NAN to double. RISC-V version.. + Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library. If not, see + <https://www.gnu.org/licenses/>. */ + +#ifndef FIX_FLOAT_DOUBLE_CONVERT_NAN_H +#define FIX_FLOAT_DOUBLE_CONVERT_NAN_H + +#include <math.h> + +/* RISC-V rvd instructions do not preserve the signbit of NAN + when converting from float to double. */ +static inline double +keep_sign_conversion (float flt) +{ + if (__glibc_unlikely (isnan (flt))) + { + float x = copysignf (1.f, flt); + return copysign ((double) flt, (double) x); + } + return flt; +} + +#endif |