From patchwork Wed Jun 29 12:15:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 55522 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 96E773850238 for ; Wed, 29 Jun 2022 12:16:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 96E773850238 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1656504987; bh=oe+l1NpYVUXFT1ztG7fWn6oVlKiXxKWCm0+wh6YJgi0=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Vw64wH6e8GX7Po6heYYHC7fMOpn6RrRyM9mHTpKrVhPLdEfBvkeVvlXj4s0Ic4G5k 4wnmet3iVFzF2F/rS4nymzVxphfDxDx+HBR3ITUvV7Ix4yzLwnvHnIm9VIdhiNOsD5 nhIKemnwbMMRdHFwQE0ARVJASJ9HBJCeVb54DKOc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 9CF65385C32E for ; Wed, 29 Jun 2022 12:15:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9CF65385C32E Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-148-LjZYDl9fNoasWUonrboA3w-1; Wed, 29 Jun 2022 08:15:39 -0400 X-MC-Unique: LjZYDl9fNoasWUonrboA3w-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 050088032E3; Wed, 29 Jun 2022 12:15:39 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9959740C1289; Wed, 29 Jun 2022 12:15:38 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 25TCFaqr3998478 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 29 Jun 2022 14:15:36 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 25TCFZjQ3998477; Wed, 29 Jun 2022 14:15:35 +0200 Date: Wed, 29 Jun 2022 14:15:35 +0200 To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH] libgfortran: Switch some more __float128 uses to _Float128 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-3.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jakub Jelinek via Gcc-patches From: Jakub Jelinek Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi! My patch apparently left some __float128 uses in libgfortran that could use _Float128 instead, the following patch changes that. Ok for trunk? 2022-06-29 Jakub Jelinek * mk-kinds-h.sh: Change __float128 to _Float128 in a comment. * acinclude.m4 (LIBGFOR_CHECK_FLOAT128): Adjust comment. (LIBGFOR_CHECK_MATH_IEEE128): Use _Float128 instead of __float128. * libgfortran.h (isnan): Change __float128 to _Float128 in a comment. (__acoshieee128, __acosieee128, __asinhieee128, __asinieee128, __atan2ieee128, __atanhieee128, __atanieee128, __copysignieee128, __coshieee128, __cosieee128, __erfcieee128, __erfieee128, __expieee128, __fabsieee128, __fmaieee128, __fmodieee128, __jnieee128, __log10ieee128, __logieee128, __powieee128, __sinhieee128, __sinieee128, __sqrtieee128, __tanhieee128, __tanieee128, __ynieee128, __strtoieee128): Use _Float128 instead of __float128. * configure: Regenerated. Jakub --- libgfortran/mk-kinds-h.sh.jj 2022-06-28 13:14:45.334799175 +0200 +++ libgfortran/mk-kinds-h.sh 2022-06-29 14:01:32.935361103 +0200 @@ -67,7 +67,7 @@ for k in $possible_real_kinds; do 8) ctype="double" ; cplxtype="complex double" ; suffix="" ;; # If we have a REAL(KIND=10), it is always long double 10) ctype="long double" ; cplxtype="complex long double" ; suffix="l" ;; - # If we have a REAL(KIND=16), it is either long double or __float128 + # If we have a REAL(KIND=16), it is either long double or _Float128 16) if [ $long_double_kind -ne 16 ]; then ctype="_Float128" cplxtype="_Complex _Float128" --- libgfortran/acinclude.m4.jj 2022-06-29 11:45:19.286551469 +0200 +++ libgfortran/acinclude.m4 2022-06-29 14:00:22.964279364 +0200 @@ -261,7 +261,7 @@ __mingw_snprintf (NULL, 0, "%d\n", 1); fi ]) -dnl Check whether we have a __float128 type +dnl Check whether we have a __float128 and _Float128 type AC_DEFUN([LIBGFOR_CHECK_FLOAT128], [ LIBQUADSPEC= LIBQUADLIB= @@ -537,8 +537,8 @@ AC_DEFUN([LIBGFOR_CHECK_MATH_IEEE128], AC_REQUIRE([GCC_CHECK_MATH_HEADERS]) AC_CACHE_CHECK([for $1], [gcc_cv_math_func_$1], [AC_LINK_IFELSE([AC_LANG_SOURCE([ -__float128 $1 (__float128); -__float128 (*ptr)(__float128) = $1; +_Float128 $1 (_Float128); +_Float128 (*ptr)(_Float128) = $1; int main () --- libgfortran/libgfortran.h.jj 2022-06-28 13:14:45.333799188 +0200 +++ libgfortran/libgfortran.h 2022-06-29 14:01:14.364604813 +0200 @@ -247,7 +247,7 @@ extern int __mingw_snprintf (char *, siz Another advantage for GCC's builtins for these type-generic macros is that it handles floating-point types that the system headers - may not support (like __float128). */ + may not support (like _Float128). */ #undef isnan #define isnan(x) __builtin_isnan(x) @@ -1960,59 +1960,59 @@ internal_proto(cshift1_16_c17); /* Prototypes for the POWER __ieee128 functions. */ #ifdef POWER_IEEE128 -extern __float128 __acoshieee128 (__float128) +extern _Float128 __acoshieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __acosieee128 (__float128) +extern _Float128 __acosieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __asinhieee128 (__float128) +extern _Float128 __asinhieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __asinieee128 (__float128) +extern _Float128 __asinieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __atan2ieee128 (__float128) +extern _Float128 __atan2ieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __atanhieee128 (__float128) +extern _Float128 __atanhieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __atanieee128 (__float128) +extern _Float128 __atanieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __copysignieee128 (__float128, __float128) +extern _Float128 __copysignieee128 (_Float128, _Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __coshieee128 (__float128) +extern _Float128 __coshieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __cosieee128 (__float128) +extern _Float128 __cosieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __erfcieee128 (__float128) +extern _Float128 __erfcieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __erfieee128 (__float128) +extern _Float128 __erfieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __expieee128 (__float128) +extern _Float128 __expieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __fabsieee128 (__float128) +extern _Float128 __fabsieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __fmaieee128 (__float128, __float128, __float128) +extern _Float128 __fmaieee128 (_Float128, _Float128, _Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __fmodieee128 (__float128, __float128) +extern _Float128 __fmodieee128 (_Float128, _Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __jnieee128 (int, __float128) +extern _Float128 __jnieee128 (int, _Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __log10ieee128 (__float128) +extern _Float128 __log10ieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __logieee128 (__float128) +extern _Float128 __logieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __powieee128 (__float128) +extern _Float128 __powieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __sinhieee128 (__float128) +extern _Float128 __sinhieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __sinieee128 (__float128) +extern _Float128 __sinieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __sqrtieee128 (__float128) +extern _Float128 __sqrtieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __tanhieee128 (__float128) +extern _Float128 __tanhieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __tanieee128 (__float128) +extern _Float128 __tanieee128 (_Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __ynieee128 (int , __float128) +extern _Float128 __ynieee128 (int , _Float128) __attribute__ ((__nothrow__, __leaf__)); -extern __float128 __strtoieee128 (const char *, char **) +extern _Float128 __strtoieee128 (const char *, char **) __attribute__ ((__nothrow__, __leaf__)); extern int __snprintfieee128 (char *, size_t, const char *, ...) __attribute__ ((__nothrow__)); --- libgfortran/configure.jj 2022-06-29 11:45:49.951148846 +0200 +++ libgfortran/configure 2022-06-29 14:01:58.718022745 +0200 @@ -25862,8 +25862,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __acoshieee128 (__float128); -__float128 (*ptr)(__float128) = __acoshieee128; +_Float128 __acoshieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __acoshieee128; int main () @@ -25904,8 +25904,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __acosieee128 (__float128); -__float128 (*ptr)(__float128) = __acosieee128; +_Float128 __acosieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __acosieee128; int main () @@ -25946,8 +25946,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __asinhieee128 (__float128); -__float128 (*ptr)(__float128) = __asinhieee128; +_Float128 __asinhieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __asinhieee128; int main () @@ -25988,8 +25988,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __asinieee128 (__float128); -__float128 (*ptr)(__float128) = __asinieee128; +_Float128 __asinieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __asinieee128; int main () @@ -26030,8 +26030,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __atan2ieee128 (__float128); -__float128 (*ptr)(__float128) = __atan2ieee128; +_Float128 __atan2ieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __atan2ieee128; int main () @@ -26072,8 +26072,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __atanhieee128 (__float128); -__float128 (*ptr)(__float128) = __atanhieee128; +_Float128 __atanhieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __atanhieee128; int main () @@ -26114,8 +26114,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __atanieee128 (__float128); -__float128 (*ptr)(__float128) = __atanieee128; +_Float128 __atanieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __atanieee128; int main () @@ -26156,8 +26156,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __coshieee128 (__float128); -__float128 (*ptr)(__float128) = __coshieee128; +_Float128 __coshieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __coshieee128; int main () @@ -26198,8 +26198,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __cosieee128 (__float128); -__float128 (*ptr)(__float128) = __cosieee128; +_Float128 __cosieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __cosieee128; int main () @@ -26240,8 +26240,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __erfieee128 (__float128); -__float128 (*ptr)(__float128) = __erfieee128; +_Float128 __erfieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __erfieee128; int main () @@ -26282,8 +26282,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __expieee128 (__float128); -__float128 (*ptr)(__float128) = __expieee128; +_Float128 __expieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __expieee128; int main () @@ -26324,8 +26324,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __fabsieee128 (__float128); -__float128 (*ptr)(__float128) = __fabsieee128; +_Float128 __fabsieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __fabsieee128; int main () @@ -26366,8 +26366,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __jnieee128 (__float128); -__float128 (*ptr)(__float128) = __jnieee128; +_Float128 __jnieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __jnieee128; int main () @@ -26408,8 +26408,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __log10ieee128 (__float128); -__float128 (*ptr)(__float128) = __log10ieee128; +_Float128 __log10ieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __log10ieee128; int main () @@ -26450,8 +26450,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __logieee128 (__float128); -__float128 (*ptr)(__float128) = __logieee128; +_Float128 __logieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __logieee128; int main () @@ -26492,8 +26492,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __powieee128 (__float128); -__float128 (*ptr)(__float128) = __powieee128; +_Float128 __powieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __powieee128; int main () @@ -26534,8 +26534,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __sinhieee128 (__float128); -__float128 (*ptr)(__float128) = __sinhieee128; +_Float128 __sinhieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __sinhieee128; int main () @@ -26576,8 +26576,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __sinieee128 (__float128); -__float128 (*ptr)(__float128) = __sinieee128; +_Float128 __sinieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __sinieee128; int main () @@ -26618,8 +26618,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __sqrtieee128 (__float128); -__float128 (*ptr)(__float128) = __sqrtieee128; +_Float128 __sqrtieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __sqrtieee128; int main () @@ -26660,8 +26660,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __tanhieee128 (__float128); -__float128 (*ptr)(__float128) = __tanhieee128; +_Float128 __tanhieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __tanhieee128; int main () @@ -26702,8 +26702,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __tanieee128 (__float128); -__float128 (*ptr)(__float128) = __tanieee128; +_Float128 __tanieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __tanieee128; int main () @@ -26744,8 +26744,8 @@ fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -__float128 __ynieee128 (__float128); -__float128 (*ptr)(__float128) = __ynieee128; +_Float128 __ynieee128 (_Float128); +_Float128 (*ptr)(_Float128) = __ynieee128; int main ()