GNU C Library master sources branch master updated. glibc-2.26.9000-700-g2f1b212

[jsm28 at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  2f1b212e54b280a2dc05b809922ae25d8071da74 (commit)
      from  95b93c6e0d7bf0321f265cf6e85c7fb4417cbda6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2f1b212e54b280a2dc05b809922ae25d8071da74

commit 2f1b212e54b280a2dc05b809922ae25d8071da74
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Wed Nov 1 17:03:58 2017 +0000

    Clean up complex.h handling of float128.
    
    This patch cleans up the way complex.h handles inclusion of
    bits/cmathcalls.h for float128.  The inclusion was between those for
    the types float and long double; the patch moves it after that for
    long double, matching how bits/mathcalls.h and bits/math-finite.h
    inclusions are ordered.  There is no need for the undefine and define
    of _Mdouble_complex_ to be conditional, since __CFLOAT128 is always
    defined by bits/floatn.h when _Float128 is supported, so the patch
    removes the unnecessary conditionals.
    
    Tested for x86_64.
    
    	* math/complex.h
    	[(__HAVE_DISTINCT_FLOAT128 || (__HAVE_FLOAT128 && !LIBC))
    	&& __GLIBC_USE (IEC_60559_TYPES_EXT)]: Move conditional code after
    	that for long double.  Do not condition define and undefine of
    	_Mdouble_complex_ on [__CFLOAT128].

diff --git a/ChangeLog b/ChangeLog
index d38060b..ddbe922 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-11-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* math/complex.h
+	[(__HAVE_DISTINCT_FLOAT128 || (__HAVE_FLOAT128 && !LIBC))
+	&& __GLIBC_USE (IEC_60559_TYPES_EXT)]: Move conditional code after
+	that for long double.  Do not condition define and undefine of
+	_Mdouble_complex_ on [__CFLOAT128].
+
 2017-11-01  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/i386/sysdep.h: Include <sysdeps/x86/sysdep.h> instead
diff --git a/math/complex.h b/math/complex.h
index 43b4c7d..48c2d9e 100644
--- a/math/complex.h
+++ b/math/complex.h
@@ -114,21 +114,6 @@ __BEGIN_DECLS
 #undef	_Mdouble_
 #undef	__MATH_PRECNAME
 
-#if (__HAVE_DISTINCT_FLOAT128 || (__HAVE_FLOAT128 && !defined _LIBC)) \
-     && __GLIBC_USE (IEC_60559_TYPES_EXT)
-/* GCC < 7 requires extra convincing to expose a complex float128 type.  */
-# ifdef __CFLOAT128
-#  undef _Mdouble_complex_
-#  define _Mdouble_complex_	__CFLOAT128
-# endif
-# define _Mdouble_		_Float128
-# define __MATH_PRECNAME(name)	name##f128
-# include <bits/cmathcalls.h>
-# undef _Mdouble_
-# undef __MATH_PRECNAME
-# undef _Mdouble_complex_
-#endif
-
 /* And the long double versions.  It is non-critical to define them
    here unconditionally since `long double' is required in ISO C99.  */
 #if !(defined __NO_LONG_DOUBLE_MATH && defined _LIBC)	\
@@ -145,6 +130,19 @@ __BEGIN_DECLS
 #endif
 #undef	_Mdouble_
 #undef	__MATH_PRECNAME
+
+#if (__HAVE_DISTINCT_FLOAT128 || (__HAVE_FLOAT128 && !defined _LIBC)) \
+     && __GLIBC_USE (IEC_60559_TYPES_EXT)
+# undef _Mdouble_complex_
+# define _Mdouble_complex_	__CFLOAT128
+# define _Mdouble_		_Float128
+# define __MATH_PRECNAME(name)	name##f128
+# include <bits/cmathcalls.h>
+# undef _Mdouble_
+# undef __MATH_PRECNAME
+# undef _Mdouble_complex_
+#endif
+
 #undef	__MATHDECL_1
 #undef	__MATHDECL
 #undef	__MATHCALL

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |    8 ++++++++
 math/complex.h |   28 +++++++++++++---------------
 2 files changed, 21 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources