From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id C24B93886C47; Tue, 29 Mar 2022 20:26:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C24B93886C47 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] Remove printf-ldbl.h X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: faab0d4430c89c3dded1b0a7a00098bb5e54d4c9 X-Git-Newrev: 5725eec17e6f28e70e165aed07f6b7c45209e7c6 Message-Id: <20220329202646.C24B93886C47@sourceware.org> Date: Tue, 29 Mar 2022 20:26:46 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Mar 2022 20:26:46 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5725eec17e6f28e70e165aed07f6b7c45209e7c6 commit 5725eec17e6f28e70e165aed07f6b7c45209e7c6 Author: Adhemerval Zanella Date: Tue Mar 1 16:35:57 2022 -0300 Remove printf-ldbl.h The functions which require different alias to long double depending of the ABI now uses a set os macros that defines the expected alias on the function prototype, instead of redefine them using the __LDBL_REDIR_DEC macros. Checked on x86_64-linux-gnu and powerpc64le-linux-gnu. Diff: --- include/bits/printf-ldbl.h | 1 - stdio-common/Makefile | 2 +- stdio-common/bits/printf-ldbl.h | 23 ----------------------- stdio-common/printf.h | 13 +++++-------- 4 files changed, 6 insertions(+), 33 deletions(-) diff --git a/include/bits/printf-ldbl.h b/include/bits/printf-ldbl.h deleted file mode 100644 index 10d534b9b3..0000000000 --- a/include/bits/printf-ldbl.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 435cd8904f..402bd4e158 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -22,7 +22,7 @@ subdir := stdio-common include ../Makeconfig -headers := stdio_ext.h printf.h bits/printf-ldbl.h bits/stdio_lim.h +headers := stdio_ext.h printf.h bits/stdio_lim.h routines := \ _itoa \ diff --git a/stdio-common/bits/printf-ldbl.h b/stdio-common/bits/printf-ldbl.h deleted file mode 100644 index d3300ff597..0000000000 --- a/stdio-common/bits/printf-ldbl.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -mlong-double-64 compatibility mode for functions. - Copyright (C) 2006-2022 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 - . */ - -#ifndef _PRINTF_H -# error "Never include directly; use instead." -#endif - -__LDBL_REDIR_DECL (printf_size) diff --git a/stdio-common/printf.h b/stdio-common/printf.h index 46993e031e..57e50fe7c4 100644 --- a/stdio-common/printf.h +++ b/stdio-common/printf.h @@ -29,6 +29,7 @@ __BEGIN_DECLS #include #include +#include struct printf_info @@ -173,20 +174,16 @@ enum of magnitude used for numbers ('k' for kilo, 'm' for mega etc). If the format specifier is a uppercase character powers of 1000 are used. Otherwise powers of 1024. */ -extern int printf_size (FILE *__restrict __fp, - const struct printf_info *__info, - const void *const *__restrict __args) __THROW; +extern int __REDIRECT_LDBL_NTH (printf_size, (FILE *__restrict __fp, + const struct printf_info *__info, + const void *const *__restrict __args), + __printf_sizeieee128, __nldbl_printf_size); /* This is the appropriate argument information function for `printf_size'. */ extern int printf_size_info (const struct printf_info *__restrict __info, size_t __n, int *__restrict __argtypes) __THROW; -#include -#if defined __LDBL_COMPAT || __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 -# include -#endif - __END_DECLS #endif /* printf.h */