From patchwork Fri Oct 25 15:33:50 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: 35321 Received: (qmail 107866 invoked by alias); 25 Oct 2019 15:35:28 -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 107791 invoked by uid 89); 25 Oct 2019 15:35:27 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.8 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= X-HELO: smtpout1.mo803.mail-out.ovh.net From: "Gabriel F. T. Gomes" To: Subject: [PATCH v2 10/30] ldbl-128ibm-compat: Add err.h functions Date: Fri, 25 Oct 2019 12:33:50 -0300 Message-ID: <20191025153410.15405-11-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: 1601874095374126787 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, __vwarnx_internal and __vwarn_internal, to provide err.h functions 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. --- misc/errP.h | 28 ++++++ sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 4 + sysdeps/ieee754/ldbl-128ibm-compat/Versions | 9 ++ .../ieee754/ldbl-128ibm-compat/ieee128-err.c | 93 +++++++++++++++++++ 4 files changed, 134 insertions(+) create mode 100644 misc/errP.h create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-err.c diff --git a/misc/errP.h b/misc/errP.h new file mode 100644 index 0000000000..09e1f72289 --- /dev/null +++ b/misc/errP.h @@ -0,0 +1,28 @@ +/* Prototypes for internal err.h 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 + . */ + +#include +#include + +void +__vwarnx_internal (const char *format, __gnuc_va_list ap, + unsigned int mode_flags); + +void +__vwarn_internal (const char *format, __gnuc_va_list ap, + unsigned int mode_flags); diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile index dc1ceaae7e..6bb0bed2fc 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile @@ -174,6 +174,10 @@ CFLAGS-tst-ieee128-argp.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi CFLAGS-tst-ibm128-argp.c += -mabi=ibmlongdouble -Wno-psabi endif +ifeq ($(subdir),misc) +ldbl-extra-routines += err +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 8e80b2bade..e2b3dda551 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/Versions +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Versions @@ -183,5 +183,14 @@ libc { __argp_errorieee128; __argp_failureieee128; + + __warnieee128; + __warnxieee128; + __vwarnieee128; + __vwarnxieee128; + __errieee128; + __errxieee128; + __verrieee128; + __verrxieee128; } } diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-err.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-err.c new file mode 100644 index 0000000000..8a34508e5e --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-err.c @@ -0,0 +1,93 @@ +/* Wrappers for err.h functions. 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 +#include + +#define VA(call) \ +{ \ + va_list ap; \ + va_start (ap, format); \ + IEEE128_CALL (call); \ + va_end (ap); \ +} + +#define IEEE128_ALIAS(name) \ + strong_alias (___ieee128_##name, __##name##ieee128) + +#define IEEE128_DECL(name) ___ieee128_##name +#define IEEE128_CALL(name) ___ieee128_##name + +void +IEEE128_DECL (vwarn) (const char *format, __gnuc_va_list ap) +{ + __vwarn_internal (format, ap, PRINTF_LDBL_USES_FLOAT128); +} +IEEE128_ALIAS (vwarn) + +void +IEEE128_DECL (vwarnx) (const char *format, __gnuc_va_list ap) +{ + __vwarnx_internal (format, ap, PRINTF_LDBL_USES_FLOAT128); +} +IEEE128_ALIAS (vwarnx) + +void +IEEE128_DECL (warn) (const char *format, ...) +{ + VA (vwarn (format, ap)) +} +IEEE128_ALIAS (warn) + +void +IEEE128_DECL (warnx) (const char *format, ...) +{ + VA (vwarnx (format, ap)) +} +IEEE128_ALIAS (warnx) + +void +IEEE128_DECL (verr) (int status, const char *format, __gnuc_va_list ap) +{ + IEEE128_CALL (vwarn) (format, ap); + exit (status); +} +IEEE128_ALIAS (verr) + +void +IEEE128_DECL (verrx) (int status, const char *format, __gnuc_va_list ap) +{ + IEEE128_CALL (vwarnx) (format, ap); + exit (status); +} +IEEE128_ALIAS (verrx) + +void +IEEE128_DECL (err) (int status, const char *format, ...) +{ + VA (verr (status, format, ap)) +} +IEEE128_ALIAS (err) + +void +IEEE128_DECL (errx) (int status, const char *format, ...) +{ + VA (verrx (status, format, ap)) +} +IEEE128_ALIAS (errx)