From patchwork Fri Oct 25 15:33:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gabriel F. T. Gomes" X-Patchwork-Id: 35320 Received: (qmail 107344 invoked by alias); 25 Oct 2019 15:35:23 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 107246 invoked by uid 89); 25 Oct 2019 15:35:23 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 spammy=HX-Languages-Length:3754 X-HELO: smtpout1.mo803.mail-out.ovh.net From: "Gabriel F. T. Gomes" To: Subject: [PATCH v2 09/30] ldbl-128ibm-compat: Add argp_error and argp_failure Date: Fri, 25 Oct 2019 12:33:49 -0300 Message-ID: <20191025153410.15405-10-gabriel@inconstante.net.br> In-Reply-To: <20191025153410.15405-1-gabriel@inconstante.net.br> References: <20191025153410.15405-1-gabriel@inconstante.net.br> MIME-Version: 1.0 X-Ovh-Tracer-Id: 1600466721758170819 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrleefgdelvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecu From: "Gabriel F. T. Gomes" 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 diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile index 031ee0b38f..dc1ceaae7e 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile @@ -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)) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Versions b/sysdeps/ieee754/ldbl-128ibm-compat/Versions index 8b23fdf56f..8e80b2bade 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/Versions +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Versions @@ -180,5 +180,8 @@ libc { __vfwscanfieee128; __vswscanfieee128; __vwscanfieee128; + + __argp_errorieee128; + __argp_failureieee128; } } diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-argp-help.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-argp-help.c new file mode 100644 index 0000000000..fe77e633df --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-argp-help.c @@ -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 + . */ + +#include +#include + +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)