@@ -101,7 +101,6 @@ libnldbl-calls = \
getpayload \
hypot \
ilogb \
- iovfscanf \
isinf \
isnan \
isoc23_fscanf \
@@ -428,11 +427,16 @@ endif
ifeq ($(subdir), stdio-common)
tests += \
+ test-nldbl-fscanf-redirect \
+ test-nldbl-fscanf-redirect-static \
tst-nldbl-scanf-binary-c11 \
tst-nldbl-scanf-binary-c23 \
tst-nldbl-scanf-binary-gnu11 \
tst-nldbl-scanf-binary-gnu89 \
# tests
+tests-static += \
+ test-nldbl-fscanf-redirect-static \
+# tests-static
# Some versions of GCC supported for building glibc do not support -std=c23
# (added in GCC 14), or the older name -std=c2x (added in GCC 9), so
@@ -446,6 +450,12 @@ CFLAGS-tst-nldbl-scanf-binary-gnu11.c += -mlong-double-64 -std=gnu11 \
-DOBJPFX=\"$(objpfx)\"
CFLAGS-tst-nldbl-scanf-binary-gnu89.c += -mlong-double-64 -std=gnu89 \
-DOBJPFX=\"$(objpfx)\"
+CFLAGS-test-nldbl-fscanf-redirect.c += -mlong-double-64
+CFLAGS-test-nldbl-fscanf-redirect-static.c += -mlong-double-64
+$(objpfx)test-nldbl-fscanf-redirect: \
+ $(common-objpfx)math/libnldbl_nonshared.a
+$(objpfx)test-nldbl-fscanf-redirect-static: \
+ $(common-objpfx)math/libnldbl_nonshared.a
endif
@@ -1336,3 +1336,7 @@ compat_symbol (libc, __nldbl___fprintf_chk, __fprintf_chk, GLIBC_2_3_4);
compat_symbol (libc, __nldbl___vprintf_chk, __vprintf_chk, GLIBC_2_3_4);
compat_symbol (libc, __nldbl___vfprintf_chk, __vfprintf_chk, GLIBC_2_3_4);
#endif
+#if SHLIB_COMPAT (libc, LONG_DOUBLE_COMPAT_VERSION, GLIBC_2_29)
+compat_symbol (libc, __nldbl__IO_vfscanf, __nldbl__IO_vfscanf,
+ LONG_DOUBLE_COMPAT_VERSION);
+#endif
@@ -13,7 +13,7 @@ fscanf (FILE *stream, const char *fmt, ...)
int done;
va_start (arg, fmt);
- done = __nldbl__IO_vfscanf (stream, fmt, arg, NULL);
+ done = __nldbl_vfscanf (stream, fmt, arg);
va_end (arg);
return done;
deleted file mode 100644
@@ -1,13 +0,0 @@
-/* This file defines one of the deprecated scanf variants. */
-#include <features.h>
-#undef __GLIBC_USE_DEPRECATED_SCANF
-#define __GLIBC_USE_DEPRECATED_SCANF 1
-
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-_IO_vfscanf (FILE *s, const char *fmt, va_list ap, int *errp)
-{
- return __nldbl__IO_vfscanf (s, fmt, ap, errp);
-}
@@ -13,7 +13,7 @@ scanf (const char *fmt, ...)
int done;
va_start (arg, fmt);
- done = __nldbl__IO_vfscanf (stdin, fmt, arg, NULL);
+ done = __nldbl_vfscanf (stdin, fmt, arg);
va_end (arg);
return done;
@@ -9,7 +9,7 @@ int
attribute_hidden
__vfscanf (FILE *s, const char *fmt, va_list ap)
{
- return __nldbl__IO_vfscanf (s, fmt, ap, NULL);
+ return __nldbl_vfscanf (s, fmt, ap);
}
extern __typeof (__vfscanf) vfscanf attribute_hidden;
weak_alias (__vfscanf, vfscanf)
@@ -10,5 +10,5 @@ attribute_hidden
weak_function
vscanf (const char *fmt, va_list ap)
{
- return __nldbl__IO_vfscanf (stdin, fmt, ap, NULL);
+ return __nldbl_vfscanf (stdin, fmt, ap);
}
new file mode 100644
@@ -0,0 +1 @@
+#include "test-nldbl-fscanf-redirect.c"
new file mode 100644
@@ -0,0 +1,4 @@
+25 54.32E-1 thompson
+25 54.32E-1 thompson
+25 54.32E-1 thompson
+25 54.32E-1 thompson
new file mode 100644
@@ -0,0 +1,21 @@
+/* Test fscanf/scanf/vfscanf/vscanf of long double as double without
+ <stdio.h>.
+ Copyright (C) 2024 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/>. */
+
+#define EXPECTED_LONG_DOUBLE_VALUE 5.432
+#include <test-fscanf.c>
new file mode 100644
@@ -0,0 +1,4 @@
+25 54.32E-1 thompson
+25 54.32E-1 thompson
+25 54.32E-1 thompson
+25 54.32E-1 thompson
Fix BZ #31776 by 1. Making __nldbl__IO_vfscanf a compat symbol. 2. Remove _IO_vfscanf from libnldbl_nonshared.a. Since _IO_vfscanf is a compat symbol, there is no point to provide it in libnldbl_nonshared.a. 3. Change libnldbl_nonshared.a to call __nldbl_vfscanf, instead of __nldbl__IO_vfscanf. Add fscanf/scanf/vfscanf/vscanf tests of long double as double without including <stdio.h>. Signed-off-by: H.J. Lu <hjl.tools@gmail.com> --- sysdeps/ieee754/ldbl-opt/Makefile | 12 ++++++++++- sysdeps/ieee754/ldbl-opt/nldbl-compat.c | 4 ++++ sysdeps/ieee754/ldbl-opt/nldbl-fscanf.c | 2 +- sysdeps/ieee754/ldbl-opt/nldbl-iovfscanf.c | 13 ------------ sysdeps/ieee754/ldbl-opt/nldbl-scanf.c | 2 +- sysdeps/ieee754/ldbl-opt/nldbl-vfscanf.c | 2 +- sysdeps/ieee754/ldbl-opt/nldbl-vscanf.c | 2 +- .../test-nldbl-fscanf-redirect-static.c | 1 + .../test-nldbl-fscanf-redirect-static.input | 4 ++++ .../ldbl-opt/test-nldbl-fscanf-redirect.c | 21 +++++++++++++++++++ .../ldbl-opt/test-nldbl-fscanf-redirect.input | 4 ++++ 11 files changed, 49 insertions(+), 18 deletions(-) delete mode 100644 sysdeps/ieee754/ldbl-opt/nldbl-iovfscanf.c create mode 100644 sysdeps/ieee754/ldbl-opt/test-nldbl-fscanf-redirect-static.c create mode 100644 sysdeps/ieee754/ldbl-opt/test-nldbl-fscanf-redirect-static.input create mode 100644 sysdeps/ieee754/ldbl-opt/test-nldbl-fscanf-redirect.c create mode 100644 sysdeps/ieee754/ldbl-opt/test-nldbl-fscanf-redirect.input