Support bits/floatn.h inclusion from .S files.

Further _FloatN / _FloatNx type alias support will involve making
architecture-specific .S files use the common macros for libm function
aliases.  Making them use those macros will also serve to simplify
existing code for aliases / symbol versions in various cases, similar
to such simplifications for ldbl-opt code.

The libm-alias-*.h files sometimes need to include <bits/floatn.h> to
determine which aliases they should define.  At present, this does not
work for inclusion from .S files because <bits/floatn.h> can define
typedefs for old compilers.  This patch changes all the
<bits/floatn.h> and <bits/floatn-common.h> headers to include
__ASSEMBLER__ conditionals.  Those conditionals disable everything
related to C syntax in the __ASSEMBLER__ case, not just the problem
typedefs, as that seemed cleanest.  The __HAVE_* definitions remain in
the __ASSEMBLER__ case, as those provide information that is required
to define the correct set of aliases.

Tested with build-many-glibcs.py for a representative set of
configurations (x86_64-linux-gnu i686-linux-gnu ia64-linux-gnu
powerpc64le-linux-gnu mips64-linux-gnu-n64 sparc64-linux-gnu) with GCC
6.  Also tested with GCC 6 for i686-linux-gnu in conjunction with
changes to use alias macros in .S files.

	* bits/floatn-common.h [!__ASSEMBLER]: Disable everything related
	to C syntax instead of availability and properties of types.
	* bits/floatn.h [!__ASSEMBLER]: Likewise.
	* sysdeps/ia64/bits/floatn.h [!__ASSEMBLER]: Likewise.
	* sysdeps/ieee754/ldbl-128/bits/floatn.h [!__ASSEMBLER]: Likewise.
	* sysdeps/mips/ieee754/bits/floatn.h [!__ASSEMBLER]: Likewise.
	* sysdeps/powerpc/bits/floatn.h [!__ASSEMBLER]: Likewise.
	* sysdeps/x86/bits/floatn.h [!__ASSEMBLER]: Likewise.

1 files changed, 149 insertions, 145 deletions

diff --git a/bits/floatn-common.h b/bits/floatn-common.h
index 1b3ab51aaf..2182c9d56a 100644
--- a/bits/floatn-common.h
+++ b/bits/floatn-common.h
@@ -71,222 +71,226 @@
 # define __HAVE_FLOATN_NOT_TYPEDEF 0
 #endif
 
+#ifndef __ASSEMBLER__
+
 /* Defined to concatenate the literal suffix to be used with _FloatN
    or _FloatNx types, if __HAVE_<type> is 1.  The corresponding
    literal suffixes exist since GCC 7, for C only.  */
-#if __HAVE_FLOAT16
-# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+# if __HAVE_FLOAT16
+#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
 /* No corresponding suffix available for this type.  */
-#  define __f16(x) ((_Float16) x##f)
-# else
-#  define __f16(x) x##f16
+#   define __f16(x) ((_Float16) x##f)
+#  else
+#   define __f16(x) x##f16
+#  endif
 # endif
-#endif
 
-#if __HAVE_FLOAT32
-# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
-#  define __f32(x) x##f
-# else
-#  define __f32(x) x##f32
+# if __HAVE_FLOAT32
+#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+#   define __f32(x) x##f
+#  else
+#   define __f32(x) x##f32
+#  endif
 # endif
-#endif
 
-#if __HAVE_FLOAT64
-# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
-#  define __f64(x) x
-# else
-#  define __f64(x) x##f64
+# if __HAVE_FLOAT64
+#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+#   define __f64(x) x
+#  else
+#   define __f64(x) x##f64
+#  endif
 # endif
-#endif
 
-#if __HAVE_FLOAT32X
-# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
-#  define __f32x(x) x
-# else
-#  define __f32x(x) x##f32x
+# if __HAVE_FLOAT32X
+#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+#   define __f32x(x) x
+#  else
+#   define __f32x(x) x##f32x
+#  endif
 # endif
-#endif
 
-#if __HAVE_FLOAT64X
-# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
-#  if __HAVE_FLOAT64X_LONG_DOUBLE
-#   define __f64x(x) x##l
+# if __HAVE_FLOAT64X
+#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+#   if __HAVE_FLOAT64X_LONG_DOUBLE
+#    define __f64x(x) x##l
+#   else
+#    define __f64x(x) __f128 (x)
+#   endif
 #  else
-#   define __f64x(x) __f128 (x)
+#   define __f64x(x) x##f64x
 #  endif
-# else
-#  define __f64x(x) x##f64x
 # endif
-#endif
 
-#if __HAVE_FLOAT128X
-# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
-#  error "_Float128X supported but no constant suffix"
-# else
-#  define __f128x(x) x##f128x
+# if __HAVE_FLOAT128X
+#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+#   error "_Float128X supported but no constant suffix"
+#  else
+#   define __f128x(x) x##f128x
+#  endif
 # endif
-#endif
 
 /* Defined to a complex type if __HAVE_<type> is 1.  */
-#if __HAVE_FLOAT16
-# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+# if __HAVE_FLOAT16
+#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
 typedef _Complex float __cfloat16 __attribute__ ((__mode__ (__HC__)));
-#  define __CFLOAT16 __cfloat16
-# else
-#  define __CFLOAT16 _Complex _Float16
+#   define __CFLOAT16 __cfloat16
+#  else
+#   define __CFLOAT16 _Complex _Float16
+#  endif
 # endif
-#endif
 
-#if __HAVE_FLOAT32
-# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
-#  define __CFLOAT32 _Complex float
-# else
-#  define __CFLOAT32 _Complex _Float32
+# if __HAVE_FLOAT32
+#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+#   define __CFLOAT32 _Complex float
+#  else
+#   define __CFLOAT32 _Complex _Float32
+#  endif
 # endif
-#endif
 
-#if __HAVE_FLOAT64
-# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
-#  define __CFLOAT64 _Complex double
-# else
-#  define __CFLOAT64 _Complex _Float64
+# if __HAVE_FLOAT64
+#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+#   define __CFLOAT64 _Complex double
+#  else
+#   define __CFLOAT64 _Complex _Float64
+#  endif
 # endif
-#endif
 
-#if __HAVE_FLOAT32X
-# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
-#  define __CFLOAT32X _Complex double
-# else
-#  define __CFLOAT32X _Complex _Float32x
+# if __HAVE_FLOAT32X
+#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+#   define __CFLOAT32X _Complex double
+#  else
+#   define __CFLOAT32X _Complex _Float32x
+#  endif
 # endif
-#endif
 
-#if __HAVE_FLOAT64X
-# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
-#  if __HAVE_FLOAT64X_LONG_DOUBLE
-#   define __CFLOAT64X _Complex long double
+# if __HAVE_FLOAT64X
+#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+#   if __HAVE_FLOAT64X_LONG_DOUBLE
+#    define __CFLOAT64X _Complex long double
+#   else
+#    define __CFLOAT64X __CFLOAT128
+#   endif
 #  else
-#   define __CFLOAT64X __CFLOAT128
+#   define __CFLOAT64X _Complex _Float64x
 #  endif
-# else
-#  define __CFLOAT64X _Complex _Float64x
 # endif
-#endif
 
-#if __HAVE_FLOAT128X
-# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
-#  error "_Float128X supported but no complex type"
-# else
-#  define __CFLOAT128X _Complex _Float128x
+# if __HAVE_FLOAT128X
+#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+#   error "_Float128X supported but no complex type"
+#  else
+#   define __CFLOAT128X _Complex _Float128x
+#  endif
 # endif
-#endif
 
 /* The remaining of this file provides support for older compilers.  */
-#if __HAVE_FLOAT16
+# if __HAVE_FLOAT16
 
-# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
 typedef float _Float16 __attribute__ ((__mode__ (__HF__)));
-# endif
+#  endif
 
-# if !__GNUC_PREREQ (7, 0)
-#  define __builtin_huge_valf16() ((_Float16) __builtin_huge_val ())
-#  define __builtin_inff16() ((_Float16) __builtin_inf ())
-#  define __builtin_nanf16(x) ((_Float16) __builtin_nan (x))
-#  define __builtin_nansf16(x) ((_Float16) __builtin_nans (x))
-# endif
+#  if !__GNUC_PREREQ (7, 0)
+#   define __builtin_huge_valf16() ((_Float16) __builtin_huge_val ())
+#   define __builtin_inff16() ((_Float16) __builtin_inf ())
+#   define __builtin_nanf16(x) ((_Float16) __builtin_nan (x))
+#   define __builtin_nansf16(x) ((_Float16) __builtin_nans (x))
+#  endif
 
-#endif
+# endif
 
-#if __HAVE_FLOAT32
+# if __HAVE_FLOAT32
 
-# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
 typedef float _Float32;
-# endif
+#  endif
 
-# if !__GNUC_PREREQ (7, 0)
-#  define __builtin_huge_valf32() (__builtin_huge_valf ())
-#  define __builtin_inff32() (__builtin_inff ())
-#  define __builtin_nanf32(x) (__builtin_nanf (x))
-#  define __builtin_nansf32(x) (__builtin_nansf (x))
-# endif
+#  if !__GNUC_PREREQ (7, 0)
+#   define __builtin_huge_valf32() (__builtin_huge_valf ())
+#   define __builtin_inff32() (__builtin_inff ())
+#   define __builtin_nanf32(x) (__builtin_nanf (x))
+#   define __builtin_nansf32(x) (__builtin_nansf (x))
+#  endif
 
-#endif
+# endif
 
-#if __HAVE_FLOAT64
+# if __HAVE_FLOAT64
 
-# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
 typedef double _Float64;
-# endif
+#  endif
 
-# if !__GNUC_PREREQ (7, 0)
-#  define __builtin_huge_valf64() (__builtin_huge_val ())
-#  define __builtin_inff64() (__builtin_inf ())
-#  define __builtin_nanf64(x) (__builtin_nan (x))
-#  define __builtin_nansf64(x) (__builtin_nans (x))
-# endif
+#  if !__GNUC_PREREQ (7, 0)
+#   define __builtin_huge_valf64() (__builtin_huge_val ())
+#   define __builtin_inff64() (__builtin_inf ())
+#   define __builtin_nanf64(x) (__builtin_nan (x))
+#   define __builtin_nansf64(x) (__builtin_nans (x))
+#  endif
 
-#endif
+# endif
 
-#if __HAVE_FLOAT32X
+# if __HAVE_FLOAT32X
 
-# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
 typedef double _Float32x;
-# endif
+#  endif
 
-# if !__GNUC_PREREQ (7, 0)
-#  define __builtin_huge_valf32x() (__builtin_huge_val ())
-#  define __builtin_inff32x() (__builtin_inf ())
-#  define __builtin_nanf32x(x) (__builtin_nan (x))
-#  define __builtin_nansf32x(x) (__builtin_nans (x))
-# endif
+#  if !__GNUC_PREREQ (7, 0)
+#   define __builtin_huge_valf32x() (__builtin_huge_val ())
+#   define __builtin_inff32x() (__builtin_inf ())
+#   define __builtin_nanf32x(x) (__builtin_nan (x))
+#   define __builtin_nansf32x(x) (__builtin_nans (x))
+#  endif
 
-#endif
+# endif
 
-#if __HAVE_FLOAT64X
+# if __HAVE_FLOAT64X
 
-# if __HAVE_FLOAT64X_LONG_DOUBLE
+#  if __HAVE_FLOAT64X_LONG_DOUBLE
 
-#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+#   if !__GNUC_PREREQ (7, 0) || defined __cplusplus
 typedef long double _Float64x;
-#  endif
+#   endif
 
-#  if !__GNUC_PREREQ (7, 0)
-#   define __builtin_huge_valf64x() (__builtin_huge_vall ())
-#   define __builtin_inff64x() (__builtin_infl ())
-#   define __builtin_nanf64x(x) (__builtin_nanl (x))
-#   define __builtin_nansf64x(x) (__builtin_nansl (x))
-#  endif
+#   if !__GNUC_PREREQ (7, 0)
+#    define __builtin_huge_valf64x() (__builtin_huge_vall ())
+#    define __builtin_inff64x() (__builtin_infl ())
+#    define __builtin_nanf64x(x) (__builtin_nanl (x))
+#    define __builtin_nansf64x(x) (__builtin_nansl (x))
+#   endif
 
-# else
+#  else
 
-#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+#   if !__GNUC_PREREQ (7, 0) || defined __cplusplus
 typedef _Float128 _Float64x;
-#  endif
+#   endif
+
+#   if !__GNUC_PREREQ (7, 0)
+#    define __builtin_huge_valf64x() (__builtin_huge_valf128 ())
+#    define __builtin_inff64x() (__builtin_inff128 ())
+#    define __builtin_nanf64x(x) (__builtin_nanf128 (x))
+#    define __builtin_nansf64x(x) (__builtin_nansf128 (x))
+#   endif
 
-#  if !__GNUC_PREREQ (7, 0)
-#   define __builtin_huge_valf64x() (__builtin_huge_valf128 ())
-#   define __builtin_inff64x() (__builtin_inff128 ())
-#   define __builtin_nanf64x(x) (__builtin_nanf128 (x))
-#   define __builtin_nansf64x(x) (__builtin_nansf128 (x))
 #  endif
 
 # endif
 
-#endif
+# if __HAVE_FLOAT128X
 
-#if __HAVE_FLOAT128X
+#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
+#   error "_Float128x supported but no type"
+#  endif
 
-# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
-#  error "_Float128x supported but no type"
-# endif
+#  if !__GNUC_PREREQ (7, 0)
+#   define __builtin_huge_valf128x() ((_Float128x) __builtin_huge_val ())
+#   define __builtin_inff128x() ((_Float128x) __builtin_inf ())
+#   define __builtin_nanf128x(x) ((_Float128x) __builtin_nan (x))
+#   define __builtin_nansf128x(x) ((_Float128x) __builtin_nans (x))
+#  endif
 
-# if !__GNUC_PREREQ (7, 0)
-#  define __builtin_huge_valf128x() ((_Float128x) __builtin_huge_val ())
-#  define __builtin_inff128x() ((_Float128x) __builtin_inf ())
-#  define __builtin_nanf128x(x) ((_Float128x) __builtin_nan (x))
-#  define __builtin_nansf128x(x) ((_Float128x) __builtin_nans (x))
 # endif
 
-#endif
+#endif /* !__ASSEMBLER__.  */
 
 #endif /* _BITS_FLOATN_COMMON_H */