From patchwork Fri Nov 24 23:33:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 841195 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-87525-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="IocZQfsl"; 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 3ykCFX6dwdz9s0g for ; Sat, 25 Nov 2017 10:34:08 +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=sDiMKaQFHVhMZQCoXFOyhDUcUocIr inlMufeEhSE4vg2J6w8sp45zOI9uH8ExrEtITYUrLzp5byYq19z9sxvVDqH4yovN FvefGYqrLcg18gtDIgO3ZsZfnXuQ7TEnfYJiKLwu6rDQycoQrUcHGvSCp7V3727E I3PhzcBjt/B68I= 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=6V/ufRkI7uJ62EPuYgVhLCFp9y8=; b=Ioc ZQfslrnKHCVZZ2/WZO84XkME01oThGgyJymtsBrw5cB/rQJGx0h61oeUBFb+Wdty lMfPedlssc91nQNC2cHJGRy3aMfuRkp4UE0Zv9tsIwKAryiKx06gIZ70AmfVL9YL ykdd+/KKzoeI04HH1t35zZxHSDsK+vqNSAS9vro0= Received: (qmail 95991 invoked by alias); 24 Nov 2017 23:34:02 -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 95971 invoked by uid 89); 24 Nov 2017 23:34:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KB_WAM_FROM_NAME_SINGLEWORD, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy= X-HELO: relay1.mentorg.com Date: Fri, 24 Nov 2017 23:33:53 +0000 From: Joseph Myers To: Subject: Support _Float64x in libm_alias macros [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) This patch adds support for libm_alias_ldouble and libm_alias_float128 to create *f64x function aliases when appropriate. Making such aliases work for functions defined in assembly sources requires adding some semicolons after weak_alias calls in alias macro definitions. For C, semicolons are already present in the macros called when required, but a GNU C extension allows excess semicolons at file scope in a source file (and glibc already uses this), so it is OK to have extra semicolons present in the macro definitions. For assembly sources, making multiple alias macro calls from a single macro expansion means there are no newlines between the calls, so an explicit separator is needed. If hppa were to have .S sources in libm, a more complicated approach would be needed that used ASM_LINE_SEP when building assembly sources but not for C, but right now there are no such sources so just using a semicolon (as already present unconditionally in some such macro expansions) suffices. Tested for x86_64, including in conjunction with _Float64x support patches. Committed. 2017-11-24 Joseph Myers * sysdeps/generic/libm-alias-float128.h: Include . (libm_alias_float128_other_r): If [__HAVE_FLOAT64X && !__HAVE_FLOAT64X_LONG_DOUBLE], define f64x alias. (libm_alias_float128_r): Add semicolon after weak_alias call. * sysdeps/generic/libm-alias-ldouble.h (libm_alias_ldouble_other_r_f128): New macro. (libm_alias_ldouble_other_r_f64x): Likewise. (libm_alias_ldouble_other_r): Use libm_alias_ldouble_other_r_f128 and libm_alias_ldouble_other_r_f64x. (libm_alias_ldouble_r): Add semicolon after weak_alias call. * sysdeps/ieee754/ldbl-opt/libm-alias-ldouble.h (libm_alias_ldouble_other_r_f128): New macro. (libm_alias_ldouble_other_r_f64x): Likewise. (libm_alias_ldouble_other_r): Use libm_alias_ldouble_other_r_f128 and libm_alias_ldouble_other_r_f64x. diff --git a/sysdeps/generic/libm-alias-float128.h b/sysdeps/generic/libm-alias-float128.h index 8a7ebf3..b739cdf 100644 --- a/sysdeps/generic/libm-alias-float128.h +++ b/sysdeps/generic/libm-alias-float128.h @@ -19,12 +19,19 @@ #ifndef _LIBM_ALIAS_FLOAT128_H #define _LIBM_ALIAS_FLOAT128_H +#include + /* Define _FloatN / _FloatNx aliases (other than that for _Float128) for a _Float128 libm function that has internal name FROM ## f128 ## R and public names TO ## suffix ## R for each suffix of a supported _FloatN / _FloatNx floating-point type with the same format as _Float128. */ -#define libm_alias_float128_other_r(from, to, r) +#if __HAVE_FLOAT64X && !__HAVE_FLOAT64X_LONG_DOUBLE +# define libm_alias_float128_other_r(from, to, r) \ + weak_alias (from ## f128 ## r, to ## f64x ## r) +#else +# define libm_alias_float128_other_r(from, to, r) +#endif /* Likewise, but without the R suffix. */ #define libm_alias_float128_other(from, to) \ @@ -39,7 +46,7 @@ per format, not per type) or for obsolescent functions not provided for _FloatN types. */ #define libm_alias_float128_r(from, to, r) \ - weak_alias (from ## f128 ## r, to ## f128 ## r) \ + weak_alias (from ## f128 ## r, to ## f128 ## r); \ libm_alias_float128_other_r (from, to, r) /* Likewise, but without the R suffix. */ diff --git a/sysdeps/generic/libm-alias-ldouble.h b/sysdeps/generic/libm-alias-ldouble.h index 7b9bf9a..0c56801 100644 --- a/sysdeps/generic/libm-alias-ldouble.h +++ b/sysdeps/generic/libm-alias-ldouble.h @@ -21,17 +21,28 @@ #include -/* Define _FloatN / _FloatNx aliases for a long double libm function - that has internal name FROM ## l ## R and public names TO ## suffix - ## R for each suffix of a supported _FloatN / _FloatNx - floating-point type with the same format as long double. */ #if __HAVE_FLOAT128 && !__HAVE_DISTINCT_FLOAT128 -# define libm_alias_ldouble_other_r(from, to, r) \ +# define libm_alias_ldouble_other_r_f128(from, to, r) \ weak_alias (from ## l ## r, to ## f128 ## r) #else -# define libm_alias_ldouble_other_r(from, to, r) +# define libm_alias_ldouble_other_r_f128(from, to, r) +#endif + +#if __HAVE_FLOAT64X_LONG_DOUBLE +# define libm_alias_ldouble_other_r_f64x(from, to, r) \ + weak_alias (from ## l ## r, to ## f64x ## r) +#else +# define libm_alias_ldouble_other_r_f64x(from, to, r) #endif +/* Define _FloatN / _FloatNx aliases for a long double libm function + that has internal name FROM ## l ## R and public names TO ## suffix + ## R for each suffix of a supported _FloatN / _FloatNx + floating-point type with the same format as long double. */ +#define libm_alias_ldouble_other_r(from, to, r) \ + libm_alias_ldouble_other_r_f128 (from, to, r); \ + libm_alias_ldouble_other_r_f64x (from, to, r) + /* Likewise, but without the R suffix. */ #define libm_alias_ldouble_other(from, to) \ libm_alias_ldouble_other_r (from, to, ) @@ -45,7 +56,7 @@ per format, not per type) or for obsolescent functions not provided for _FloatN types. */ #define libm_alias_ldouble_r(from, to, r) \ - weak_alias (from ## l ## r, to ## l ## r) \ + weak_alias (from ## l ## r, to ## l ## r); \ libm_alias_ldouble_other_r (from, to, r) /* Likewise, but without the R suffix. */ diff --git a/sysdeps/ieee754/ldbl-opt/libm-alias-ldouble.h b/sysdeps/ieee754/ldbl-opt/libm-alias-ldouble.h index ad31f69..5b48fda 100644 --- a/sysdeps/ieee754/ldbl-opt/libm-alias-ldouble.h +++ b/sysdeps/ieee754/ldbl-opt/libm-alias-ldouble.h @@ -23,17 +23,28 @@ #include #include -/* Define _FloatN / _FloatNx aliases for a long double libm function - that has internal name FROM ## l ## R and public names TO ## suffix - ## R for each suffix of a supported _FloatN / _FloatNx - floating-point type with the same format as long double. */ #if __HAVE_FLOAT128 && !__HAVE_DISTINCT_FLOAT128 -# define libm_alias_ldouble_other_r(from, to, r) \ +# define libm_alias_ldouble_other_r_f128(from, to, r) \ weak_alias (from ## l ## r, to ## f128 ## r) #else -# define libm_alias_ldouble_other_r(from, to, r) +# define libm_alias_ldouble_other_r_f128(from, to, r) +#endif + +#if __HAVE_FLOAT64X_LONG_DOUBLE +# define libm_alias_ldouble_other_r_f64x(from, to, r) \ + weak_alias (from ## l ## r, to ## f64x ## r) +#else +# define libm_alias_ldouble_other_r_f64x(from, to, r) #endif +/* Define _FloatN / _FloatNx aliases for a long double libm function + that has internal name FROM ## l ## R and public names TO ## suffix + ## R for each suffix of a supported _FloatN / _FloatNx + floating-point type with the same format as long double. */ +#define libm_alias_ldouble_other_r(from, to, r) \ + libm_alias_ldouble_other_r_f128 (from, to, r); \ + libm_alias_ldouble_other_r_f64x (from, to, r) + /* Likewise, but without the R suffix. */ #define libm_alias_ldouble_other(from, to) \ libm_alias_ldouble_other_r (from, to, )