From patchwork Tue Oct 15 19:05:09 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: 35000 Received: (qmail 103705 invoked by alias); 15 Oct 2019 19:06:46 -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 103640 invoked by uid 89); 15 Oct 2019 19:06:45 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.7 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=1928 X-HELO: smtpout1.mo528.mail-out.ovh.net From: "Gabriel F. T. Gomes" To: Subject: [PATCH 11/31] ldbl-128ibm-compat: Add error.h functions Date: Tue, 15 Oct 2019 16:05:09 -0300 Message-ID: <20191015190529.11559-12-gabriel@inconstante.net.br> In-Reply-To: <20191015190529.11559-1-gabriel@inconstante.net.br> References: <20191015190529.11559-1-gabriel@inconstante.net.br> MIME-Version: 1.0 X-Ovh-Tracer-Id: 1783706928169078467 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrjeefgddufeefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenuc From: "Gabriel F. T. Gomes" Use the recently added, internal functions, __error_at_line_internal and __error_internal, to provide error.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/errorP.h | 28 ++++++++++ sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 3 +- sysdeps/ieee754/ldbl-128ibm-compat/Versions | 3 ++ .../ldbl-128ibm-compat/ieee128-error.c | 51 +++++++++++++++++++ 4 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 misc/errorP.h create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-error.c diff --git a/misc/errorP.h b/misc/errorP.h new file mode 100644 index 0000000000..c61c49cd61 --- /dev/null +++ b/misc/errorP.h @@ -0,0 +1,28 @@ +/* Prototypes for internal error.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 + +void +__error_internal (int status, int errnum, const char *message, + va_list args, unsigned int mode_flags); + +void +__error_at_line_internal (int status, int errnum, const char *file_name, + unsigned int line_number, const char *message, + va_list args, unsigned int mode_flags); diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile index 6bb0bed2fc..a09209a2dd 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile @@ -175,7 +175,8 @@ CFLAGS-tst-ibm128-argp.c += -mabi=ibmlongdouble -Wno-psabi endif ifeq ($(subdir),misc) -ldbl-extra-routines += err +ldbl-extra-routines += err \ + error endif # Add IEEE binary128 files as make targets. diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Versions b/sysdeps/ieee754/ldbl-128ibm-compat/Versions index e2b3dda551..dead38cdcb 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/Versions +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Versions @@ -192,5 +192,8 @@ libc { __errxieee128; __verrieee128; __verrxieee128; + + __errorieee128; + __error_at_lineieee128; } } diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-error.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-error.c new file mode 100644 index 0000000000..9c74e060d7 --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-error.c @@ -0,0 +1,51 @@ +/* Wrappers for error.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 IEEE128_ALIAS(name) \ + strong_alias (___ieee128_##name, __##name##ieee128) + +#define IEEE128_DECL(name) ___ieee128_##name + +void +IEEE128_DECL (error) (int status, int errnum, const char *message, ...) +{ + va_list ap; + va_start (ap, message); + __error_internal (status, errnum, message, ap, + PRINTF_LDBL_USES_FLOAT128); + va_end (ap); +} +IEEE128_ALIAS (error) + +void +IEEE128_DECL (error_at_line) (int status, int errnum, + const char *file_name, + unsigned int line_number, + const char *message, ...) +{ + va_list ap; + va_start (ap, message); + __error_at_line_internal (status, errnum, file_name, line_number, + message, ap, PRINTF_LDBL_USES_FLOAT128); + va_end (ap); +} +IEEE128_ALIAS (error_at_line)