From patchwork Tue Nov 7 23:49:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 835519 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-86879-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="kTRTJZUq"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yWmPd1fJsz9s74 for ; Wed, 8 Nov 2017 10:49:57 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=BfHErkkDrgIzzWDAGpMjQab2WrN3a RgIZsbVUe9b8oAStyTQ9grnXHkdMgUcYCQrEHUNtG/9jmYrZaXVUedPVzF7Qkx57 pUqeSqUunajs+sRbHBiZZecDn7XyfgOI4UAMlOQl+7STCngKipQ0yUOMHoDSIyRb o27wuXw0SRdtnM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=RlyWB+UtLseSdqafJgbR7P9waVc=; b=kTR TJZUq9J35nSTL3neXq3cpYC0BghiGRrOgnpi8TD34FgB+/KtIbCDQD3JZyC13mXP 3bXjzphhDGXh7LecNBwx/8ljNU63XLK+ub+aBvvvoS0fMwc7BkEN/AZP9n6KacLr euRTeHA21GWU4kzdIC94SuXV6KOaGMapetBsuVgo= Received: (qmail 127255 invoked by alias); 7 Nov 2017 23:49:48 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 127246 invoked by uid 89); 7 Nov 2017 23:49:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, UPPERCASE_50_75, URIBL_RED autolearn=ham version=3.3.2 spammy=supplement X-HELO: relay1.mentorg.com Date: Tue, 7 Nov 2017 23:49:39 +0000 From: Joseph Myers To: Subject: Handle more _FloatN, _FloatNx types in include/float.h [committed] Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) Continuing the preparation for additional _FloatN / _FloatNx type support, this patch adds support in include/float.h. This header defines macros for _Float128 properties when using compilers before GCC 7 that lack those macros in . For testing _Float32 / _Float64 / _Float32x / _Float64x functions with older compilers, such macros need to be defined for those types as well; for the older compilers, those types will always be typedefs for another type, so the definitions can be in terms of the macros for that other type. Tested for x86_64. Committed. 2017-11-07 Joseph Myers * include/float.h [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32] (FLT32_MANT_DIG): New macro. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32] (FLT32_DECIMAL_DIG): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32] (FLT32_DIG): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32] (FLT32_MIN_EXP): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32] (FLT32_MIN_10_EXP): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32] (FLT32_MAX_EXP): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32] (FLT32_MAX_10_EXP): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32] (FLT32_MAX): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32] (FLT32_EPSILON): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32] (FLT32_MIN): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32] (FLT32_TRUE_MIN): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64] (FLT64_MANT_DIG): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64] (FLT64_DECIMAL_DIG): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64] (FLT64_DIG): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64] (FLT64_MIN_EXP): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64] (FLT64_MIN_10_EXP): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64] (FLT64_MAX_EXP): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64] (FLT64_MAX_10_EXP): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64] (FLT64_MAX): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64] (FLT64_EPSILON): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64] (FLT64_MIN): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64] (FLT64_TRUE_MIN): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32X] (FLT32X_MANT_DIG): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32X] (FLT32X_DECIMAL_DIG): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32X] (FLT32X_DIG): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32X] (FLT32X_MIN_EXP): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32X] (FLT32X_MIN_10_EXP): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32X] (FLT32X_MAX_EXP): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32X] (FLT32X_MAX_10_EXP): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32X] (FLT32X_MAX): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32X] (FLT32X_EPSILON): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32X] (FLT32X_MIN): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT32X] (FLT32X_TRUE_MIN): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64X] (FLT64X_MANT_DIG): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64X] (FLT64X_DECIMAL_DIG): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64X] (FLT64X_DIG): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64X] (FLT64X_MIN_EXP): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64X] (FLT64X_MIN_10_EXP): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64X] (FLT64X_MAX_EXP): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64X] (FLT64X_MAX_10_EXP): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64X] (FLT64X_MAX): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64X] (FLT64X_EPSILON): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64X] (FLT64X_MIN): Likewise. [!__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) && __HAVE_FLOAT64X] (FLT64X_TRUE_MIN): Likewise. diff --git a/include/float.h b/include/float.h index 939c83d..748ef62 100644 --- a/include/float.h +++ b/include/float.h @@ -10,28 +10,104 @@ #include_next -/* Supplement float.h macros for _Float128 for older compilers - which do not yet support the type. These are described in - TS 18661-3. */ +/* Supplement float.h macros for _FloatN and _FloatNx for older + compilers which do not yet support the type. These are described + in TS 18661-3. */ #include #include -#if !__GNUC_PREREQ (7, 0) \ - && __HAVE_FLOAT128 && __GLIBC_USE (IEC_60559_TYPES_EXT) -# define FLT128_MANT_DIG 113 -# define FLT128_DECIMAL_DIG 36 -# define FLT128_DIG 33 -# define FLT128_MIN_EXP (-16381) -# define FLT128_MIN_10_EXP (-4931) -# define FLT128_MAX_EXP 16384 -# define FLT128_MAX_10_EXP 4932 -# define FLT128_MAX \ +#if !__GNUC_PREREQ (7, 0) && __GLIBC_USE (IEC_60559_TYPES_EXT) + +# if __HAVE_FLOAT128 +# define FLT128_MANT_DIG 113 +# define FLT128_DECIMAL_DIG 36 +# define FLT128_DIG 33 +# define FLT128_MIN_EXP (-16381) +# define FLT128_MIN_10_EXP (-4931) +# define FLT128_MAX_EXP 16384 +# define FLT128_MAX_10_EXP 4932 +# define FLT128_MAX \ __f128 (1.18973149535723176508575932662800702e+4932) -# define FLT128_EPSILON \ +# define FLT128_EPSILON \ __f128 (1.92592994438723585305597794258492732e-34) -# define FLT128_MIN \ +# define FLT128_MIN \ __f128 (3.36210314311209350626267781732175260e-4932) -# define FLT128_TRUE_MIN \ +# define FLT128_TRUE_MIN \ __f128 (6.47517511943802511092443895822764655e-4966) +# endif + +/* Types other than _Float128 are typedefs for other types with old + compilers. */ + +# if __HAVE_FLOAT32 +# define FLT32_MANT_DIG FLT_MANT_DIG +# define FLT32_DECIMAL_DIG FLT_DECIMAL_DIG +# define FLT32_DIG FLT_DIG +# define FLT32_MIN_EXP FLT_MIN_EXP +# define FLT32_MIN_10_EXP FLT_MIN_10_EXP +# define FLT32_MAX_EXP FLT_MAX_EXP +# define FLT32_MAX_10_EXP FLT_MAX_10_EXP +# define FLT32_MAX FLT_MAX +# define FLT32_EPSILON FLT_EPSILON +# define FLT32_MIN FLT_MIN +# define FLT32_TRUE_MIN FLT_TRUE_MIN +# endif + +# if __HAVE_FLOAT64 +# define FLT64_MANT_DIG DBL_MANT_DIG +# define FLT64_DECIMAL_DIG DBL_DECIMAL_DIG +# define FLT64_DIG DBL_DIG +# define FLT64_MIN_EXP DBL_MIN_EXP +# define FLT64_MIN_10_EXP DBL_MIN_10_EXP +# define FLT64_MAX_EXP DBL_MAX_EXP +# define FLT64_MAX_10_EXP DBL_MAX_10_EXP +# define FLT64_MAX DBL_MAX +# define FLT64_EPSILON DBL_EPSILON +# define FLT64_MIN DBL_MIN +# define FLT64_TRUE_MIN DBL_TRUE_MIN +# endif + +# if __HAVE_FLOAT32X +# define FLT32X_MANT_DIG DBL_MANT_DIG +# define FLT32X_DECIMAL_DIG DBL_DECIMAL_DIG +# define FLT32X_DIG DBL_DIG +# define FLT32X_MIN_EXP DBL_MIN_EXP +# define FLT32X_MIN_10_EXP DBL_MIN_10_EXP +# define FLT32X_MAX_EXP DBL_MAX_EXP +# define FLT32X_MAX_10_EXP DBL_MAX_10_EXP +# define FLT32X_MAX DBL_MAX +# define FLT32X_EPSILON DBL_EPSILON +# define FLT32X_MIN DBL_MIN +# define FLT32X_TRUE_MIN DBL_TRUE_MIN +# endif + +# if __HAVE_FLOAT64X +# if __HAVE_FLOAT64X_LONG_DOUBLE +# define FLT64X_MANT_DIG LDBL_MANT_DIG +# define FLT64X_DECIMAL_DIG LDBL_DECIMAL_DIG +# define FLT64X_DIG LDBL_DIG +# define FLT64X_MIN_EXP LDBL_MIN_EXP +# define FLT64X_MIN_10_EXP LDBL_MIN_10_EXP +# define FLT64X_MAX_EXP LDBL_MAX_EXP +# define FLT64X_MAX_10_EXP LDBL_MAX_10_EXP +# define FLT64X_MAX LDBL_MAX +# define FLT64X_EPSILON LDBL_EPSILON +# define FLT64X_MIN LDBL_MIN +# define FLT64X_TRUE_MIN LDBL_TRUE_MIN +# else +# define FLT64X_MANT_DIG FLT128_MANT_DIG +# define FLT64X_DECIMAL_DIG FLT128_DECIMAL_DIG +# define FLT64X_DIG FLT128_DIG +# define FLT64X_MIN_EXP FLT128_MIN_EXP +# define FLT64X_MIN_10_EXP FLT128_MIN_10_EXP +# define FLT64X_MAX_EXP FLT128_MAX_EXP +# define FLT64X_MAX_10_EXP FLT128_MAX_10_EXP +# define FLT64X_MAX FLT128_MAX +# define FLT64X_EPSILON FLT128_EPSILON +# define FLT64X_MIN FLT128_MIN +# define FLT64X_TRUE_MIN FLT128_TRUE_MIN +# endif +# endif + #endif #endif /* _LIBC_FLOAT_H */