public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/azanella/redir-refactor] Remove printf-ldbl.h Date: Thu, 3 Mar 2022 19:23:25 +0000 (GMT) [thread overview] Message-ID: <20220303192325.32D303857C43@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a15b9270c2c13de9d8839ef4ee77528e11655ff5 commit a15b9270c2c13de9d8839ef4ee77528e11655ff5 Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> 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 <stdio-common/bits/printf-ldbl.h> diff --git a/stdio-common/Makefile b/stdio-common/Makefile index d8498bbd62..acb9822cd7 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 := \ ctermid cuserid \ 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 <printf.h> 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 - <https://www.gnu.org/licenses/>. */ - -#ifndef _PRINTF_H -# error "Never include <bits/printf-ldbl.h> directly; use <printf.h> 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 <stddef.h> #include <stdarg.h> +#include <bits/floatn.h> 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 <bits/floatn.h> -#if defined __LDBL_COMPAT || __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 -# include <bits/printf-ldbl.h> -#endif - __END_DECLS #endif /* printf.h */
reply other threads:[~2022-03-03 19:23 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220303192325.32D303857C43@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).