From patchwork Fri Jan 27 08:24:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 49116 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp716869wrn; Fri, 27 Jan 2023 00:25:13 -0800 (PST) X-Google-Smtp-Source: AMrXdXtnf1nnhWdGeFkxrr/zxXAQwm9kWsviXmvbb/OE0OHlyePN7QcXmZUFrb+QLd56g4YS6G1n X-Received: by 2002:a17:907:9a09:b0:85d:3771:18b7 with SMTP id kr9-20020a1709079a0900b0085d377118b7mr42269667ejc.70.1674807913225; Fri, 27 Jan 2023 00:25:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674807913; cv=none; d=google.com; s=arc-20160816; b=T4Dcn+dGCkg00XZFjIZDgpO+kDH6elf1dMo69dYI+Pywwo/FZFyC5P5Jk9AmBUuyh2 oFjt/qOFrOtBfQ3M/CeOB+tR2cUB2pMTVr2Rr/Wm8Y6UVcq0FeN2+oNkBuG5dqE2XHTG R/4KmpolGOwlLiWUFR/PSM0GX+BixMAZqAdOmLYac/7yJdUJiaXGmM1WG0DX+V7IiskA LfcUZQzkeoBgUgq1l+PNEV8DDOw+ZuvJrr6YCFd/uxE9Cvs7Vi8tR86FrvNzC3S9FmkU 3zjKhAuYMlSQKZ7u1fnqfgMUMj6mmYE3H69L+mpoy46e8c3AOsmFh+cISEd/zds8PjN4 kTdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:from:to :content-language:user-agent:mime-version:date:message-id :ironport-sdr:dmarc-filter:delivered-to; bh=sqK3HsXu80KhvAP/atuhZpnvOLN5wGnfLZTFm6+UIew=; b=GIsnjs/sW0+eEU/STXsNvjHfz27C5/nAMhz6R2/ohmqL0+0DheZJ8Zm5asWCjgsLOd 53rDYCklas8oG4WMKCLBu+WAmeHOAXJAXEJ65AwoOcWFfrdol0TWARJu6kJ0MEzc5UKa dH9lztCVwebrFyww/L3dyrY3KsNRhn+O4ZpeWKBavd9IJeE/O18TLRWwT5bVp1pC1v+g uKyajhAm71uyzBpOeQkDcl91+tNmtARQqz9clJWLwKHb+6uH4CRu1p4evLFPgQoe3joT Un0gKtU6MJRc2/vQF3yxNBh8R8yccMP8wWHj5W4YGBu3erRuE14uO+Sdnc7Zx4sR27hg 18vQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id ec12-20020a170906b6cc00b007aeaacd5592si3789173ejb.124.2023.01.27.00.25.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 00:25:13 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 723963858022 for ; Fri, 27 Jan 2023 08:25:08 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id A22AE3858D20; Fri, 27 Jan 2023 08:24:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A22AE3858D20 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.97,250,1669104000"; d="diff'?scan'208";a="94774114" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 27 Jan 2023 00:24:24 -0800 IronPort-SDR: 2i8BvAo9f+y6NebaZkSNMJ8q+Zil9MKf9yPOPJ2wkbxZXIWUmuX5zUz5COfcMZEwHCvA6AeCyQ U3vjdq+GBbNZNxjmLgshRdbcwdMtYFjDPOtoZu8FX+i1s1n1to0JdqrkXq7sVVvV/zRy7qFI4v CCblbfyHqdllZZ2+CXBhlE1Kx8k2hvNFPVPuJlgA/sRIRuxa02A47lEV2v0nuvi5AWoi7IFpr3 MqMWyfucZua3PSzsL2qSIQ0AAo3b0Y7hck/br6uBG08hVamy6WyetxYk58c7fGhrzhrapH1FoY MwM= Message-ID: Date: Fri, 27 Jan 2023 09:24:18 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Content-Language: en-US To: gcc-patches , fortran From: Tobias Burnus Subject: [committed] gomp/declare-variant-1*.f90: Update for Windows X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-12.mgc.mentorg.com (139.181.222.12) To svr-ies-mbx-12.mgc.mentorg.com (139.181.222.12) X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham 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: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756163382335893425?= X-GMAIL-MSGID: =?utf-8?q?1756163382335893425?= Tested on x86_64-gnu-linux with -m32 and -m64. It was discussed on #gfortran IRC and tested with MinGW64 with/by nightstrike. Committed to mainline. Tobias ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 commit d1e0575fdc9216f96c4f88f9f41a25b854300c0b Author: Tobias Burnus Date: Fri Jan 27 09:13:16 2023 +0100 gomp/declare-variant-1*.f90: Update for Windows Replace target selector 'lp64' by '! ilp32' to handle Windows which uses 32bit long (and vice versa for '! lp64'). gcc/testsuite/ChangeLog: * gfortran.dg/gomp/declare-variant-10.f90: Update scan-tree's target selector to handle Windows. * gfortran.dg/gomp/declare-variant-11.f90: Likewise. * gfortran.dg/gomp/declare-variant-12.f90: Likewise. diff --git a/gcc/testsuite/gfortran.dg/gomp/declare-variant-10.f90 b/gcc/testsuite/gfortran.dg/gomp/declare-variant-10.f90 index d6d2c8c262b..2f09146a10d 100644 --- a/gcc/testsuite/gfortran.dg/gomp/declare-variant-10.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/declare-variant-10.f90 @@ -72,2 +72,2 @@ contains - call f04 () ! { dg-final { scan-tree-dump-times "f03 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } - ! { dg-final { scan-tree-dump-times "f04 \\\(\\\);" 1 "gimple" { target { { ! lp64 } || { ! { i?86-*-* x86_64-*-* } } } } } } + call f04 () ! { dg-final { scan-tree-dump-times "f03 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ! ilp32 } } } } } + ! { dg-final { scan-tree-dump-times "f04 \\\(\\\);" 1 "gimple" { target { { ilp32 } || { ! { i?86-*-* x86_64-*-* } } } } } } diff --git a/gcc/testsuite/gfortran.dg/gomp/declare-variant-11.f90 b/gcc/testsuite/gfortran.dg/gomp/declare-variant-11.f90 index 60aa0fcb3b0..3593c9a5bb3 100644 --- a/gcc/testsuite/gfortran.dg/gomp/declare-variant-11.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/declare-variant-11.f90 @@ -129,2 +129,2 @@ contains - call f27 () ! { dg-final { scan-tree-dump-times "f25 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } - ! { dg-final { scan-tree-dump-times "f24 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ! lp64 } } } } } + call f27 () ! { dg-final { scan-tree-dump-times "f25 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ! ilp32 } } } } } + ! { dg-final { scan-tree-dump-times "f24 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ilp32 } } } } } diff --git a/gcc/testsuite/gfortran.dg/gomp/declare-variant-12.f90 b/gcc/testsuite/gfortran.dg/gomp/declare-variant-12.f90 index 610693e9807..2fd8abd0dc7 100644 --- a/gcc/testsuite/gfortran.dg/gomp/declare-variant-12.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/declare-variant-12.f90 @@ -136,2 +136,2 @@ contains - call f13 () ! { dg-final { scan-tree-dump-times "f09 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } - ! { dg-final { scan-tree-dump-times "f11 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ! lp64 } } } } } + call f13 () ! { dg-final { scan-tree-dump-times "f09 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ! ilp32 } } } } } + ! { dg-final { scan-tree-dump-times "f11 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ilp32 } } } } }