aboutsummaryrefslogtreecommitdiff
path: root/stdio-common/Makefile
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2023-03-02 19:10:37 +0000
committerJoseph Myers <joseph@codesourcery.com>2023-03-02 19:10:37 +0000
commitdee2bea048b688b643a9a3b44b26ca9f7a706fe8 (patch)
tree3e7cd1057154850968d13023bc2e082cfc7940ad /stdio-common/Makefile
parent51aeab9a363a0d000d0912aa3d6490463a26fba2 (diff)
downloadglibc-dee2bea048b688b643a9a3b44b26ca9f7a706fe8.zip
glibc-dee2bea048b688b643a9a3b44b26ca9f7a706fe8.tar.gz
glibc-dee2bea048b688b643a9a3b44b26ca9f7a706fe8.tar.bz2
C2x scanf binary constant handling
C2x adds binary integer constants starting with 0b or 0B, and supports those constants for the %i scanf format (in addition to the %b format, which isn't yet implemented for scanf in glibc). Implement that scanf support for glibc. As with the strtol support, this is incompatible with previous C standard versions, in that such an input string starting with 0b or 0B was previously required to be parsed as 0 (with the rest of the input potentially matching subsequent parts of the scanf format string). Thus this patch adds 12 new __isoc23_* functions per long double format (12, 24 or 36 depending on how many long double formats the glibc configuration supports), with appropriate header redirection support (generally very closely following that for the __isoc99_* scanf functions - note that __GLIBC_USE (DEPRECATED_SCANF) takes precedence over __GLIBC_USE (C2X_STRTOL), so the case of GNU extensions to C89 continues to get old-style GNU %a and does not get this new feature). The function names would remain as __isoc23_* even if C2x ends up published in 2024 rather than 2023. When scanf %b support is added, I think it will be appropriate for all versions of scanf to follow C2x rules for inputs to the %b format (given that there are no compatibility concerns for a new format). Tested for x86_64 (full glibc testsuite). The first version was also tested for powerpc (32-bit) and powerpc64le (stdio-common/ and wcsmbs/ tests), and with build-many-glibcs.py.
Diffstat (limited to 'stdio-common/Makefile')
-rw-r--r--stdio-common/Makefile22
1 files changed, 22 insertions, 0 deletions
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 92a3499..a14ee48 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -47,6 +47,12 @@ routines := \
isoc99_vfscanf \
isoc99_vscanf \
isoc99_vsscanf \
+ isoc23_fscanf \
+ isoc23_scanf \
+ isoc23_sscanf \
+ isoc23_vfscanf \
+ isoc23_vscanf \
+ isoc23_vsscanf \
itoa-digits \
itoa-udigits \
itowa-digits \
@@ -214,6 +220,10 @@ tests := \
tst-put-error \
tst-renameat2 \
tst-rndseek \
+ tst-scanf-binary-c11 \
+ tst-scanf-binary-c2x \
+ tst-scanf-binary-gnu11 \
+ tst-scanf-binary-gnu89 \
tst-scanf-round \
tst-setvbuf1 \
tst-sprintf \
@@ -415,6 +425,10 @@ CFLAGS-isoc99_vfscanf.c += -fexceptions
CFLAGS-isoc99_vscanf.c += -fexceptions
CFLAGS-isoc99_fscanf.c += -fexceptions
CFLAGS-isoc99_scanf.c += -fexceptions
+CFLAGS-isoc23_vfscanf.c += -fexceptions
+CFLAGS-isoc23_vscanf.c += -fexceptions
+CFLAGS-isoc23_fscanf.c += -fexceptions
+CFLAGS-isoc23_scanf.c += -fexceptions
CFLAGS-dprintf.c += $(config-cflags-wno-ignored-attributes)
@@ -440,6 +454,14 @@ CFLAGS-tst-bz11319-fortify2.c += -D_FORTIFY_SOURCE=2
CFLAGS-tst-memstream-string.c += -fno-builtin-fprintf
+# Some versions of GCC supported for building glibc do not support -std=c2x, so
+# the test for that version uses -std=c11 and then _ISOC2X_SOURCE is defined in
+# the test as needed.
+CFLAGS-tst-scanf-binary-c11.c += -std=c11 -DOBJPFX=\"$(objpfx)\"
+CFLAGS-tst-scanf-binary-c2x.c += -std=c11 -DOBJPFX=\"$(objpfx)\"
+CFLAGS-tst-scanf-binary-gnu11.c += -std=gnu11 -DOBJPFX=\"$(objpfx)\"
+CFLAGS-tst-scanf-binary-gnu89.c += -std=gnu89 -DOBJPFX=\"$(objpfx)\"
+
CPPFLAGS += $(libio-mtsafe)
$(objpfx)tst-setvbuf1.out: /dev/null $(objpfx)tst-setvbuf1