1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00

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.
This commit is contained in:
Joseph Myers
2017-11-17 22:01:43 +00:00
parent ce003e5d4c
commit 015c6dc288
8 changed files with 334 additions and 295 deletions

View File

@ -1,3 +1,14 @@
2017-11-17 Joseph Myers <joseph@codesourcery.com>
* 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.
2017-11-17 Florian Weimer <fweimer@redhat.com>
support_become_root: Enable file creation in namespaces.

View File

@ -71,43 +71,45 @@
# 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 __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
# endif
#endif
# endif
#if __HAVE_FLOAT32
# 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 __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 __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 __HAVE_FLOAT64X
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
# if __HAVE_FLOAT64X_LONG_DOUBLE
# define __f64x(x) x##l
@ -117,51 +119,51 @@
# else
# define __f64x(x) x##f64x
# endif
#endif
# endif
#if __HAVE_FLOAT128X
# 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 __HAVE_FLOAT16
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
typedef _Complex float __cfloat16 __attribute__ ((__mode__ (__HC__)));
# define __CFLOAT16 __cfloat16
# else
# define __CFLOAT16 _Complex _Float16
# endif
#endif
# endif
#if __HAVE_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 __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 __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 __HAVE_FLOAT64X
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
# if __HAVE_FLOAT64X_LONG_DOUBLE
# define __CFLOAT64X _Complex long double
@ -171,18 +173,18 @@ typedef _Complex float __cfloat16 __attribute__ ((__mode__ (__HC__)));
# else
# define __CFLOAT64X _Complex _Float64x
# endif
#endif
# endif
#if __HAVE_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
typedef float _Float16 __attribute__ ((__mode__ (__HF__)));
@ -195,9 +197,9 @@ typedef float _Float16 __attribute__ ((__mode__ (__HF__)));
# define __builtin_nansf16(x) ((_Float16) __builtin_nans (x))
# endif
#endif
# endif
#if __HAVE_FLOAT32
# if __HAVE_FLOAT32
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
typedef float _Float32;
@ -210,9 +212,9 @@ typedef float _Float32;
# define __builtin_nansf32(x) (__builtin_nansf (x))
# endif
#endif
# endif
#if __HAVE_FLOAT64
# if __HAVE_FLOAT64
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
typedef double _Float64;
@ -225,9 +227,9 @@ typedef double _Float64;
# define __builtin_nansf64(x) (__builtin_nans (x))
# endif
#endif
# endif
#if __HAVE_FLOAT32X
# if __HAVE_FLOAT32X
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
typedef double _Float32x;
@ -240,9 +242,9 @@ typedef double _Float32x;
# define __builtin_nansf32x(x) (__builtin_nans (x))
# endif
#endif
# endif
#if __HAVE_FLOAT64X
# if __HAVE_FLOAT64X
# if __HAVE_FLOAT64X_LONG_DOUBLE
@ -272,9 +274,9 @@ typedef _Float128 _Float64x;
# endif
#endif
# endif
#if __HAVE_FLOAT128X
# if __HAVE_FLOAT128X
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
# error "_Float128x supported but no type"
@ -287,6 +289,8 @@ typedef _Float128 _Float64x;
# define __builtin_nansf128x(x) ((_Float128x) __builtin_nans (x))
# endif
#endif
# endif
#endif /* !__ASSEMBLER__. */
#endif /* _BITS_FLOATN_COMMON_H */

View File

@ -25,13 +25,17 @@
from the default float, double and long double types in this glibc. */
#define __HAVE_DISTINCT_FLOAT128 0
#ifndef __ASSEMBLER__
/* Defined to concatenate the literal suffix to be used with _Float128
types, if __HAVE_FLOAT128 is 1.
E.g.: #define __f128(x) x##f128. */
#undef __f128
# undef __f128
/* Defined to a complex binary128 type if __HAVE_FLOAT128 is 1.
E.g.: #define __CFLOAT128 _Complex _Float128. */
#undef __CFLOAT128
# undef __CFLOAT128
#endif /* !__ASSEMBLER__. */
#include <bits/floatn-common.h>

View File

@ -40,19 +40,21 @@
# define __HAVE_DISTINCT_FLOAT128 0
#endif
#ifndef __ASSEMBLER__
/* Defined to concatenate the literal suffix to be used with _Float128
types, if __HAVE_FLOAT128 is 1. */
#if __HAVE_FLOAT128
# if __HAVE_FLOAT128
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
/* The literal suffix f128 exists only since GCC 7.0. */
# define __f128(x) x##q
# else
# define __f128(x) x##f128
# endif
#endif
# endif
/* Defined to a complex binary128 type if __HAVE_FLOAT128 is 1. */
#if __HAVE_FLOAT128
# if __HAVE_FLOAT128
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
/* Add a typedef for older GCC compilers which don't natively support
_Complex _Float128. */
@ -61,10 +63,10 @@ typedef _Complex float __cfloat128 __attribute__ ((__mode__ (__TC__)));
# else
# define __CFLOAT128 _Complex _Float128
# endif
#endif
# endif
/* The remaining of this file provides support for older compilers. */
#if __HAVE_FLOAT128
# if __HAVE_FLOAT128
/* The type _Float128 exists only since GCC 7.0. */
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
@ -97,7 +99,9 @@ typedef __float128 _Float128;
# define __builtin_signbitf128 __signbitf128
# endif
#endif
# endif
#endif /* !__ASSEMBLER__. */
#include <bits/floatn-common.h>

View File

@ -39,28 +39,30 @@
from the default float, double and long double types in this glibc. */
#define __HAVE_DISTINCT_FLOAT128 0
#ifndef __ASSEMBLER__
/* Defined to concatenate the literal suffix to be used with _Float128
types, if __HAVE_FLOAT128 is 1. */
#if __HAVE_FLOAT128
# if __HAVE_FLOAT128
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
/* The literal suffix f128 exists only since GCC 7.0. */
# define __f128(x) x##l
# else
# define __f128(x) x##f128
# endif
#endif
# endif
/* Defined to a complex binary128 type if __HAVE_FLOAT128 is 1. */
#if __HAVE_FLOAT128
# if __HAVE_FLOAT128
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
# define __CFLOAT128 _Complex long double
# else
# define __CFLOAT128 _Complex _Float128
# endif
#endif
# endif
/* The remaining of this file provides support for older compilers. */
#if __HAVE_FLOAT128
# if __HAVE_FLOAT128
/* The type _Float128 exists only since GCC 7.0. */
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
@ -75,7 +77,9 @@ typedef long double _Float128;
# define __builtin_nansf128(x) (__builtin_nansl (x))
# endif
#endif
# endif
#endif /* !__ASSEMBLER__. */
#include <bits/floatn-common.h>

View File

@ -39,28 +39,30 @@
from the default float, double and long double types in this glibc. */
#define __HAVE_DISTINCT_FLOAT128 0
#ifndef __ASSEMBLER__
/* Defined to concatenate the literal suffix to be used with _Float128
types, if __HAVE_FLOAT128 is 1. */
#if __HAVE_FLOAT128
# if __HAVE_FLOAT128
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
/* The literal suffix f128 exists only since GCC 7.0. */
# define __f128(x) x##l
# else
# define __f128(x) x##f128
# endif
#endif
# endif
/* Defined to a complex binary128 type if __HAVE_FLOAT128 is 1. */
#if __HAVE_FLOAT128
# if __HAVE_FLOAT128
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
# define __CFLOAT128 _Complex long double
# else
# define __CFLOAT128 _Complex _Float128
# endif
#endif
# endif
/* The remaining of this file provides support for older compilers. */
#if __HAVE_FLOAT128
# if __HAVE_FLOAT128
/* The type _Float128 exists only since GCC 7.0. */
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
@ -75,7 +77,9 @@ typedef long double _Float128;
# define __builtin_nansf128(x) (__builtin_nansl (x))
# endif
#endif
# endif
#endif /* !__ASSEMBLER__. */
#include <bits/floatn-common.h>

View File

@ -40,19 +40,21 @@
# define __HAVE_DISTINCT_FLOAT128 0
#endif
#ifndef __ASSEMBLER__
/* Defined to concatenate the literal suffix to be used with _Float128
types, if __HAVE_FLOAT128 is 1. */
#if __HAVE_FLOAT128
# if __HAVE_FLOAT128
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
/* The literal suffix (f128) exist for powerpc only since GCC 7.0. */
# define __f128(x) x##q
# else
# define __f128(x) x##f128
# endif
#endif
# endif
/* Defined to a complex binary128 type if __HAVE_FLOAT128 is 1. */
#if __HAVE_FLOAT128
# if __HAVE_FLOAT128
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
/* Add a typedef for older GCC compilers which don't natively support
_Complex _Float128. */
@ -61,10 +63,10 @@ typedef _Complex float __cfloat128 __attribute__ ((__mode__ (__KC__)));
# else
# define __CFLOAT128 _Complex _Float128
# endif
#endif
# endif
/* The remaining of this file provides support for older compilers. */
#if __HAVE_FLOAT128
# if __HAVE_FLOAT128
/* The type _Float128 exist for powerpc only since GCC 7.0. */
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
@ -96,7 +98,9 @@ typedef __float128 _Float128;
# define __builtin_signbitf128 __signbitf128
# endif
#endif
# endif
#endif /* !__ASSEMBLER__. */
#include <bits/floatn-common.h>

View File

@ -42,19 +42,21 @@
# define __HAVE_DISTINCT_FLOAT128 0
#endif
#ifndef __ASSEMBLER__
/* Defined to concatenate the literal suffix to be used with _Float128
types, if __HAVE_FLOAT128 is 1. */
#if __HAVE_FLOAT128
# if __HAVE_FLOAT128
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
/* The literal suffix f128 exists only since GCC 7.0. */
# define __f128(x) x##q
# else
# define __f128(x) x##f128
# endif
#endif
# endif
/* Defined to a complex binary128 type if __HAVE_FLOAT128 is 1. */
#if __HAVE_FLOAT128
# if __HAVE_FLOAT128
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
/* Add a typedef for older GCC compilers which don't natively support
_Complex _Float128. */
@ -63,10 +65,10 @@ typedef _Complex float __cfloat128 __attribute__ ((__mode__ (__TC__)));
# else
# define __CFLOAT128 _Complex _Float128
# endif
#endif
# endif
/* The remaining of this file provides support for older compilers. */
#if __HAVE_FLOAT128
# if __HAVE_FLOAT128
/* The type _Float128 exists only since GCC 7.0. */
# if !__GNUC_PREREQ (7, 0) || defined __cplusplus
@ -99,7 +101,9 @@ typedef __float128 _Float128;
# define __builtin_signbitf128 __signbitf128
# endif
#endif
# endif
#endif /* !__ASSEMBLER__. */
#include <bits/floatn-common.h>