@@ -47,7 +47,10 @@ ldbl-extra-routines += printf_size \
isoc99_sscanf \
isoc99_vfscanf \
isoc99_vscanf \
- isoc99_vsscanf
+ isoc99_vsscanf \
+ obprintf \
+ obstack_chk \
+ vobstack_chk
# Printing long double values with IEEE binary128 format reuses part
# of the internal float128 implementation (__printf_fp, __printf_fphex,
@@ -70,6 +73,14 @@ tests-internal += test-wprintf-ieee128 test-wprintf-ibm128
CFLAGS-test-wprintf-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi
CFLAGS-test-wprintf-ibm128.c += -mabi=ibmlongdouble -Wno-psabi
+tests-internal += test-obstack-ieee128 test-obstack-ibm128
+CFLAGS-test-obstack-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi
+CFLAGS-test-obstack-ibm128.c += -mabi=ibmlongdouble -Wno-psabi
+
+tests-internal += test-obstack-chk-ieee128 test-obstack-chk-ibm128
+CFLAGS-test-obstack-chk-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi
+CFLAGS-test-obstack-chk-ibm128.c += -mabi=ibmlongdouble -Wno-psabi
+
tests-internal += test-scanf-ieee128 test-scanf-ibm128
CFLAGS-test-scanf-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi
CFLAGS-test-scanf-ibm128.c += -mabi=ibmlongdouble -Wno-psabi
@@ -165,6 +165,11 @@ libc {
__vswprintf_chkieee128;
__vwprintf_chkieee128;
+ __obstack_printfieee128;
+ __obstack_vprintfieee128;
+ __obstack_printf_chkieee128;
+ __obstack_vprintf_chkieee128;
+
__fscanfieee128;
__scanfieee128;
__sscanfieee128;
new file mode 100644
@@ -0,0 +1,42 @@
+/* Wrapper for obstack_vprintf and obstack_printf. IEEE128 version.
+ Copyright (C) 2018 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <stdarg.h>
+#include <libio/libioP.h>
+
+int
+__ieee128_obstack_vprintf (struct obstack *obstack, const char *format,
+ va_list ap)
+{
+ return __obstack_vprintf_internal (obstack, format, ap,
+ PRINTF_LDBL_USES_FLOAT128);
+}
+strong_alias (__ieee128_obstack_vprintf, __obstack_vprintfieee128)
+
+int
+__ieee128_obstack_printf (struct obstack *obstack, const char *format, ...)
+{
+ int result;
+ va_list ap;
+ va_start (ap, format);
+ result = __obstack_vprintf_internal (obstack, format, ap,
+ PRINTF_LDBL_USES_FLOAT128);
+ va_end (ap);
+ return result;
+}
+strong_alias (__ieee128_obstack_printf, __obstack_printfieee128)
new file mode 100644
@@ -0,0 +1,39 @@
+/* Wrapper for __obstack_printf_chk. IEEE128 version.
+ Copyright (C) 2018 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <stdarg.h>
+#include <libio/libioP.h>
+
+extern int
+___ieee128_obstack_printf_chk (struct obstack *obstack, int flag,
+ const char *format, ...)
+{
+ va_list ap;
+ int done;
+
+ unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
+ if (flag > 0)
+ mode |= PRINTF_FORTIFY;
+
+ va_start (ap, format);
+ done = __obstack_vprintf_internal (obstack, format, ap, mode);
+ va_end (ap);
+
+ return done;
+}
+strong_alias (___ieee128_obstack_printf_chk, __obstack_printf_chkieee128)
new file mode 100644
@@ -0,0 +1,31 @@
+/* Wrapper for __obstack_vprintf_chk. IEEE128 version.
+ Copyright (C) 2018 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <libio/libioP.h>
+
+extern int
+___ieee128__obstack_vprintf_chk (struct obstack *obstack, int flag,
+ const char *format, va_list ap)
+{
+ unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
+ if (flag > 0)
+ mode |= PRINTF_FORTIFY;
+
+ return __obstack_vprintf_internal (obstack, format, ap, mode);
+}
+strong_alias (___ieee128__obstack_vprintf_chk, __obstack_vprintf_chkieee128)
new file mode 100644
@@ -0,0 +1 @@
+#include <test-obstack-chk-ldbl-compat.c>
new file mode 100644
@@ -0,0 +1 @@
+#include <test-obstack-chk-ldbl-compat.c>
new file mode 100644
@@ -0,0 +1,6 @@
+#define _FORTIFY_SOURCE 2
+#define OBSTACK_FUNCTION __obstack_printf_chk
+#define OBSTACK_FUNCTION_PARAMS (&ob, 1, "%.30Lf", ld)
+#define VOBSTACK_FUNCTION __obstack_vprintf_chk
+#define VOBSTACK_FUNCTION_PARAMS (&ob, 1, "%.30Lf", ap)
+#include <test-obstack-ldbl-compat-template.c>
new file mode 100644
@@ -0,0 +1 @@
+#include <test-obstack-ldbl-compat.c>
new file mode 100644
@@ -0,0 +1 @@
+#include <test-obstack-ldbl-compat.c>
new file mode 100644
@@ -0,0 +1,64 @@
+/* Test for the long double variants of obstrack*printf functions.
+ Copyright (C) 2018 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <malloc.h>
+#include <obstack.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+
+#include <support/check.h>
+
+#define obstack_chunk_alloc malloc
+#define obstack_chunk_free free
+
+static void
+do_test_call (void *last, ...)
+{
+ const char *expected = "-1.000000000000000000000000000000";
+ char *actual = NULL;
+ long double ld = -1;
+ struct obstack ob;
+ va_list ap;
+
+ obstack_init (&ob);
+ OBSTACK_FUNCTION OBSTACK_FUNCTION_PARAMS;
+ actual = (char *) obstack_finish (&ob);
+ TEST_VERIFY (strncmp (expected, actual, 33) == 0);
+ obstack_free (&ob, NULL);
+ actual = NULL;
+
+ obstack_init (&ob);
+ va_start (ap, last);
+ VOBSTACK_FUNCTION VOBSTACK_FUNCTION_PARAMS;
+ va_end (ap);
+ actual = (char *) obstack_finish (&ob);
+ TEST_VERIFY (strncmp (expected, actual, 33) == 0);
+ obstack_free (&ob, NULL);
+ actual = NULL;
+}
+
+static int
+do_test (void)
+{
+ long double ld = -1;
+ do_test_call (NULL, ld);
+ return 0;
+}
+
+#include <support/test-driver.c>
new file mode 100644
@@ -0,0 +1,6 @@
+#define _FORTIFY_SOURCE 0
+#define OBSTACK_FUNCTION obstack_printf
+#define OBSTACK_FUNCTION_PARAMS (&ob, "%.30Lf", ld)
+#define VOBSTACK_FUNCTION obstack_vprintf
+#define VOBSTACK_FUNCTION_PARAMS (&ob, "%.30Lf", ap)
+#include <test-obstack-ldbl-compat-template.c>