From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32071 invoked by alias); 9 May 2015 01:14:36 -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 32058 invoked by uid 89); 9 May 2015 01:14:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Sat, 09 May 2015 01:14:33 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t491EWWf025165 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 8 May 2015 21:14:32 -0400 Received: from reynosa.quesejoda.com (vpn-62-176.rdu2.redhat.com [10.10.62.176]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t491ET5e006819; Fri, 8 May 2015 21:14:30 -0400 Message-ID: <554D5F75.6080901@redhat.com> Date: Sat, 09 May 2015 01:14:00 -0000 From: Aldy Hernandez User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Richard Biener CC: gcc-patches , jason merrill Subject: Re: [patch 3/10] debug-early merge: C++ front-end References: <554C0494.7090708@redhat.com> <554D04FA.60201@redhat.com> <08D4ECE8-9250-4D9F-AFBF-F35FB23DE52E@gmail.com> In-Reply-To: <08D4ECE8-9250-4D9F-AFBF-F35FB23DE52E@gmail.com> Content-Type: multipart/mixed; boundary="------------070607050105020005040202" X-SW-Source: 2015-05/txt/msg00778.txt.bz2 This is a multi-part message in MIME format. --------------070607050105020005040202 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-length: 559 On 05/08/2015 12:20 PM, Richard Biener wrote: > Just meant that it's making the changes smaller if those bits can be checked in independently. If that's just a hassle... Well, who am I to look a gift horse in the mouth? Especially when you've volunteered to review most of this, and hopefully finish the LTO streaming work? :-))))))) That being said... here is the latest C++ patch bereft of C++ mangling and Java aliases. Indeed it looks mighty clean. I'm tempted to commit it as obvious... :). The rest of the patches remain as is. Thanks. Aldy --------------070607050105020005040202 Content-Type: text/plain; charset=UTF-8; name="curr" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="curr" Content-length: 15543 Y29tbWl0IDczMzU3ZGU0NDJjYTMxN2U0NzhjZmNiNmMwZjlkYTYzMGQxNDI3 NzUKQXV0aG9yOiBBbGR5IEhlcm5hbmRleiA8YWxkeWhAcmVkaGF0LmNvbT4K RGF0ZTogICBGcmkgTWF5IDggMTc6MjY6MzIgMjAxNSAtMDcwMAoKICAgIAkq IGNwLW9iamNwLWNvbW1vbi5jOiBVcGRhdGUgY29tbWVudCBmb3IKICAgIAlj eHhfd2Fybl91bnVzZWRfZ2xvYmFsX2RlY2wuCiAgICAJKiBjcC1vYmpjcC1j b21tb24uaCAoTEFOR19IT09LU19XUklURV9HTE9CQUxTKTogUmVtb3ZlLgog ICAgCShMQU5HX0hPT0tTX1BPU1RfQ09NUElMQVRJT05fUEFSU0lOR19DTEVB TlVQUyk6IE5ldy4KICAgIAkqIGNwLXRyZWUuaCAoY3Bfd3JpdGVfZ2xvYmFs X2RlY2xhcmF0aW9ucyk6IFJlbW92ZS4KICAgIAkoY3h4X3Bvc3RfY29tcGls YXRpb25fcGFyc2luZ19jbGVhbnVwcyk6IE5ldy4KICAgIAkod3JhcHVwX2ds b2JhbHNfZm9yX25hbWVzcGFjZSk6IEFkZCBhcmd1bWVudC4KICAgIAkqIGRl Y2wuYyAod3JhcHVwX2dsb2JhbHNfZm9yX25hbWVzcGFjZSk6IFRhZyB1bnVz ZWQgYXJndW1lbnQgd2l0aAogICAgCUFUVFJJQlVURV9VTlVTRUQuCiAgICAJ KiBkZWNsMi5jIChsb2N1c19hdF9lbmRfb2ZfcGFyc2luZyk6IE5ldyBnbG9i YWwuCiAgICAJKGNfcGFyc2VfZmluYWxfY2xlYW51cHMpOiBSZW5hbWUgZnJv bQogICAgCWNwX3dyaXRlX2dsb2JhbF9kZWNsYXJhdGlvbnMuICBVc2UgbG9j dXNfYXRfZW5kX29mX3BhcnNpbmcuCiAgICAJU3RhcnQgY29ycmVjdCBUVl9Q SEFTRV8qIHRpbWVycy4KICAgIAlSZW1vdmUgY29kZSBjYWxsaW5nIGZpbmFs aXplX2NvbXBpbGF0aW9uX3VuaXQuCiAgICAJTW92ZSB2dGFibGUgdmVyaWZ5 IGNvZGUgaW50byBpdHMgb3duIGZ1bmN0aW9uLi4uCiAgICAJKGN4eF9wb3N0 X2NvbXBpbGF0aW9uX3BhcnNpbmdfY2xlYW51cHMpOiAuLi5oZXJlLgogICAg CSogbmFtZS1sb29rdXAuYyAoZG9fbmFtZXNwYWNlX2FsaWFzKTogUmVuYW1l IGdsb2JhbF9kZWNsIHRvCiAgICAJZWFybHlfZ2xvYmFsX2RlY2wuCgpkaWZm IC0tZ2l0IGEvZ2NjL2NwL0NoYW5nZUxvZyBiL2djYy9jcC9DaGFuZ2VMb2cK aW5kZXggNGIyN2Y1ZC4uMjQ1YTIzZSAxMDA2NDQKLS0tIGEvZ2NjL2NwL0No YW5nZUxvZworKysgYi9nY2MvY3AvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTUtMDUtMDggIEFsZHkgSGVybmFuZGV6ICA8YWxkeWhAcmVkaGF0 LmNvbT4KKworCSogY3Atb2JqY3AtY29tbW9uLmM6IFVwZGF0ZSBjb21tZW50 IGZvcgorCWN4eF93YXJuX3VudXNlZF9nbG9iYWxfZGVjbC4KKwkqIGNwLW9i amNwLWNvbW1vbi5oIChMQU5HX0hPT0tTX1dSSVRFX0dMT0JBTFMpOiBSZW1v dmUuCisJKExBTkdfSE9PS1NfUE9TVF9DT01QSUxBVElPTl9QQVJTSU5HX0NM RUFOVVBTKTogTmV3LgorCSogY3AtdHJlZS5oIChjcF93cml0ZV9nbG9iYWxf ZGVjbGFyYXRpb25zKTogUmVtb3ZlLgorCShjeHhfcG9zdF9jb21waWxhdGlv bl9wYXJzaW5nX2NsZWFudXBzKTogTmV3LgorCSh3cmFwdXBfZ2xvYmFsc19m b3JfbmFtZXNwYWNlKTogQWRkIGFyZ3VtZW50LgorCSogZGVjbC5jICh3cmFw dXBfZ2xvYmFsc19mb3JfbmFtZXNwYWNlKTogVGFnIHVudXNlZCBhcmd1bWVu dCB3aXRoCisJQVRUUklCVVRFX1VOVVNFRC4KKwkqIGRlY2wyLmMgKGxvY3Vz X2F0X2VuZF9vZl9wYXJzaW5nKTogTmV3IGdsb2JhbC4KKwkoY19wYXJzZV9m aW5hbF9jbGVhbnVwcyk6IFJlbmFtZSBmcm9tCisJY3Bfd3JpdGVfZ2xvYmFs X2RlY2xhcmF0aW9ucy4gIFVzZSBsb2N1c19hdF9lbmRfb2ZfcGFyc2luZy4K KwlTdGFydCBjb3JyZWN0IFRWX1BIQVNFXyogdGltZXJzLgorCVJlbW92ZSBj b2RlIGNhbGxpbmcgZmluYWxpemVfY29tcGlsYXRpb25fdW5pdC4KKwlNb3Zl IHZ0YWJsZSB2ZXJpZnkgY29kZSBpbnRvIGl0cyBvd24gZnVuY3Rpb24uLi4K KwkoY3h4X3Bvc3RfY29tcGlsYXRpb25fcGFyc2luZ19jbGVhbnVwcyk6IC4u LmhlcmUuCisJKiBuYW1lLWxvb2t1cC5jIChkb19uYW1lc3BhY2VfYWxpYXMp OiBSZW5hbWUgZ2xvYmFsX2RlY2wgdG8KKwllYXJseV9nbG9iYWxfZGVjbC4K KwogMjAxNS0wNS0wOCAgSmFzb24gTWVycmlsbCAgPGphc29uQHJlZGhhdC5j b20+CiAKIAkqIGRlY2wyLmMgKG1hbmdsaW5nX2FsaWFzZXMpOiBOZXcgdmFy aWFibGUuCmRpZmYgLS1naXQgYS9nY2MvY3AvY3Atb2JqY3AtY29tbW9uLmMg Yi9nY2MvY3AvY3Atb2JqY3AtY29tbW9uLmMKaW5kZXggZGQ4ZTdjNS4uNDBi MTNlZiAxMDA2NDQKLS0tIGEvZ2NjL2NwL2NwLW9iamNwLWNvbW1vbi5jCisr KyBiL2djYy9jcC9jcC1vYmpjcC1jb21tb24uYwpAQCAtNjAsNyArNjAsNyBA QCBjeHhfZ2V0X2FsaWFzX3NldCAodHJlZSB0KQogICByZXR1cm4gY19jb21t b25fZ2V0X2FsaWFzX3NldCAodCk7CiB9CiAKLS8qIENhbGxlZCBmcm9tIGNo ZWNrX2dsb2JhbF9kZWNsYXJhdGlvbnMuICAqLworLyogQ2FsbGVkIGZyb20g Y2hlY2tfZ2xvYmFsX2RlY2xhcmF0aW9uLiAgKi8KIAogYm9vbAogY3h4X3dh cm5fdW51c2VkX2dsb2JhbF9kZWNsIChjb25zdF90cmVlIGRlY2wpCmRpZmYg LS1naXQgYS9nY2MvY3AvY3Atb2JqY3AtY29tbW9uLmggYi9nY2MvY3AvY3At b2JqY3AtY29tbW9uLmgKaW5kZXggOGEzNmU3Zi4uYzg1NzJhNyAxMDA2NDQK LS0tIGEvZ2NjL2NwL2NwLW9iamNwLWNvbW1vbi5oCisrKyBiL2djYy9jcC9j cC1vYmpjcC1jb21tb24uaApAQCAtODQsOCArODQsOCBAQCBleHRlcm4gdm9p ZCBjcF9jb21tb25faW5pdF90cyAodm9pZCk7CiAjZGVmaW5lIExBTkdfSE9P S1NfUFJJTlRfRVJST1JfRlVOQ1RJT04JY3h4X3ByaW50X2Vycm9yX2Z1bmN0 aW9uCiAjdW5kZWYgTEFOR19IT09LU19XQVJOX1VOVVNFRF9HTE9CQUxfREVD TAogI2RlZmluZSBMQU5HX0hPT0tTX1dBUk5fVU5VU0VEX0dMT0JBTF9ERUNM IGN4eF93YXJuX3VudXNlZF9nbG9iYWxfZGVjbAotI3VuZGVmIExBTkdfSE9P S1NfV1JJVEVfR0xPQkFMUwotI2RlZmluZSBMQU5HX0hPT0tTX1dSSVRFX0dM T0JBTFMgY3Bfd3JpdGVfZ2xvYmFsX2RlY2xhcmF0aW9ucworI3VuZGVmIExB TkdfSE9PS1NfUE9TVF9DT01QSUxBVElPTl9QQVJTSU5HX0NMRUFOVVBTCisj ZGVmaW5lIExBTkdfSE9PS1NfUE9TVF9DT01QSUxBVElPTl9QQVJTSU5HX0NM RUFOVVBTIGN4eF9wb3N0X2NvbXBpbGF0aW9uX3BhcnNpbmdfY2xlYW51cHMK ICN1bmRlZiAgTEFOR19IT09LU19CVUlMVElOX0ZVTkNUSU9OCiAjZGVmaW5l IExBTkdfSE9PS1NfQlVJTFRJTl9GVU5DVElPTiBjeHhfYnVpbHRpbl9mdW5j dGlvbgogI3VuZGVmICBMQU5HX0hPT0tTX0JVSUxUSU5fRlVOQ1RJT05fRVhU X1NDT1BFCmRpZmYgLS1naXQgYS9nY2MvY3AvY3AtdHJlZS5oIGIvZ2NjL2Nw L2NwLXRyZWUuaAppbmRleCA0MTM2ZDk4Li4xOTk4OTkyIDEwMDY0NAotLS0g YS9nY2MvY3AvY3AtdHJlZS5oCisrKyBiL2djYy9jcC9jcC10cmVlLmgKQEAg LTU0NjksNyArNTQ2OSw3IEBAIGV4dGVybiB0cmVlIGNwX3JlY29uc3RydWN0 X2NvbXBsZXhfdHlwZQkJKHRyZWUsIHRyZWUpOwogZXh0ZXJuIGJvb2wgYXR0 cmlidXRlc19uYW1pbmdfdHlwZWRlZl9vawkodHJlZSk7CiBleHRlcm4gdm9p ZCBjcGx1c19kZWNsX2F0dHJpYnV0ZXMJCSh0cmVlICosIHRyZWUsIGludCk7 CiBleHRlcm4gdm9pZCBmaW5pc2hfYW5vbl91bmlvbgkJCSh0cmVlKTsKLWV4 dGVybiB2b2lkIGNwX3dyaXRlX2dsb2JhbF9kZWNsYXJhdGlvbnMJKHZvaWQp OworZXh0ZXJuIHZvaWQgY3h4X3Bvc3RfY29tcGlsYXRpb25fcGFyc2luZ19j bGVhbnVwcyAodm9pZCk7CiBleHRlcm4gdHJlZSBjb2VyY2VfbmV3X3R5cGUJ CQkodHJlZSk7CiBleHRlcm4gdHJlZSBjb2VyY2VfZGVsZXRlX3R5cGUJCQko dHJlZSk7CiBleHRlcm4gdm9pZCBjb21kYXRfbGlua2FnZQkJCSh0cmVlKTsK ZGlmZiAtLWdpdCBhL2djYy9jcC9kZWNsLmMgYi9nY2MvY3AvZGVjbC5jCmlu ZGV4IDZlYzE1NzkuLjRhNGNhZGYgMTAwNjQ0Ci0tLSBhL2djYy9jcC9kZWNs LmMKKysrIGIvZ2NjL2NwL2RlY2wuYwpAQCAtODkyLDMwICs4OTIsMTkgQEAg d2Fsa19uYW1lc3BhY2VzICh3YWxrX25hbWVzcGFjZXNfZm4gZiwgdm9pZCog ZGF0YSkKICAgcmV0dXJuIHdhbGtfbmFtZXNwYWNlc19yIChnbG9iYWxfbmFt ZXNwYWNlLCBmLCBkYXRhKTsKIH0KIAotLyogQ2FsbCB3cmFwdXBfZ2xvYmFs c19kZWNsYXJhdGlvbnMgZm9yIHRoZSBnbG9iYWxzIGluIE5BTUVTUEFDRS4g IElmCi0gICBEQVRBIGlzIG5vbi1OVUxMLCB0aGlzIGlzIHRoZSBsYXN0IHRp bWUgd2Ugd2lsbCBjYWxsCi0gICB3cmFwdXBfZ2xvYmFsX2RlY2xhcmF0aW9u cyBmb3IgdGhpcyBOQU1FU1BBQ0UuICAqLworLyogQ2FsbCB3cmFwdXBfZ2xv YmFsc19kZWNsYXJhdGlvbnMgZm9yIHRoZSBnbG9iYWxzIGluIE5BTUVTUEFD RS4gICovCiAKIGludAotd3JhcHVwX2dsb2JhbHNfZm9yX25hbWVzcGFjZSAo dHJlZSBuYW1lX3NwYWNlLCB2b2lkKiBkYXRhKQord3JhcHVwX2dsb2JhbHNf Zm9yX25hbWVzcGFjZSAodHJlZSBuYW1lX3NwYWNlLCB2b2lkICpkYXRhIEFU VFJJQlVURV9VTlVTRUQpCiB7CiAgIGNwX2JpbmRpbmdfbGV2ZWwgKmxldmVs ID0gTkFNRVNQQUNFX0xFVkVMIChuYW1lX3NwYWNlKTsKICAgdmVjPHRyZWUs IHZhX2djPiAqc3RhdGljcyA9IGxldmVsLT5zdGF0aWNfZGVjbHM7CiAgIHRy ZWUgKnZlYyA9IHN0YXRpY3MtPmFkZHJlc3MgKCk7CiAgIGludCBsZW4gPSBz dGF0aWNzLT5sZW5ndGggKCk7Ci0gIGludCBsYXN0X3RpbWUgPSAoZGF0YSAh PSAwKTsKLQotICBpZiAobGFzdF90aW1lKQotICAgIHsKLSAgICAgIGNoZWNr X2dsb2JhbF9kZWNsYXJhdGlvbnMgKHZlYywgbGVuKTsKLSAgICAgIGVtaXRf ZGVidWdfZ2xvYmFsX2RlY2xhcmF0aW9ucyAodmVjLCBsZW4pOwotICAgICAg cmV0dXJuIDA7Ci0gICAgfQogCiAgIC8qIFdyaXRlIG91dCBhbnkgZ2xvYmFs cyB0aGF0IG5lZWQgdG8gYmUgb3V0cHV0LiAgKi8KICAgcmV0dXJuIHdyYXB1 cF9nbG9iYWxfZGVjbGFyYXRpb25zICh2ZWMsIGxlbik7CiB9Ci0KIAwKIC8q IEluIEMrKywgeW91IGRvbid0IGhhdmUgdG8gd3JpdGUgYHN0cnVjdCBTJyB0 byByZWZlciB0byBgUyc7IHlvdQogICAgY2FuIGp1c3QgdXNlIGBTJy4gIFdl IGFjY29tcGxpc2ggdGhpcyBieSBjcmVhdGluZyBhIFRZUEVfREVDTCBhcwpk aWZmIC0tZ2l0IGEvZ2NjL2NwL2RlY2wyLmMgYi9nY2MvY3AvZGVjbDIuYwpp bmRleCBkNDM1YWYyLi43MzdkYjhjIDEwMDY0NAotLS0gYS9nY2MvY3AvZGVj bDIuYworKysgYi9nY2MvY3AvZGVjbDIuYwpAQCAtNDM1OCw2ICs0MzU4LDgg QEAgZHVtcF90dSAodm9pZCkKICAgICB9CiB9CiAKK3N0YXRpYyBsb2NhdGlv bl90IGxvY3VzX2F0X2VuZF9vZl9wYXJzaW5nOworCiAvKiBDaGVjayB0aGUg ZGVhbGxvY2F0aW9uIGZ1bmN0aW9ucyBmb3IgQ09ERSB0byBzZWUgaWYgd2Ug d2FudCB0byB3YXJuIHRoYXQKICAgIG9ubHkgb25lIHdhcyBkZWZpbmVkLiAg Ki8KIApAQCAtNDQwNSwxNyArNDQwNywxNiBAQCBtYXliZV93YXJuX3NpemVk X2RlbGV0ZSAoKQogICAgZmlyc3QsIHNpbmNlIHRoYXQgd2F5IHdlIG9ubHkg bmVlZCB0byByZXZlcnNlIHRoZSBkZWNscyBvbmNlLiAgKi8KIAogdm9pZAot Y3Bfd3JpdGVfZ2xvYmFsX2RlY2xhcmF0aW9ucyAodm9pZCkKK2NfcGFyc2Vf ZmluYWxfY2xlYW51cHMgKHZvaWQpCiB7CiAgIHRyZWUgdmFyczsKICAgYm9v bCByZWNvbnNpZGVyOwogICBzaXplX3QgaTsKLSAgbG9jYXRpb25fdCBsb2N1 czsKICAgdW5zaWduZWQgc3NkZl9jb3VudCA9IDA7CiAgIGludCByZXRyaWVz ID0gMDsKICAgdHJlZSBkZWNsOwogCi0gIGxvY3VzID0gaW5wdXRfbG9jYXRp b247CisgIGxvY3VzX2F0X2VuZF9vZl9wYXJzaW5nID0gaW5wdXRfbG9jYXRp b247CiAgIGF0X2VvZiA9IDE7CiAKICAgLyogQmFkIHBhcnNlIGVycm9ycy4g IEp1c3QgZm9yZ2V0IGFib3V0IGl0LiAgKi8KQEAgLTQ0NDcsNiArNDQ0OCw3 IEBAIGNwX3dyaXRlX2dsb2JhbF9kZWNsYXJhdGlvbnMgKHZvaWQpCiAKICAg LyogRklYTUUgLSBodWg/ICB3YXMgIGlucHV0X2xpbmUgLT0gMTsqLwogCisg IHRpbWV2YXJfc3RvcCAoVFZfUEhBU0VfUEFSU0lORyk7CiAgIHRpbWV2YXJf c3RhcnQgKFRWX1BIQVNFX0RFRkVSUkVEKTsKIAogICAvKiBXZSBub3cgaGF2 ZSB0byB3cml0ZSBvdXQgYWxsIHRoZSBzdHVmZiB3ZSBwdXQgb2ZmIHdyaXRp bmcgb3V0LgpAQCAtNDU0NCw3ICs0NTQ2LDcgQEAgY3Bfd3JpdGVfZ2xvYmFs X2RlY2xhcmF0aW9ucyAodm9pZCkKIAogCSAgLyogU2V0IHRoZSBsaW5lIGFu ZCBmaWxlLCBzbyB0aGF0IGl0IGlzIG9idmlvdXNseSBub3QgZnJvbQogCSAg ICAgdGhlIHNvdXJjZSBmaWxlLiAgKi8KLQkgIGlucHV0X2xvY2F0aW9uID0g bG9jdXM7CisJICBpbnB1dF9sb2NhdGlvbiA9IGxvY3VzX2F0X2VuZF9vZl9w YXJzaW5nOwogCSAgc3NkZl9ib2R5ID0gc3RhcnRfc3RhdGljX3N0b3JhZ2Vf ZHVyYXRpb25fZnVuY3Rpb24gKHNzZGZfY291bnQpOwogCiAJICAvKiBNYWtl IHN1cmUgdGhlIGJhY2sgZW5kIGtub3dzIGFib3V0IGFsbCB0aGUgdmFyaWFi bGVzLiAgKi8KQEAgLTQ1NzAsNyArNDU3Miw3IEBAIGNwX3dyaXRlX2dsb2Jh bF9kZWNsYXJhdGlvbnMgKHZvaWQpCiAKIAkgIC8qIEZpbmlzaCB1cCB0aGUg c3RhdGljIHN0b3JhZ2UgZHVyYXRpb24gZnVuY3Rpb24gZm9yIHRoaXMKIAkg ICAgIHJvdW5kLiAgKi8KLQkgIGlucHV0X2xvY2F0aW9uID0gbG9jdXM7CisJ ICBpbnB1dF9sb2NhdGlvbiA9IGxvY3VzX2F0X2VuZF9vZl9wYXJzaW5nOwog CSAgZmluaXNoX3N0YXRpY19zdG9yYWdlX2R1cmF0aW9uX2Z1bmN0aW9uIChz c2RmX2JvZHkpOwogCiAJICAvKiBBbGwgdGhvc2UgaW5pdGlhbGl6YXRpb25z IGFuZCBmaW5hbGl6YXRpb25zIG1pZ2h0IGNhdXNlCkBAIC00NTc4LDcgKzQ1 ODAsNyBAQCBjcF93cml0ZV9nbG9iYWxfZGVjbGFyYXRpb25zICh2b2lkKQog CSAgICAgaW5zdGFudGlhdGlvbnMsIGV0Yy4gICovCiAJICByZWNvbnNpZGVy ID0gdHJ1ZTsKIAkgIHNzZGZfY291bnQrKzsKLQkgIC8qID8/PyB3YXM6ICBs b2N1cy5saW5lKys7ICovCisJICAvKiA/Pz8gd2FzOiAgbG9jdXNfYXRfZW5k X29mX3BhcnNpbmcubGluZSsrOyAqLwogCX0KIAogICAgICAgLyogTm93IGRv IHRoZSBzYW1lIGZvciB0aHJlYWRfbG9jYWwgdmFyaWFibGVzLiAgKi8KQEAg LTQ3MjEsNyArNDcyMyw3IEBAIGNwX3dyaXRlX2dsb2JhbF9kZWNsYXJhdGlv bnMgKHZvaWQpCiAJCQkJKHRlbXBsYXRlX2Zvcl9zdWJzdGl0dXRpb24gKGRl Y2wpKSkpKQogCXsKIAkgIHdhcm5pbmcgKDAsICJpbmxpbmUgZnVuY3Rpb24g JXErRCB1c2VkIGJ1dCBuZXZlciBkZWZpbmVkIiwgZGVjbCk7Ci0JICAvKiBB dm9pZCBhIGR1cGxpY2F0ZSB3YXJuaW5nIGZyb20gY2hlY2tfZ2xvYmFsX2Rl Y2xhcmF0aW9uXzEuICAqLworCSAgLyogQXZvaWQgYSBkdXBsaWNhdGUgd2Fy bmluZyBmcm9tIGNoZWNrX2dsb2JhbF9kZWNsYXJhdGlvbi4gICovCiAJICBU UkVFX05PX1dBUk5JTkcgKGRlY2wpID0gMTsKIAl9CiAgICAgfQpAQCAtNDc0 OCwxMiArNDc1MCwxMyBAQCBjcF93cml0ZV9nbG9iYWxfZGVjbGFyYXRpb25z ICh2b2lkKQogICBpZiAocHJpb3JpdHlfaW5mb19tYXApCiAgICAgc3BsYXlf dHJlZV9mb3JlYWNoIChwcmlvcml0eV9pbmZvX21hcCwKIAkJCWdlbmVyYXRl X2N0b3JfYW5kX2R0b3JfZnVuY3Rpb25zX2Zvcl9wcmlvcml0eSwKLQkJCS8q ZGF0YT0qLyZsb2N1cyk7CisJCQkvKmRhdGE9Ki8mbG9jdXNfYXRfZW5kX29m X3BhcnNpbmcpOwogICBlbHNlIGlmIChjX2RpYWxlY3Rfb2JqYyAoKSAmJiBv YmpjX3N0YXRpY19pbml0X25lZWRlZF9wICgpKQogICAgIC8qIElmIHRoaXMg aXMgb2JqLWMrKyBhbmQgd2UgbmVlZCBhIHN0YXRpYyBpbml0LCBjYWxsCiAg ICAgICAgZ2VuZXJhdGVfY3Rvcl9vcl9kdG9yX2Z1bmN0aW9uLiAgKi8KICAg ICBnZW5lcmF0ZV9jdG9yX29yX2R0b3JfZnVuY3Rpb24gKC8qY29uc3RydWN0 b3JfcD0qL3RydWUsCi0JCQkJICAgIERFRkFVTFRfSU5JVF9QUklPUklUWSwg JmxvY3VzKTsKKwkJCQkgICAgREVGQVVMVF9JTklUX1BSSU9SSVRZLAorCQkJ CSAgICAmbG9jdXNfYXRfZW5kX29mX3BhcnNpbmcpOwogCiAgIC8qIFdlJ3Jl IGRvbmUgd2l0aCB0aGUgc3BsYXktdHJlZSBub3cuICAqLwogICBpZiAocHJp b3JpdHlfaW5mb19tYXApCkBAIC00NzcwLDcgKzQ3NzMsNyBAQCBjcF93cml0 ZV9nbG9iYWxfZGVjbGFyYXRpb25zICh2b2lkKQogICBidWlsZF9qYXZhX21l dGhvZF9hbGlhc2VzICgpOwogCiAgIHRpbWV2YXJfc3RvcCAoVFZfUEhBU0Vf REVGRVJSRUQpOwotICB0aW1ldmFyX3N0YXJ0IChUVl9QSEFTRV9PUFRfR0VO KTsKKyAgdGltZXZhcl9zdGFydCAoVFZfUEhBU0VfUEFSU0lORyk7CiAKICAg aWYgKGZsYWdfdnRhYmxlX3ZlcmlmeSkKICAgICB7CkBAIC00Nzc5LDMxICs0 NzgyLDEwIEBAIGNwX3dyaXRlX2dsb2JhbF9kZWNsYXJhdGlvbnMgKHZvaWQp CiAgICAgICB2dHZfYnVpbGRfdnRhYmxlX3ZlcmlmeV9mbmRlY2wgKCk7CiAg ICAgfQogCi0gIHN5bXRhYi0+ZmluYWxpemVfY29tcGlsYXRpb25fdW5pdCAo KTsKLQotICBpZiAoZmxhZ192dGFibGVfdmVyaWZ5KQotICAgIHsKLSAgICAg IC8qIEdlbmVyYXRlIHRoZSBzcGVjaWFsIGNvbnN0cnVjdG9yIGluaXRpYWxp emF0aW9uIGZ1bmN0aW9uIHRoYXQKLSAgICAgICAgIGNhbGxzIF9fVkxUUmVn aXN0ZXJQYWlycywgYW5kIGdpdmUgaXQgYSB2ZXJ5IGhpZ2gKLSAgICAgICAg IGluaXRpYWxpemF0aW9uIHByaW9yaXR5LiAgVGhpcyBtdXN0IGJlIGRvbmUg YWZ0ZXIKLSAgICAgICAgIGZpbmFsaXplX2NvbXBpbGF0aW9uX3VuaXQgc28g dGhhdCB3ZSBoYXZlIGFjY3VyYXRlCi0gICAgICAgICBpbmZvcm1hdGlvbiBh Ym91dCB3aGljaCB2dGFibGUgd2lsbCBhY3R1YWxseSBiZSBlbWl0dGVkLiAg Ki8KLSAgICAgIHZ0dl9nZW5lcmF0ZV9pbml0X3JvdXRpbmUgKCk7Ci0gICAg fQotCi0gIHRpbWV2YXJfc3RvcCAoVFZfUEhBU0VfT1BUX0dFTik7Ci0gIHRp bWV2YXJfc3RhcnQgKFRWX1BIQVNFX0NIRUNLX0RCR0lORk8pOwotCi0gIC8q IE5vdywgaXNzdWUgd2FybmluZ3MgYWJvdXQgc3RhdGljLCBidXQgbm90IGRl ZmluZWQsIGZ1bmN0aW9ucywKLSAgICAgZXRjLiwgYW5kIGVtaXQgZGVidWdn aW5nIGluZm9ybWF0aW9uLiAgKi8KLSAgd2Fsa19uYW1lc3BhY2VzICh3cmFw dXBfZ2xvYmFsc19mb3JfbmFtZXNwYWNlLCAvKmRhdGE9Ki8mcmVjb25zaWRl cik7Ci0gIGlmICh2ZWNfc2FmZV9sZW5ndGggKHBlbmRpbmdfc3RhdGljcykg IT0gMCkKLSAgICB7Ci0gICAgICBjaGVja19nbG9iYWxfZGVjbGFyYXRpb25z IChwZW5kaW5nX3N0YXRpY3MtPmFkZHJlc3MgKCksCi0JCQkJIHBlbmRpbmdf c3RhdGljcy0+bGVuZ3RoICgpKTsKLSAgICAgIGVtaXRfZGVidWdfZ2xvYmFs X2RlY2xhcmF0aW9ucyAocGVuZGluZ19zdGF0aWNzLT5hZGRyZXNzICgpLAot CQkJCSAgICAgIHBlbmRpbmdfc3RhdGljcy0+bGVuZ3RoICgpKTsKLSAgICB9 CisgIC8qIElzc3VlIHdhcm5pbmdzIGFib3V0IHN0YXRpYywgYnV0IG5vdCBk ZWZpbmVkLCBmdW5jdGlvbnMsIGV0YywgYW5kCisgICAgIGdlbmVyYXRlIGlu aXRpYWwgZGVidWcgaW5mb3JtYXRpb24uICAqLworICB0aW1ldmFyX3N0b3Ag KFRWX1BIQVNFX1BBUlNJTkcpOworICB0aW1ldmFyX3N0YXJ0IChUVl9QSEFT RV9EQkdJTkZPKTsKIAogICBwZXJmb3JtX2RlZmVycmVkX25vZXhjZXB0X2No ZWNrcyAoKTsKIApAQCAtNDgxOCwxMyArNDgwMCwzNyBAQCBjcF93cml0ZV9n bG9iYWxfZGVjbGFyYXRpb25zICh2b2lkKQogICAgICAgZHVtcF90cmVlX3N0 YXRpc3RpY3MgKCk7CiAgICAgICBkdW1wX3RpbWVfc3RhdGlzdGljcyAoKTsK ICAgICB9Ci0gIGlucHV0X2xvY2F0aW9uID0gbG9jdXM7CisKKyAgdGltZXZh cl9zdG9wIChUVl9QSEFTRV9EQkdJTkZPKTsKKyAgdGltZXZhcl9zdGFydCAo VFZfUEhBU0VfUEFSU0lORyk7Cit9CisKKy8qIFBlcmZvcm0gYW55IHBvc3Qg Y29tcGlsYXRpb24tcHJvcGVyIGNsZWFudXBzIGZvciB0aGUgQysrIGZyb250 LWVuZC4KKyAgIFRoaXMgc2hvdWxkIHJlYWxseSBnbyBhd2F5LiAgTm8gZnJv bnQtZW5kIHNob3VsZCBuZWVkIHRvIGRvCisgICBhbnl0aGluZyBwYXN0IHRo ZSBjb21waWxhdGlvbiBwcm9jZXNzLiAgKi8KKwordm9pZAorY3h4X3Bvc3Rf Y29tcGlsYXRpb25fcGFyc2luZ19jbGVhbnVwcyAodm9pZCkKK3sKKyAgdGlt ZXZhcl9zdGFydCAoVFZfUEhBU0VfTEFURV9QQVJTSU5HX0NMRUFOVVBTKTsK KworICBpZiAoZmxhZ192dGFibGVfdmVyaWZ5KQorICAgIHsKKyAgICAgIC8q IEdlbmVyYXRlIHRoZSBzcGVjaWFsIGNvbnN0cnVjdG9yIGluaXRpYWxpemF0 aW9uIGZ1bmN0aW9uIHRoYXQKKyAgICAgICAgIGNhbGxzIF9fVkxUUmVnaXN0 ZXJQYWlycywgYW5kIGdpdmUgaXQgYSB2ZXJ5IGhpZ2gKKyAgICAgICAgIGlu aXRpYWxpemF0aW9uIHByaW9yaXR5LiAgVGhpcyBtdXN0IGJlIGRvbmUgYWZ0 ZXIKKyAgICAgICAgIGZpbmFsaXplX2NvbXBpbGF0aW9uX3VuaXQgc28gdGhh dCB3ZSBoYXZlIGFjY3VyYXRlCisgICAgICAgICBpbmZvcm1hdGlvbiBhYm91 dCB3aGljaCB2dGFibGUgd2lsbCBhY3R1YWxseSBiZSBlbWl0dGVkLiAgKi8K KyAgICAgIHZ0dl9nZW5lcmF0ZV9pbml0X3JvdXRpbmUgKCk7CisgICAgfQor CisgIGlucHV0X2xvY2F0aW9uID0gbG9jdXNfYXRfZW5kX29mX3BhcnNpbmc7 CiAKICNpZmRlZiBFTkFCTEVfQ0hFQ0tJTkcKICAgdmFsaWRhdGVfY29udmVy c2lvbl9vYnN0YWNrICgpOwogI2VuZGlmIC8qIEVOQUJMRV9DSEVDS0lORyAq LwogCi0gIHRpbWV2YXJfc3RvcCAoVFZfUEhBU0VfQ0hFQ0tfREJHSU5GTyk7 CisgIHRpbWV2YXJfc3RvcCAoVFZfUEhBU0VfTEFURV9QQVJTSU5HX0NMRUFO VVBTKTsKIH0KIAogLyogRk4gaXMgYW4gT0ZGU0VUX1JFRiwgRE9UU1RBUl9F WFBSIG9yIE1FTUJFUl9SRUYgaW5kaWNhdGluZyB0aGUKZGlmZiAtLWdpdCBh L2djYy9jcC9uYW1lLWxvb2t1cC5jIGIvZ2NjL2NwL25hbWUtbG9va3VwLmMK aW5kZXggOWU0ZTBlMy4uZWJlYjQ3OSAxMDA2NDQKLS0tIGEvZ2NjL2NwL25h bWUtbG9va3VwLmMKKysrIGIvZ2NjL2NwL25hbWUtbG9va3VwLmMKQEAgLTM4 OTksNyArMzg5OSw3IEBAIGRvX25hbWVzcGFjZV9hbGlhcyAodHJlZSBhbGlh cywgdHJlZSBuYW1lX3NwYWNlKQogCiAgIC8qIEVtaXQgZGVidWcgaW5mbyBm b3IgbmFtZXNwYWNlIGFsaWFzLiAgKi8KICAgaWYgKCFidWlsZGluZ19zdG10 X2xpc3RfcCAoKSkKLSAgICAoKmRlYnVnX2hvb2tzLT5nbG9iYWxfZGVjbCkg KGFsaWFzKTsKKyAgICAoKmRlYnVnX2hvb2tzLT5lYXJseV9nbG9iYWxfZGVj bCkgKGFsaWFzKTsKIH0KIAogLyogTGlrZSBwdXNoZGVjbCwgb25seSBpdCBw bGFjZXMgWCBpbiB0aGUgY3VycmVudCBuYW1lc3BhY2UsCg== --------------070607050105020005040202--