From: "Gabriel F. T. Gomes" <gabriel@inconstante.net.br>
To: <libc-alpha@sourceware.org>
Subject: [PATCH v2 22/30] Refactor *cvt functions implementation (4/5)
Date: Fri, 25 Oct 2019 15:36:00 -0000 [thread overview]
Message-ID: <20191025153410.15405-23-gabriel@inconstante.net.br> (raw)
In-Reply-To: <20191025153410.15405-1-gabriel@inconstante.net.br>
From: "Gabriel F. T. Gomes" <gabrielftg@linux.ibm.com>
Changes since v1:
- Adapted after patch v1 19/31 (remove hidden_* uses) was dropped.
- Fixed unintended removal of cvt* symbols on alpha and s390x
(now tested with build-many-glibcs.py).
-- 8< --
This patch is to be squashed with the other n/5 refactoring patches.
This patch splits the definition of the symbol names into separate files
for double and long double, which will make it easier to define new
symbol names for IEEE long double functions on powerpc64le.
---
misc/efgcvt-template.c | 23 -----------------------
misc/efgcvt.c | 34 ++++++++++++++++++++++++++++++++++
misc/efgcvt_r-template.c | 27 ---------------------------
misc/efgcvt_r.c | 37 +++++++++++++++++++++++++++++++++++++
misc/qefgcvt.c | 14 ++++++++++++++
misc/qefgcvt_r.c | 17 +++++++++++++++++
6 files changed, 102 insertions(+), 50 deletions(-)
create mode 100644 misc/efgcvt.c
create mode 100644 misc/efgcvt_r.c
diff --git a/misc/efgcvt-template.c b/misc/efgcvt-template.c
index f8650a934f..aeb4e1ea01 100644
--- a/misc/efgcvt-template.c
+++ b/misc/efgcvt-template.c
@@ -76,26 +76,3 @@ __APPEND (FUNC_PREFIX, gcvt) (FLOAT_TYPE value, int ndigit, char *buf)
sprintf (buf, "%.*" FLOAT_FMT_FLAG "g", MIN (ndigit, NDIGIT_MAX), value);
return buf;
}
-
-#if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0)
-# ifdef LONG_DOUBLE_CVT
-# define cvt_symbol(symbol) \
- cvt_symbol_1 (libc, __APPEND (FUNC_PREFIX, symbol), \
- APPEND (FUNC_PREFIX, symbol), GLIBC_2_4)
-# define cvt_symbol_1(lib, local, symbol, version) \
- versioned_symbol (lib, local, symbol, version)
-# else
-# define cvt_symbol(symbol) \
- cvt_symbol_1 (libc, __APPEND (FUNC_PREFIX, symbol), \
- APPEND (q, symbol), GLIBC_2_0); \
- strong_alias (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol))
-# define cvt_symbol_1(lib, local, symbol, version) \
- compat_symbol (lib, local, symbol, version)
-# endif
-#else
-# define cvt_symbol(symbol) \
- strong_alias (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol))
-#endif
-cvt_symbol(fcvt);
-cvt_symbol(ecvt);
-cvt_symbol(gcvt);
diff --git a/misc/efgcvt.c b/misc/efgcvt.c
new file mode 100644
index 0000000000..81ac60415e
--- /dev/null
+++ b/misc/efgcvt.c
@@ -0,0 +1,34 @@
+/* Double versions of *cvt_r functions.
+ Copyright (C) 2019 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
+ <http://www.gnu.org/licenses/>. */
+
+#include "efgcvt.c"
+
+#if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0)
+# define cvt_symbol(symbol) \
+ cvt_symbol_1 (libc, __APPEND (FUNC_PREFIX, symbol), \
+ APPEND (q, symbol), GLIBC_2_0); \
+ strong_alias (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol))
+# define cvt_symbol_1(lib, local, symbol, version) \
+ compat_symbol (lib, local, symbol, version)
+#else
+# define cvt_symbol(symbol) \
+ strong_alias (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol))
+#endif
+cvt_symbol (fcvt);
+cvt_symbol (ecvt);
+cvt_symbol (gcvt);
diff --git a/misc/efgcvt_r-template.c b/misc/efgcvt_r-template.c
index 74baad78a0..f215dbd345 100644
--- a/misc/efgcvt_r-template.c
+++ b/misc/efgcvt_r-template.c
@@ -200,30 +200,3 @@ __APPEND (FUNC_PREFIX, ecvt_r) (FLOAT_TYPE value, int ndigit, int *decpt,
*decpt += exponent;
return 0;
}
-
-#if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0)
-# ifdef LONG_DOUBLE_CVT
-# define cvt_symbol(symbol) \
- cvt_symbol_1 (libc, __APPEND (FUNC_PREFIX, symbol), \
- APPEND (FUNC_PREFIX, symbol), GLIBC_2_4)
-# define cvt_symbol_1(lib, local, symbol, version) \
- libc_hidden_def (local) \
- versioned_symbol (lib, local, symbol, version)
-# else
-# define cvt_symbol(symbol) \
- cvt_symbol_1 (libc, __APPEND (FUNC_PREFIX, symbol), \
- APPEND (q, symbol), GLIBC_2_0); \
- weak_alias (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol))
-# define cvt_symbol_1(lib, local, symbol, version) \
- libc_hidden_def (local) \
- compat_symbol (lib, local, symbol, version)
-# endif
-#else
-# define cvt_symbol(symbol) \
- cvt_symbol_1 (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol))
-# define cvt_symbol_1(local, symbol) \
- libc_hidden_def (local) \
- weak_alias (local, symbol)
-#endif
-cvt_symbol(fcvt_r);
-cvt_symbol(ecvt_r);
diff --git a/misc/efgcvt_r.c b/misc/efgcvt_r.c
new file mode 100644
index 0000000000..aa0eb8ca43
--- /dev/null
+++ b/misc/efgcvt_r.c
@@ -0,0 +1,37 @@
+/* Double versions of reentrant *cvt_r functions.
+ Copyright (C) 2019 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
+ <http://www.gnu.org/licenses/>. */
+
+#include "efgcvt_r.c"
+
+#if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0)
+# define cvt_symbol(symbol) \
+ cvt_symbol_1 (libc, __APPEND (FUNC_PREFIX, symbol), \
+ APPEND (q, symbol), GLIBC_2_0); \
+ weak_alias (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol))
+# define cvt_symbol_1(lib, local, symbol, version) \
+ libc_hidden_def (local) \
+ compat_symbol (lib, local, symbol, version)
+#else
+# define cvt_symbol(symbol) \
+ cvt_symbol_1 (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol))
+# define cvt_symbol_1(local, symbol) \
+ libc_hidden_def (local) \
+ weak_alias (local, symbol)
+#endif
+cvt_symbol (fcvt_r);
+cvt_symbol (ecvt_r);
diff --git a/misc/qefgcvt.c b/misc/qefgcvt.c
index 6987fb0db1..ea48c6b48a 100644
--- a/misc/qefgcvt.c
+++ b/misc/qefgcvt.c
@@ -17,3 +17,17 @@
<https://www.gnu.org/licenses/>. */
#include "efgcvt.c"
+
+#if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0)
+# define cvt_symbol(symbol) \
+ cvt_symbol_1 (libc, __APPEND (FUNC_PREFIX, symbol), \
+ APPEND (FUNC_PREFIX, symbol), GLIBC_2_4)
+# define cvt_symbol_1(lib, local, symbol, version) \
+ versioned_symbol (lib, local, symbol, version)
+#else
+# define cvt_symbol(symbol) \
+ strong_alias (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol))
+#endif
+cvt_symbol(fcvt);
+cvt_symbol(ecvt);
+cvt_symbol(gcvt);
diff --git a/misc/qefgcvt_r.c b/misc/qefgcvt_r.c
index e1f074b49c..d2f36e6d2a 100644
--- a/misc/qefgcvt_r.c
+++ b/misc/qefgcvt_r.c
@@ -18,3 +18,20 @@
<https://www.gnu.org/licenses/>. */
#include "efgcvt_r.c"
+
+#if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0)
+# define cvt_symbol(symbol) \
+ cvt_symbol_1 (libc, __APPEND (FUNC_PREFIX, symbol), \
+ APPEND (FUNC_PREFIX, symbol), GLIBC_2_4)
+# define cvt_symbol_1(lib, local, symbol, version) \
+ libc_hidden_def (local) \
+ versioned_symbol (lib, local, symbol, version)
+#else
+# define cvt_symbol(symbol) \
+ cvt_symbol_1 (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol))
+# define cvt_symbol_1(local, symbol) \
+ libc_hidden_def (local) \
+ weak_alias (local, symbol)
+#endif
+cvt_symbol(fcvt_r);
+cvt_symbol(ecvt_r);
--
2.21.0
next prev parent reply other threads:[~2019-10-25 15:36 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 15:34 [PATCH v2 00/30] Add IEEE long double <-> string functions for powerpc64le Gabriel F. T. Gomes
2019-10-25 15:34 ` [PATCH v2 01/30] ldbl-128ibm-compat: Add regular character printing functions Gabriel F. T. Gomes
2019-10-29 15:42 ` Paul E Murphy
2019-10-30 16:10 ` Gabriel F. T. Gomes
2019-10-25 15:34 ` [PATCH v2 03/30] ldbl-128ibm-compat: Add regular character, fortified " Gabriel F. T. Gomes
2019-11-04 15:43 ` Paul E Murphy
2019-11-05 19:37 ` Gabriel F. T. Gomes
2019-11-08 16:44 ` Paul E Murphy
2019-10-25 15:34 ` [PATCH v2 02/30] ldbl-128ibm-compat: Add wide character " Gabriel F. T. Gomes
2019-11-04 15:08 ` Paul E Murphy
2019-11-04 18:10 ` Gabriel F. T. Gomes
2019-11-04 20:11 ` Paul E Murphy
2019-10-25 15:35 ` [PATCH v2 11/30] ldbl-128ibm-compat: Add error.h functions Gabriel F. T. Gomes
2019-11-08 22:21 ` Paul E Murphy
2019-10-25 15:35 ` [PATCH v2 15/30] ldbl-128ibm-compat: Add syslog functions Gabriel F. T. Gomes
2019-11-14 17:47 ` Paul E Murphy
2019-11-14 18:25 ` Florian Weimer
2019-11-27 19:12 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 06/30] ldbl-128ibm-compat: Test positional arguments Gabriel F. T. Gomes
2019-11-04 16:55 ` Paul E Murphy
2019-11-06 17:28 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 13/30] ldbl-128ibm-compat: Add ISO C99 versions of scanf functions Gabriel F. T. Gomes
2019-11-08 23:26 ` Paul E Murphy
2019-11-21 13:44 ` Gabriel F. T. Gomes
2019-11-22 22:49 ` Gabriel F. T. Gomes
2019-11-27 19:13 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 14/30] ldbl-128ibm-compat: Add obstack printing functions Gabriel F. T. Gomes
2019-11-08 23:42 ` Paul E Murphy
2019-11-27 19:11 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 09/30] ldbl-128ibm-compat: Add argp_error and argp_failure Gabriel F. T. Gomes
2019-11-08 19:58 ` Paul E Murphy
2019-10-25 15:35 ` [PATCH v2 08/30] ldbl-128ibm-compat: Add wide character scanning functions Gabriel F. T. Gomes
2019-11-04 17:47 ` Paul E Murphy
2019-11-11 14:33 ` Gabriel F. T. Gomes
2019-11-22 22:34 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 07/30] ldbl-128ibm-compat: Add regular " Gabriel F. T. Gomes
2019-11-14 21:36 ` Paul E Murphy
2019-10-25 15:35 ` [PATCH v2 05/30] ldbl-128ibm-compat: Test double values Gabriel F. T. Gomes
2019-11-04 16:16 ` Paul E Murphy
2019-10-25 15:35 ` [PATCH v2 10/30] ldbl-128ibm-compat: Add err.h functions Gabriel F. T. Gomes
2019-11-08 20:22 ` Paul E Murphy
2019-11-13 14:24 ` Gabriel F. T. Gomes
2019-11-27 19:11 ` Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 18/30] ldbl-128ibm-compat: Add tests for strfroml, strtold, and wcstold Gabriel F. T. Gomes
2019-11-14 18:26 ` Paul E Murphy
2019-11-27 17:47 ` Gabriel F. T. Gomes
2019-12-03 16:58 ` Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 20/30] Refactor *cvt functions implementation (2/5) Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 12/30] ldbl-128ibm-compat: Reuse tests for err.h and error.h functions Gabriel F. T. Gomes
2019-11-08 22:25 ` Paul E Murphy
2019-10-25 15:36 ` [PATCH v2 19/30] Refactor *cvt functions implementation (1/5) Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 23/30] Refactor *cvt functions implementation (5/5) Gabriel F. T. Gomes
2019-11-14 23:12 ` Paul E Murphy
2019-11-27 17:42 ` Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 16/30] ldbl-128ibm-compat: Add strfmon_l with IEEE long double format Gabriel F. T. Gomes
2019-11-14 18:03 ` Paul E Murphy
2019-11-27 17:43 ` Gabriel F. T. Gomes
2019-12-03 16:57 ` Gabriel F. T. Gomes
2019-10-25 15:36 ` Gabriel F. T. Gomes [this message]
2019-10-25 15:36 ` [PATCH v2 21/30] Refactor *cvt functions implementation (3/5) Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 04/30] ldbl-128ibm-compat: Add wide character, fortified printing functions Gabriel F. T. Gomes
2019-11-04 16:10 ` Paul E Murphy
2019-10-25 15:37 ` [PATCH v2 29/30] powerpc64le: Require a compiler with -mno-gnu-attribute Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 26/30] ldbl-128ibm-compat: Compiler flags for stdio functions Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 30/30] RFC: powerpc64le: Enable support for IEEE long double Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 27/30] Avoid compat symbols for totalorder in powerpc64le " Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 28/30] ldbl-128ibm-compat: Do not mix -mabi=*longdouble and -mlong-double-128 Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 25/30] Do not redirect calls to __GI_* symbols, when redirecting to *ieee128 Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 24/30] ldbl-128ibm-compat: Add *cvt functions Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 17/30] ldbl-128ibm-compat: Add tests for strfmon and strfmon_l Gabriel F. T. Gomes
2019-11-14 18:11 ` Paul E Murphy
2019-12-03 16:58 ` Gabriel F. T. Gomes
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=20191025153410.15405-23-gabriel@inconstante.net.br \
--to=gabriel@inconstante.net.br \
--cc=libc-alpha@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: link
Be 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).