From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com [68.232.129.153]) by sourceware.org (Postfix) with ESMTPS id 465A63842ACD; Thu, 30 Jun 2022 12:30:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 465A63842ACD 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.92,234,1650960000"; d="diff'?scan'208";a="80770696" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 30 Jun 2022 04:30:29 -0800 IronPort-SDR: k4OPKYH5VG7S5qGEdbN3ctVP0KJZ0m6PlwfUflD2llb0Pny7RyNgGbOnZb2SXIKGXXviSYdIDh 4f6i70QAgXBBJGuLd7c3u4URTb381+r7U4AjvmxoXgFPwSz1FDZyR4wlEje+8e3xTu3SBiPquW diT2vvlDMTKInNQ9yR8fyNxKOvxZhVv8Ffxaf4iO6Dck7BonWXXg71DpfNVRCkBSw4/aQ1CFmz zl3ru3JM5HissGXRJvnCJIFS3pLdz7WvMX6cV26T+zK4+oE9jFQE0sSyVS9ELQSUpqwGEXa8cY 2VQ= Content-Type: multipart/mixed; boundary="------------GHc0jUVP5rRHRJjkhlikM003" Message-ID: <783d48b1-3939-19c6-78ce-dc0e0cc59231@codesourcery.com> Date: Thu, 30 Jun 2022 14:30:24 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Content-Language: en-US To: Jakub Jelinek , gcc-patches , fortran From: Tobias Burnus Subject: [Patch] Fortran: Cleanup OpenMP match{o,s,do,ds} macros 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, T_SCC_BODY_TEXT_LINE 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: fortran@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Fortran mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jun 2022 12:30:34 -0000 --------------GHc0jUVP5rRHRJjkhlikM003 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: quoted-printable I initially thought that I need another set of macros - and started with this cleanup. I then realized that I don't. However, I still wonder whether this cleanup makes sense even if only 4 macros are affected. OK for mainline - or should I put that patch into the bin? Tobias ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstra=C3=9Fe 201= , 80634 M=C3=BCnchen; Gesellschaft mit beschr=C3=A4nkter Haftung; Gesch=C3= =A4ftsf=C3=BChrer: Thomas Heurung, Frank Th=C3=BCrauf; Sitz der Gesellschaf= t: M=C3=BCnchen; Registergericht M=C3=BCnchen, HRB 106955 --------------GHc0jUVP5rRHRJjkhlikM003 Content-Type: text/x-patch; charset="UTF-8"; name="omp-match-macro.diff" Content-Disposition: attachment; filename="omp-match-macro.diff" Content-Transfer-Encoding: base64 Rm9ydHJhbjogQ2xlYW51cCBPcGVuTVAgbWF0Y2h7byxzLGRvLGRzfSBtYWNyb3MKCkNyZWF0 ZSBtYXRjaF9pbnRlcm5hbCBhcyB1bml2ZXJzYWwgbWFjcm8gYW5kIHVzZSBpdCB0bwpkZWZp bmUgbWF0Y2h7byxzLGRvLGRzfQoKZ2NjL2ZvcnRyYW4vQ2hhbmdlTG9nOgoKICAgICAgICAq IHBhcnNlLmNjIChtYXRjaF9pbnRlcm5hbCk6IE5ldyBtYWNyby4KICAgICAgICAobWF0Y2hv LCBtYXRjaHMsIG1hdGNoZHMsIG1hdGNoZG8pOiBVc2UgaXQuCgpkaWZmIC0tZ2l0IGEvZ2Nj L2ZvcnRyYW4vcGFyc2UuY2MgYi9nY2MvZm9ydHJhbi9wYXJzZS5jYwppbmRleCA3MzU2ZDFi NWEzYS4uZWJlMjdhNzU2OWYgMTAwNjQ0Ci0tLSBhL2djYy9mb3J0cmFuL3BhcnNlLmNjCisr KyBiL2djYy9mb3J0cmFuL3BhcnNlLmNjCkBAIC03NDUsODEgKzc0NSw1OCBAQCBkZWNvZGVf b2FjY19kaXJlY3RpdmUgKHZvaWQpCiAgIHJldHVybiBTVF9HRVRfRkNOX0NIQVJBQ1RFUklT VElDUzsKIH0KIAotLyogTGlrZSBtYXRjaCwgYnV0IHNldCBhIGZsYWcgc2ltZF9tYXRjaGVk IGlmIGtleXdvcmQgbWF0Y2hlZAotICAgYW5kIGlmIHNwZWNfb25seSwgZ290byBkb19zcGVj X29ubHkgd2l0aG91dCBhY3R1YWxseSBtYXRjaGluZy4gICovCi0jZGVmaW5lIG1hdGNocyhr ZXl3b3JkLCBzdWJyLCBzdCkJCQkJXAotICAgIGRvIHsJCQkJCQkJXAotICAgICAgbWF0Y2gg bTI7CQkJCQkJCVwKLSAgICAgIGlmIChzcGVjX29ubHkgJiYgZ2ZjX21hdGNoIChrZXl3b3Jk KSA9PSBNQVRDSF9ZRVMpCVwKLQlnb3RvIGRvX3NwZWNfb25seTsJCQkJCVwKLSAgICAgIGlm ICgobTIgPSBtYXRjaF93b3JkX29tcF9zaW1kIChrZXl3b3JkLCBzdWJyLCAmb2xkX2xvY3Vz LAlcCi0JCQkgICAgICAgJnNpbWRfbWF0Y2hlZCkpID09IE1BVENIX1lFUykJXAotCXsJCQkJ CQkJXAotCSAgcmV0ID0gc3Q7CQkJCQkJXAotCSAgZ290byBmaW5pc2g7CQkJCQkJXAotCX0J CQkJCQkJXAotICAgICAgZWxzZSBpZiAobTIgPT0gTUFUQ0hfRVJST1IpCQkJCVwKLQlnb3Rv IGVycm9yX2hhbmRsaW5nOwkJCQkJXAotICAgICAgZWxzZQkJCQkJCQlcCi0JdW5kb19uZXdf c3RhdGVtZW50ICgpOwkJCQkgIAlcCisvKiBMaWtlIG1hdGNoLCBidXQgd2l0aCBzb21lIHNw ZWNpYWwgaGFuZGxpbmc6CisgICAtIGRvc2ltZCAtIGlmIGZhbHNlLCBkb24ndCBkbyBhbnl0 aGluZyBpZiBub3QgLWZvcGVubXAsCisgICAgIG90aGVyd2lzZSBkbyBtYXRjaF93b3JkX29t cF9zaW1kIG1hdGNoaW5nCisgICAtIGlmIGRvc3BlY19vbmx5OiBpZiBzcGVjX29ubHksIGdv dG8gZG9fc3BlY19vbmx5IGFmdGVyIG1hdGNoaW5nLgorCisgICBJZiB0aGUgZGlyZWN0aXZl IG1hdGNoZWQgYnV0IHRoZSBjbGF1c2VzIGZhaWxlZCwgZG8gbm90IHN0YXJ0CisgICBtYXRj aGluZyB0aGUgbmV4dCBkaXJlY3RpdmUgaW4gdGhlIHNhbWUgc3dpdGNoIHN0YXRlbWVudC4g ICovCisKKyNkZWZpbmUgbWF0Y2hfaW50ZXJuYWwobWF0Y2hfc2ltZCwgbWF0Y2hfc3BlY19v bmx5LCBrZXl3b3JkLCBzdWJyLCBzdCkJICAgIFwKKyAgICBkbyB7CQkJCQkJCQkgICAgXAor ICAgICAgbWF0Y2ggbTI7CQkJCQkJCQkgICAgXAorICAgICAgaWYgKCFtYXRjaF9zaW1kICYm ICFmbGFnX29wZW5tcCkJCQkJCSAgICBcCisJOwkJCQkJCQkJICAgIFwKKyAgICAgIGVsc2Ug aWYgKG1hdGNoX3NwZWNfb25seQkJCQkJCSAgICBcCisJICAgICAgICYmIHNwZWNfb25seQkJ CQkJCSAgICBcCisJICAgICAgICYmIGdmY19tYXRjaCAoa2V5d29yZCkgPT0gTUFUQ0hfWUVT KQkJCSAgICBcCisJZ290byBkb19zcGVjX29ubHk7CQkJCQkJICAgIFwKKyAgICAgIGVsc2Ug aWYgKCFtYXRjaF9zaW1kCQkJCQkJCSAgICBcCisJICAgICAgICYmICgobTIgPSBtYXRjaF93 b3JkIChrZXl3b3JkLCBzdWJyLCAmb2xkX2xvY3VzKSkJICAgIFwKKwkJICAgPT0gTUFUQ0hf WUVTKSkJCQkJCSAgICBcCisJewkJCQkJCQkJICAgIFwKKwkgIHJldCA9IHN0OwkJCQkJCQkg ICAgXAorCSAgZ290byBmaW5pc2g7CQkJCQkJCSAgICBcCisJfQkJCQkJCQkJICAgIFwKKyAg ICAgIGVsc2UgaWYgKG1hdGNoX3NpbWQJCQkJCQkJICAgIFwKKwkgICAgICAgJiYgKG0yID0g bWF0Y2hfd29yZF9vbXBfc2ltZCAoa2V5d29yZCwgc3ViciwgJm9sZF9sb2N1cywJICAgIFwK KwkJCQkJICAgICAmc2ltZF9tYXRjaGVkKSkgPT0gTUFUQ0hfWUVTKSAgXAorCXsJCQkJCQkJ CSAgICBcCisJICByZXQgPSBzdDsJCQkJCQkJICAgIFwKKwkgIGdvdG8gZmluaXNoOwkJCQkJ CQkgICAgXAorCX0JCQkJCQkJCSAgICBcCisgICAgICBlbHNlIGlmIChtMiA9PSBNQVRDSF9F UlJPUikJCQkJCSAgICBcCisJZ290byBlcnJvcl9oYW5kbGluZzsJCQkJCQkgICAgXAorICAg ICAgZWxzZQkJCQkJCQkJICAgIFwKKwl1bmRvX25ld19zdGF0ZW1lbnQgKCk7CQkJCQkJICAg IFwKICAgICB9IHdoaWxlICgwKQogCi0vKiBMaWtlIG1hdGNoLCBidXQgZG9uJ3QgbWF0Y2gg YW55dGhpbmcgaWYgbm90IC1mb3Blbm1wCi0gICBhbmQgaWYgc3BlY19vbmx5LCBnb3RvIGRv X3NwZWNfb25seSB3aXRob3V0IGFjdHVhbGx5IG1hdGNoaW5nLiAgKi8KLS8qIElmIHRoZSBk aXJlY3RpdmUgbWF0Y2hlZCBidXQgdGhlIGNsYXVzZXMgZmFpbGVkLCBkbyBub3Qgc3RhcnQK LSAgIG1hdGNoaW5nIHRoZSBuZXh0IGRpcmVjdGl2ZSBpbiB0aGUgc2FtZSBzd2l0Y2ggc3Rh dGVtZW50LiAqLwotI2RlZmluZSBtYXRjaG8oa2V5d29yZCwgc3Viciwgc3QpCQkJCVwKLSAg ICBkbyB7CQkJCQkJCVwKLSAgICAgIG1hdGNoIG0yOwkJCQkJCQlcCi0gICAgICBpZiAoIWZs YWdfb3Blbm1wKQkJCQkJCVwKLQk7CQkJCQkJCVwKLSAgICAgIGVsc2UgaWYgKHNwZWNfb25s eSAmJiBnZmNfbWF0Y2ggKGtleXdvcmQpID09IE1BVENIX1lFUykJXAotCWdvdG8gZG9fc3Bl Y19vbmx5OwkJCQkJXAotICAgICAgZWxzZSBpZiAoKG0yID0gbWF0Y2hfd29yZCAoa2V5d29y ZCwgc3ViciwgJm9sZF9sb2N1cykpCVwKLQkgICAgICAgPT0gTUFUQ0hfWUVTKQkJCQkJXAot CXsJCQkJCQkJXAotCSAgcmV0ID0gc3Q7CQkJCQkJXAotCSAgZ290byBmaW5pc2g7CQkJCQkJ XAotCX0JCQkJCQkJXAotICAgICAgZWxzZSBpZiAobTIgPT0gTUFUQ0hfRVJST1IpCQkJCVwK LQlnb3RvIGVycm9yX2hhbmRsaW5nOwkJCQkJXAotICAgICAgZWxzZQkJCQkJCQlcCi0JdW5k b19uZXdfc3RhdGVtZW50ICgpOwkJCQkgIAlcCi0gICAgfSB3aGlsZSAoMCkKKy8qIExpa2Ug bWF0Y2guIERvZXMgc2ltZCBtYXRjaGluZzsgc2V0cyBmbGFnIHNpbWRfbWF0Y2hlZCBpZiBr ZXl3b3JkIG1hdGNoZWQuICovCisjZGVmaW5lIG1hdGNoZHMoa2V5d29yZCwgc3Viciwgc3Qp CQkJXAorICBtYXRjaF9pbnRlcm5hbCh0cnVlLCBmYWxzZSwga2V5d29yZCwgc3Viciwgc3Qp CiAKLS8qIExpa2UgbWF0Y2gsIGJ1dCBzZXQgYSBmbGFnIHNpbWRfbWF0Y2hlZCBpZiBrZXl3 b3JkIG1hdGNoZWQuICAqLwotI2RlZmluZSBtYXRjaGRzKGtleXdvcmQsIHN1YnIsIHN0KQkJ CQlcCi0gICAgZG8gewkJCQkJCQlcCi0gICAgICBtYXRjaCBtMjsJCQkJCQkJXAotICAgICAg aWYgKChtMiA9IG1hdGNoX3dvcmRfb21wX3NpbWQgKGtleXdvcmQsIHN1YnIsICZvbGRfbG9j dXMsCVwKLQkJCSAgICAgICAmc2ltZF9tYXRjaGVkKSkgPT0gTUFUQ0hfWUVTKQlcCi0JewkJ CQkJCQlcCi0JICByZXQgPSBzdDsJCQkJCQlcCi0JICBnb3RvIGZpbmlzaDsJCQkJCQlcCi0J fQkJCQkJCQlcCi0gICAgICBlbHNlIGlmIChtMiA9PSBNQVRDSF9FUlJPUikJCQkJXAotCWdv dG8gZXJyb3JfaGFuZGxpbmc7CQkJCQlcCi0gICAgICBlbHNlCQkJCQkJCVwKLQl1bmRvX25l d19zdGF0ZW1lbnQgKCk7CQkJCSAgCVwKLSAgICB9IHdoaWxlICgwKQorLyogTGlrZSBtYXRj aGRzLCBidXQgYWxzbyBob25vcnMgc3BlY19vbmx5LiAgKi8KKyNkZWZpbmUgbWF0Y2hzKGtl eXdvcmQsIHN1YnIsIHN0KQkJCVwKKyAgbWF0Y2hfaW50ZXJuYWwodHJ1ZSwgdHJ1ZSwga2V5 d29yZCwgc3Viciwgc3QpCiAKIC8qIExpa2UgbWF0Y2gsIGJ1dCBkb24ndCBtYXRjaCBhbnl0 aGluZyBpZiBub3QgLWZvcGVubXAuICAqLwotI2RlZmluZSBtYXRjaGRvKGtleXdvcmQsIHN1 YnIsIHN0KQkJCQlcCi0gICAgZG8gewkJCQkJCQlcCi0gICAgICBtYXRjaCBtMjsJCQkJCQkJ XAotICAgICAgaWYgKCFmbGFnX29wZW5tcCkJCQkJCQlcCi0JOwkJCQkJCQlcCi0gICAgICBl bHNlIGlmICgobTIgPSBtYXRjaF93b3JkIChrZXl3b3JkLCBzdWJyLCAmb2xkX2xvY3VzKSkJ XAotCSAgICAgICA9PSBNQVRDSF9ZRVMpCQkJCQlcCi0JewkJCQkJCQlcCi0JICByZXQgPSBz dDsJCQkJCQlcCi0JICBnb3RvIGZpbmlzaDsJCQkJCQlcCi0JfQkJCQkJCQlcCi0gICAgICBl bHNlIGlmIChtMiA9PSBNQVRDSF9FUlJPUikJCQkJXAotCWdvdG8gZXJyb3JfaGFuZGxpbmc7 CQkJCQlcCi0gICAgICBlbHNlCQkJCQkJCVwKLQl1bmRvX25ld19zdGF0ZW1lbnQgKCk7CQkJ CSAgCVwKLSAgICB9IHdoaWxlICgwKQorI2RlZmluZSBtYXRjaGRvKGtleXdvcmQsIHN1YnIs IHN0KQkJCVwKKyAgbWF0Y2hfaW50ZXJuYWwoZmFsc2UsIGZhbHNlLCBrZXl3b3JkLCBzdWJy LCBzdCkKKworLyogTGlrZSBtYXRjaGRvLCBidXQgYWxzbyBob25vcnMgc3BlY19vbmx5LiAg Ki8KKyNkZWZpbmUgbWF0Y2hvKGtleXdvcmQsIHN1YnIsIHN0KQkJCVwKKyAgbWF0Y2hfaW50 ZXJuYWwoZmFsc2UsIHRydWUsIGtleXdvcmQsIHN1YnIsIHN0KQogCiBzdGF0aWMgZ2ZjX3N0 YXRlbWVudAogZGVjb2RlX29tcF9kaXJlY3RpdmUgKHZvaWQpCgo= --------------GHc0jUVP5rRHRJjkhlikM003--