This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 01/12] Undefine redirections after long double definition on __LDBL_COMPAT [BZ #23294]
- From: Tulio Magno Quites Machado Filho <tuliom at linux dot ibm dot com>
- To: libc-alpha at sourceware dot org
- Cc: joseph at codesourcery dot com
- Date: Tue, 19 Jun 2018 23:04:15 -0300
- Subject: [PATCH 01/12] Undefine redirections after long double definition on __LDBL_COMPAT [BZ #23294]
- References: <20180620020426.20372-1-tuliom@linux.ibm.com>
After defining the long double redirections to double, __MATHDECL_1 has
to be redefined to its previous state in order to avoid redirecting all
subsequent types.
2018-06-19 Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
[BZ #23294]
* math/complex.h (__MATHDECL_1_IMPL): New macro.
[__LDBL_COMPAT](__MATHDECL_1): Redefine as __MATHDECL_1_IMPL
after redirection.
* math/math.h (__MATHDECL_1_IMPL, __MATHREDIR): New macros.
[__LDBL_COMPAT](__MATHDECL_2): Removed.
[__LDBL_COMPAT](__MATHDECL_1): Redefine as __MATHDECL_1_IMPL
after redirection.
Signed-off-by: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
---
math/complex.h | 10 +++++++++-
math/math.h | 18 +++++++++++++-----
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/math/complex.h b/math/complex.h
index 544e7acd82..40cf8e0705 100644
--- a/math/complex.h
+++ b/math/complex.h
@@ -98,8 +98,10 @@ __BEGIN_DECLS
#define __MATHDECL(type, function, args) \
__MATHDECL_1(type, function, args); \
__MATHDECL_1(type, __CONCAT(__,function), args)
-#define __MATHDECL_1(type, function, args) \
+#define __MATHDECL_1_IMPL(type, function, args) \
extern type __MATH_PRECNAME(function) args __THROW
+#define __MATHDECL_1(type, function, args) \
+ __MATHDECL_1_IMPL(type, function, args)
#define _Mdouble_ double
#define __MATH_PRECNAME(name) name
@@ -127,6 +129,11 @@ __BEGIN_DECLS
# define _Mdouble_ long double
# define __MATH_PRECNAME(name) name##l
# include <bits/cmathcalls.h>
+# if defined __LDBL_COMPAT
+# undef __MATHDECL_1
+# define __MATHDECL_1(type, function, args) \
+ __MATHDECL_1_IMPL(type, function, args)
+# endif
#endif
#undef _Mdouble_
#undef __MATH_PRECNAME
@@ -215,6 +222,7 @@ __BEGIN_DECLS
# undef _Mdouble_complex_
#endif
+#undef __MATHDECL_1_IMPL
#undef __MATHDECL_1
#undef __MATHDECL
#undef __MATHCALL
diff --git a/math/math.h b/math/math.h
index ddee4e4083..998d3042c5 100644
--- a/math/math.h
+++ b/math/math.h
@@ -279,8 +279,13 @@ enum
#define __MATHDECLX(type, function,suffix, args, attrib) \
__MATHDECL_1(type, function,suffix, args) __attribute__ (attrib); \
__MATHDECL_1(type, __CONCAT(__,function),suffix, args) __attribute__ (attrib)
-#define __MATHDECL_1(type, function,suffix, args) \
+#define __MATHDECL_1_IMPL(type, function, suffix, args) \
extern type __MATH_PRECNAME(function,suffix) args __THROW
+#define __MATHDECL_1(type, function, suffix, args) \
+ __MATHDECL_1_IMPL(type, function, suffix, args)
+
+#define __MATHREDIR(type, function, suffix, args, to) \
+ extern type __REDIRECT_NTH (__MATH_PRECNAME (function, suffix), args, to)
#define _Mdouble_ double
#define __MATH_PRECNAME(name,r) __CONCAT(name,r)
@@ -331,11 +336,8 @@ extern long double __REDIRECT_NTH (nexttowardl,
# endif
# undef __MATHDECL_1
-# define __MATHDECL_2(type, function,suffix, args, alias) \
- extern type __REDIRECT_NTH(__MATH_PRECNAME(function,suffix), \
- args, alias)
# define __MATHDECL_1(type, function,suffix, args) \
- __MATHDECL_2(type, function,suffix, args, __CONCAT(function,suffix))
+ __MATHREDIR(type, function, suffix, args, __CONCAT(function,suffix))
# endif
/* Include the file of declarations again, this time using `long double'
@@ -353,6 +355,11 @@ extern long double __REDIRECT_NTH (nexttowardl,
# undef __MATH_DECLARING_DOUBLE
# undef __MATH_DECLARING_FLOATN
+# if defined __LDBL_COMPAT
+# undef __MATHDECL_1
+# define __MATHDECL_1(type, function, suffix, args) \
+ __MATHDECL_1_IMPL(type, function, suffix, args)
+# endif
# endif /* !(__NO_LONG_DOUBLE_MATH && _LIBC) || __LDBL_COMPAT */
#endif /* Use ISO C99. */
@@ -479,6 +486,7 @@ extern long double __REDIRECT_NTH (nexttowardl,
# undef __MATH_DECLARING_FLOATN
#endif /* __HAVE_DISTINCT_FLOAT128X || (__HAVE_FLOAT128X && !_LIBC). */
+#undef __MATHDECL_1_IMPL
#undef __MATHDECL_1
#undef __MATHDECL
#undef __MATHCALL
--
2.14.4