From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 95846 invoked by alias); 25 Oct 2019 15:33:34 -0000 Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: glibc-cvs-owner@sourceware.org List-Subscribe: Received: (qmail 95824 invoked by uid 10126); 25 Oct 2019 15:33:34 -0000 Date: Fri, 25 Oct 2019 15:33:00 -0000 Message-ID: <20191025153334.95823.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Gabriel F.T.Gomes To: glibc-cvs@sourceware.org Subject: [glibc/gabriel/powerpc-ieee128-printscan] ldbl-128ibm-compat: Add argp_error and argp_failure X-Act-Checkin: glibc X-Git-Author: Gabriel F. T. Gomes X-Git-Refname: refs/heads/gabriel/powerpc-ieee128-printscan X-Git-Oldrev: bc2b28d5a00c7f375428d4cc69a6a6526cf2978d X-Git-Newrev: d77fb42a4ed1dded279b791cbb3c8d8e86da5954 X-SW-Source: 2019-q4/txt/msg00151.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d77fb42a4ed1dded279b791cbb3c8d8e86da5954 commit d77fb42a4ed1dded279b791cbb3c8d8e86da5954 Author: Gabriel F. T. Gomes Date: Thu Jul 11 11:47:25 2019 -0300 ldbl-128ibm-compat: Add argp_error and argp_failure 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. Diff: --- sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 14 ++++++++ sysdeps/ieee754/ldbl-128ibm-compat/Versions | 3 ++ .../ieee754/ldbl-128ibm-compat/ieee128-argp-help.c | 42 ++++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile index 031ee0b..dc1ceaa 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 8b23fdf..8e80b2b 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 0000000..fe77e63 --- /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)