[v2,09/30] ldbl-128ibm-compat: Add argp_error and argp_failure
Commit Message
From: "Gabriel F. T. Gomes" <gabrielftg@linux.ibm.com>
No changes since v1.
-- 8< --
Use the recently added, internal functions, __argp_error_internal and
__argp_failure_internal, to provide argp_error and argp_failure that can
take long double arguments with IEEE binary128 format on platforms where
long double can also take double format or some non-IEEE format
(currently, this means powerpc64le).
Tested for powerpc64le.
---
sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 14 +++++++
sysdeps/ieee754/ldbl-128ibm-compat/Versions | 3 ++
.../ldbl-128ibm-compat/ieee128-argp-help.c | 42 +++++++++++++++++++
3 files changed, 59 insertions(+)
create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-argp-help.c
Comments
On 10/25/19 10:33 AM, Gabriel F. T. Gomes wrote:
> From: "Gabriel F. T. Gomes" <gabrielftg@linux.ibm.com>
>
> No changes since v1.
>
> -- 8< --
> Use the recently added, internal functions, __argp_error_internal and
> __argp_failure_internal, to provide argp_error and argp_failure that can
> take long double arguments with IEEE binary128 format on platforms where
> long double can also take double format or some non-IEEE format
> (currently, this means powerpc64le).
>
> Tested for powerpc64le.
This looks OK to me.
@@ -160,6 +160,20 @@ CFLAGS-test-wprintf-chk-redir-ibm128.c += -mabi=ibmlongdouble -Wno-psabi \
-Wno-unused-result
endif
+ifeq ($(subdir),argp)
+ldbl-extra-routines += argp-help
+
+$(objpfx)tst-ieee128-argp.c: tst-ldbl-argp.c
+ cp $< $@
+
+$(objpfx)tst-ibm128-argp.c: tst-ldbl-argp.c
+ cp $< $@
+
+tests-internal += tst-ieee128-argp tst-ibm128-argp
+CFLAGS-tst-ieee128-argp.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi
+CFLAGS-tst-ibm128-argp.c += -mabi=ibmlongdouble -Wno-psabi
+endif
+
# Add IEEE binary128 files as make targets.
routines += $(foreach r,$(ldbl-extra-routines),ieee128-$(r))
@@ -180,5 +180,8 @@ libc {
__vfwscanfieee128;
__vswscanfieee128;
__vwscanfieee128;
+
+ __argp_errorieee128;
+ __argp_failureieee128;
}
}
new file mode 100644
@@ -0,0 +1,42 @@
+/* Wrapper for argp_error and argp_failure. 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 <argp.h>
+#include <libio/libioP.h>
+
+void
+___ieee128_argp_error (const struct argp_state *state, const char *fmt, ...)
+{
+ va_list ap;
+ va_start (ap, fmt);
+ __argp_error_internal (state, fmt, ap, PRINTF_LDBL_USES_FLOAT128);
+ va_end (ap);
+}
+strong_alias (___ieee128_argp_error, __argp_errorieee128)
+
+void
+___ieee128_argp_failure (const struct argp_state *state, int status,
+ int errnum, const char *fmt, ...)
+{
+ va_list ap;
+ va_start (ap, fmt);
+ __argp_failure_internal (state, status, errnum, fmt, ap,
+ PRINTF_LDBL_USES_FLOAT128);
+ va_end (ap);
+}
+strong_alias (___ieee128_argp_failure, __argp_failureieee128)