From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22361 invoked by alias); 7 Jun 2015 21:06:01 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 22339 invoked by uid 89); 7 Jun 2015 21:06:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=3.7 required=5.0 tests=BAYES_95,KAM_INFOUSMEBIZ,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=no version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: forward15p.cmail.yandex.net Received: from forward15p.cmail.yandex.net (HELO forward15p.cmail.yandex.net) (87.250.241.141) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Sun, 07 Jun 2015 21:06:00 +0000 Received: from web6g.yandex.ru (web6g.yandex.ru [IPv6:2a02:6b8:0:1402::16]) by forward15p.cmail.yandex.net (Yandex) with ESMTP id 7B6B52142B; Mon, 8 Jun 2015 00:05:56 +0300 (MSK) Received: from 127.0.0.1 (localhost [127.0.0.1]) by web6g.yandex.ru (Yandex) with ESMTP id B63F15362659; Mon, 8 Jun 2015 00:05:55 +0300 (MSK) Received: by web6g.yandex.ru with HTTP; Mon, 08 Jun 2015 00:05:55 +0300 From: Ilmir Usmanov To: "cesar@codesourcery.com" Cc: "gcc-patches@gcc.gnu.org" , =?koi8-r?B?6czYzcnSIPXTzcHOz9c=?= , fortran@gcc.gnu.org In-Reply-To: <6770611433710899@web6g.yandex.ru> References: <6770611433710899@web6g.yandex.ru> Subject: Re: [gomp4, fortran] Patch to fix continuation checks of OpenACC and OpenMP directives MIME-Version: 1.0 Message-Id: <6776171433711155@web6g.yandex.ru> Date: Sun, 07 Jun 2015 21:40:00 -0000 Content-Type: multipart/mixed; boundary="----==--bound.677618.web6g.yandex.ru" X-SW-Source: 2015-06/txt/msg00518.txt.bz2 ------==--bound.677618.web6g.yandex.ru Content-Transfer-Encoding: 7bit Content-Type: text/plain Content-length: 335 Fixed fortran mail-list address. Sorry for inconvenience. 08.06.2015, 00:01, "Ilmir Usmanov" : > Hi Cesar! > > This patch fixes checks of OpenMP and OpenACC continuations in case if someone mixes them (i.e. continues OpenMP directive with !$ACC sentinel or vice versa). > > OK for gomp branch? > > -- > Ilmir. -- Ilmir. ------==--bound.677618.web6g.yandex.ru Content-Disposition: attachment; filename="0001-Fix-mix-of-OpenACC-and-OpenMP-sentinels-in-continuat.patch" Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name="0001-Fix-mix-of-OpenACC-and-OpenMP-sentinels-in-continuat.patch" Content-length: 5084 RnJvbSA1NDkyYmY1YmM5OTFiNjkyNGY1ZTNiMzVjMTFlZWFlZDc0NWRmMDcz IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBJbG1pciBVc21hbm92 IDxpLnVzbWFub3ZAc2Ftc3VuZy5jb20+CkRhdGU6IFN1biwgNyBKdW4gMjAx NSAyMzo1NToyMiArMDMwMApTdWJqZWN0OiBbUEFUQ0hdIEZpeCBtaXggb2Yg T3BlbkFDQyBhbmQgT3Blbk1QIHNlbnRpbmVscyBpbiBjb250aW51YXRpb24K Ci0tLQogZ2NjL2ZvcnRyYW4vQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAg IHwgIDUgKysrKysKIGdjYy9mb3J0cmFuL3NjYW5uZXIuYyAgICAgICAgICAg ICAgICAgICB8IDI4ICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0KIGdj Yy90ZXN0c3VpdGUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICB8ICA1ICsr KysrCiBnY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2dvYWNjL29tcC5mOTUg fCAgOCArKysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCA0MiBpbnNlcnRpb25z KCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2djYy9mb3J0cmFu L0NoYW5nZUxvZyBiL2djYy9mb3J0cmFuL0NoYW5nZUxvZwppbmRleCA2N2Y5 ZTA5Li5mNjFlMGU5IDEwMDY0NAotLS0gYS9nY2MvZm9ydHJhbi9DaGFuZ2VM b2cKKysrIGIvZ2NjL2ZvcnRyYW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsOCBA QAorMjAxNS0wNi0wNyAgSWxtaXIgVXNtYW5vdiAgPG1lQGlsbWlyLnVzPgor CisJKiBzY2FubmVyLmMgKGdmY19uZXh0X2NoYXJfbGl0ZXJhbCk6IEZpeCBt aXggb2YgT3BlbkFDQyBhbmQgT3Blbk1QCisJc2VudGluZWxzIGluIGNvbnRp bnVhdGlvbi4KKwogMjAxNS0wNS0wNSAgRGF2aWQgTWFsY29sbSAgPGRtYWxj b2xtQHJlZGhhdC5jb20+CiAKIAkqIGV4cHIuYyAoY2hlY2tfaW5xdWlyeSk6 IEZpeCBpbmRlbnRhdGlvbiBzbyB0aGF0IGl0IHJlZmxlY3RzIHRoZQpkaWZm IC0tZ2l0IGEvZ2NjL2ZvcnRyYW4vc2Nhbm5lci5jIGIvZ2NjL2ZvcnRyYW4v c2Nhbm5lci5jCmluZGV4IGYwZTY0MDQuLjVhZjRlZWEgMTAwNjQ0Ci0tLSBh L2djYy9mb3J0cmFuL3NjYW5uZXIuYworKysgYi9nY2MvZm9ydHJhbi9zY2Fu bmVyLmMKQEAgLTEzMzEsNyArMTMzMSw3IEBAIHJlc3RhcnQ6CiAJY29udGlu dWVfbGluZSA9IGdmY19saW5lYnVmX2xpbmVudW0gKGdmY19jdXJyZW50X2xv Y3VzLmxiKTsKIAogICAgICAgaWYgKGZsYWdfb3Blbm1wKQotCWlmIChwcmV2 X29wZW5tcF9mbGFnICE9IG9wZW5tcF9mbGFnKQorCWlmIChwcmV2X29wZW5t cF9mbGFnICE9IG9wZW5tcF9mbGFnICYmICFvcGVuYWNjX2ZsYWcpCiAJICB7 CiAJICAgIGdmY19jdXJyZW50X2xvY3VzID0gb2xkX2xvYzsKIAkgICAgb3Bl bm1wX2ZsYWcgPSBwcmV2X29wZW5tcF9mbGFnOwpAQCAtMTM0MCw3ICsxMzQw LDcgQEAgcmVzdGFydDoKIAkgIH0KIAogICAgICAgaWYgKGZsYWdfb3BlbmFj YykKLQlpZiAocHJldl9vcGVuYWNjX2ZsYWcgIT0gb3BlbmFjY19mbGFnKQor CWlmIChwcmV2X29wZW5hY2NfZmxhZyAhPSBvcGVuYWNjX2ZsYWcgJiYgIW9w ZW5tcF9mbGFnKQogCSAgewogCSAgICBnZmNfY3VycmVudF9sb2N1cyA9IG9s ZF9sb2M7CiAJICAgIG9wZW5hY2NfZmxhZyA9IHByZXZfb3BlbmFjY19mbGFn OwpAQCAtMTM1OSw3ICsxMzU5LDcgQEAgcmVzdGFydDoKICAgICAgIHdoaWxl IChnZmNfaXNfd2hpdGVzcGFjZSAoYykpCiAJYyA9IG5leHRfY2hhciAoKTsK IAotICAgICAgaWYgKG9wZW5tcF9mbGFnKQorICAgICAgaWYgKG9wZW5tcF9m bGFnICYmICFvcGVuYWNjX2ZsYWcpCiAJewogCSAgZm9yIChpID0gMDsgaSA8 IDU7IGkrKywgYyA9IG5leHRfY2hhciAoKSkKIAkgICAgewpAQCAtMTM3MCw3 ICsxMzcwLDcgQEAgcmVzdGFydDoKIAkgIHdoaWxlIChnZmNfaXNfd2hpdGVz cGFjZSAoYykpCiAJICAgIGMgPSBuZXh0X2NoYXIgKCk7CiAJfQotICAgICAg aWYgKG9wZW5hY2NfZmxhZykKKyAgICAgIGlmIChvcGVuYWNjX2ZsYWcgJiYg IW9wZW5tcF9mbGFnKQogCXsKIAkgIGZvciAoaSA9IDA7IGkgPCA1OyBpKyss IGMgPSBuZXh0X2NoYXIgKCkpCiAJICAgIHsKQEAgLTEzODIsNiArMTM4Miwy NiBAQCByZXN0YXJ0OgogCSAgICBjID0gbmV4dF9jaGFyICgpOwogCX0KIAor ICAgICAgLyogSW4gY2FzZSB3ZSBoYXZlIGFuIE9wZW5NUCBkaXJlY3RpdmUg Y29udGludWVkIGJ5IE9wZW5BQ0MKKwkgc2VudGluZWwsIG9yIHZpY2UgdmVy c2EsIHdlIGdldCBib3RoIG9wZW5tcF9mbGFnIGFuZAorCSBvcGVuYWNjX2Zs YWcgb24uICAqLworCisgICAgICBpZiAob3BlbmFjY19mbGFnICYmIG9wZW5t cF9mbGFnKQorCXsKKwkgIGludCBpc19vcGVubXAgPSAwOworCSAgZm9yIChp ID0gMDsgaSA8IDU7IGkrKywgYyA9IG5leHRfY2hhciAoKSkKKwkgICAgewor CSAgICAgIGlmIChnZmNfd2lkZV90b2xvd2VyIChjKSAhPSAodW5zaWduZWQg Y2hhcikgIiEkYWNjIltpXSkKKwkJaXNfb3Blbm1wID0gMTsKKwkgICAgICBp ZiAoaSA9PSA0KQorCQlvbGRfbG9jID0gZ2ZjX2N1cnJlbnRfbG9jdXM7CisJ ICAgIH0KKwkgIGdmY19lcnJvciAoIldyb25nICVzIGNvbnRpbnVhdGlvbiBh dCAlQzogZXhwZWN0ZWQgJXMsIGdvdCAlcyIsCisJICAgICAgICAgICAgIGlz X29wZW5tcCA/ICJPcGVuQUNDIiA6ICJPcGVuTVAiLAorCSAgICAgICAgICAg ICBpc19vcGVubXAgPyAiISRBQ0MiIDogIiEkT01QIiwKKwkgICAgICAgICAg ICAgaXNfb3Blbm1wID8gIiEkT01QIiA6ICIhJEFDQyIpOworCX0KKwogICAg ICAgaWYgKGMgIT0gJyYnKQogCXsKIAkgIGlmIChpbl9zdHJpbmcpCmRpZmYg LS1naXQgYS9nY2MvdGVzdHN1aXRlL0NoYW5nZUxvZyBiL2djYy90ZXN0c3Vp dGUvQ2hhbmdlTG9nCmluZGV4IDdjNDc4MWMuLjA1YTlhNTIgMTAwNjQ0Ci0t LSBhL2djYy90ZXN0c3VpdGUvQ2hhbmdlTG9nCisrKyBiL2djYy90ZXN0c3Vp dGUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsOCBAQAorMjAxNS0wNi0wNyAgSWxt aXIgVXNtYW5vdiAgPG1lQGlsbWlyLnVzPgorCisJKiBnZm9ydHJhbi5kZy9n b2FjYy9vbXAuZjk1OiBBZGQgbWl4IG9mIE9wZW5BQ0MgYW5kIE9wZW5NUAor CXNlbnRpbmVscyBpbiBjb250aW51YXRpb24gdG8gdGVzdC4KKwogMjAxNS0w NS0wNiAgWXZhbiBSb3V4ICA8eXZhbi5yb3V4QGxpbmFyby5vcmc+CiAKIAlQ UiB0YXJnZXQvNjQyMDgKZGlmZiAtLWdpdCBhL2djYy90ZXN0c3VpdGUvZ2Zv cnRyYW4uZGcvZ29hY2Mvb21wLmY5NSBiL2djYy90ZXN0c3VpdGUvZ2ZvcnRy YW4uZGcvZ29hY2Mvb21wLmY5NQppbmRleCAyNGY2MzlmLi5hNzMzM2ViIDEw MDY0NAotLS0gYS9nY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2dvYWNjL29t cC5mOTUKKysrIGIvZ2NjL3Rlc3RzdWl0ZS9nZm9ydHJhbi5kZy9nb2FjYy9v bXAuZjk1CkBAIC02Myw0ICs2MywxMiBAQCBjb250YWlucwogICAgICAhJG9t cCBlbmQgcGFyYWxsZWwKICAgICAgISRhY2MgZW5kIGRhdGEKICAgIGVuZCBz dWJyb3V0aW5lIHJva3UKKworICAgc3Vicm91dGluZSBuYW5hCisgICAgICEk YWNjIHBhcmFsbGVsICYKKyAgICAgISRvbXAgZG8gISB7IGRnLWVycm9yICJX cm9uZyBPcGVuQUNDIGNvbnRpbnVhdGlvbiIgfQorCisgICAgICEkb21wIHBh cmFsbGVsICYKKyAgICAgISRhY2MgbG9vcCAhIHsgZGctZXJyb3IgIldyb25n IE9wZW5NUCBjb250aW51YXRpb24iIH0KKyAgIGVuZCBzdWJyb3V0aW5lIG5h bmEKIGVuZCBtb2R1bGUgdGVzdApcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZp bGUKLS0gCjEuOS4xCgo= ------==--bound.677618.web6g.yandex.ru--