From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7932 invoked by alias); 6 Oct 2010 13:12:14 -0000 Received: (qmail 7465 invoked by uid 22791); 6 Oct 2010 13:12:13 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,TW_YM X-Spam-Check-By: sourceware.org Received: from mail-iw0-f169.google.com (HELO mail-iw0-f169.google.com) (209.85.214.169) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 06 Oct 2010 13:12:07 +0000 Received: by iwn2 with SMTP id 2so13468iwn.0 for ; Wed, 06 Oct 2010 06:12:06 -0700 (PDT) MIME-Version: 1.0 Received: by 10.231.172.205 with SMTP id m13mr13954332ibz.35.1286370726223; Wed, 06 Oct 2010 06:12:06 -0700 (PDT) Received: by 10.231.205.129 with HTTP; Wed, 6 Oct 2010 06:12:06 -0700 (PDT) In-Reply-To: References: <4CABB53A.8000101@vmware.com> <20101006085132.GA11910@host1.dyn.jankratochvil.net> Date: Wed, 06 Oct 2010 13:12:00 -0000 Message-ID: Subject: Re: disable objective-c stuff when theres no objective-c cu. From: Matt Rice To: Jan Kratochvil Cc: Michael Snyder , "gdb-patches@sourceware.org" Content-Type: multipart/mixed; boundary=005045015a182fa0600491f286fc X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-10/txt/msg00071.txt.bz2 --005045015a182fa0600491f286fc Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-length: 2095 On Wed, Oct 6, 2010 at 3:03 AM, Matt Rice wrote: > On Wed, Oct 6, 2010 at 1:51 AM, Jan Kratochvil > wrote: >> On Wed, 06 Oct 2010 04:30:33 +0200, Matt Rice wrote: >>> that we can lessen the impact by checking for is_objc_method, or for >>> objective-c compilation units. (is_objc_method doesn't neccesarily >>> affect future lookups should it call set_language_has_cu_loaded?) >> >> Wouldn't be enough to replace the bitmask just by? >> =A0 =A0 =A0 =A0if (current_language->la_language =3D=3D language_objc) > > objective-c uses mixed compilation units possibly more than most other > languages, i could have argued this more concisely, what I mean is that 'break' is not related to the current language, but the language which we want to be the current language when the breakpoint is hit. and so 'set language' to use language specific breakpoints is arguably wrong because the current language may not be the language of the breakpoint we want set. >>> here is when gcc started to emit DW_LANG_ObjC, maybe we could fall >>> back to source files with the .m extension. >>> http://gcc.gnu.org/ml/gcc-patches/2006-03/msg01515.html >> >> For current_language it works even without DW_LANG_ObjC due to: >> =A0 =A0 =A0 =A0init_filename_language_table (void) >> =A0 =A0 =A0 =A0 =A0 =A0 =A0add_filename_language (".m", language_objc); > > maybe the dwarf2read call to set_language_has_cu_loaded is redundant > then since i added the call from set_language > doesn't seem as though reading language symfiles frobs the current language afaict. attached should fix GDB's pre-DW_LANG_ObjC, tested it with stabs, don't have an old enough compiler to test the others easily though. attached calls set_language_has_cu_loaded when calling deduce_language_from_filename. except for the symtab case, i dont think we need it there since we should already have called it when making psytmabs. Thanks for the pointer. for some reason i installed gnat/libgnat-devel but still not getting ada testsuite :/ i'll get started looking at the new failures. --005045015a182fa0600491f286fc Content-Type: application/octet-stream; name="gdb-lang-objc.diff" Content-Disposition: attachment; filename="gdb-lang-objc.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gey7pjgt0 Content-length: 11782 ZGlmZiAtLWdpdCBhL2dkYi9ORVdTIGIvZ2RiL05FV1MKaW5kZXggODUwNTlj Ni4uMjM2OTc1MiAxMDA2NDQKLS0tIGEvZ2RiL05FV1MKKysrIGIvZ2RiL05F V1MKQEAgLTIzLDYgKzIzLDI1IEBACiAgICAgIGZlYXR1cmUgcmVxdWlyZXMg cHJvcGVyIGRlYnVnaW5mbyBzdXBwb3J0IGZyb20gdGhlIGNvbXBpbGVyOyBp dAogICAgICB3YXMgYWRkZWQgdG8gR0NDIDQuNS4KIAorKiBPYmplY3RpdmUt QyBjaGFuZ2VzOgorCisgICoqIEdEQiBPYmplY3RpdmUtQyBsYW5ndWFnZSBz dXBwb3J0IGhhcyBjaGFuZ2VkIHNvIHRoYXQgbG9va3VwcyBvZgorICAgICBP YmplY3RpdmUtYyBtZXRob2RzIGlzIG5vdyBkb25lIGlmIGFueSBvZiB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMgaXMgdHJ1ZToKKworICAgICAgICogR0RC IGhhcyBpZGVudGlmaWVkIE9iamVjdGl2ZS1DIGNvZGUgYXMgaGF2aW5nIGJl ZW4gbG9hZGVkLgorCisgICAgICAgKiBUaGUgdXNlciBoYXMgc3BlY2lmaWVk IGFuIE9iamVjdGl2ZS1jIG1ldGhvZCBleHBsaWNpdGx5IGluIHRoZSBmb3Jt IG9mCisgICAgICAgICBgYnJlYWsgK1tDbGFzcyBhTWV0aG9kXScgb3IgYGJy ZWFrIC1bQ2xhc3MgYU1ldGhvZF0nIGFzIG9wcG9zZWQgdG8KKyAgICAgICAg IHRoZSBzaG9ydCBmb3JtIGBicmVhayBhTWV0aG9kJy4KKworICAgICAgICog VGhlIHVzZXIgaGFzIGNhbGxlZCAnc2V0IGxhbmd1YWdlIG9iamVjdGl2ZS1j JyBhdCBsZWFzdCBvbmNlOworICAgICAgICAgdGhvdWdoIGl0IG5lZWQgbm90 IGJlIHRoZSBjdXJyZW50IGxhbmd1YWdlLgorCisgICAgIEZvciBHREIgdG8g aWRlbnRpZnkgYW4gT2JqZWN0aXZlLUMgbGlicmFyeSBkZWJ1ZyBzeW1ib2xz IG11c3QgYmUgcHJlc2VudC4KKyAgICAgVXNlcnMgd2FudGluZyB0byByZXRh aW4gdGhlIG9sZCBiZWhhdmlvdXIgY2FuIGFkZAorICAgICBgc2V0IGxhbmd1 YWdlIG9iamVjdGl2ZS1jYCBmb2xsb3dlZCBieSBgc2V0IGxhbmd1YWdlIGF1 dG8nIGxpbmVzCisgICAgIHRvIHRoZWlyIC5nZGJpbml0IGZpbGUuCisKICog R0RCIG5vdyBoYXMgc29tZSBzdXBwb3J0IGZvciB1c2luZyBsYWJlbHMgaW4g dGhlIHByb2dyYW0ncyBzb3VyY2UgaW4KICAgbGluZXNwZWNzLiAgRm9yIGlu c3RhbmNlLCB5b3UgY2FuIHVzZSAiYWR2YW5jZSBsYWJlbCIgdG8gY29udGlu dWUKICAgZXhlY3V0aW9uIHRvIGEgbGFiZWwuCmRpZmYgLS1naXQgYS9nZGIv YnVpbGRzeW0uYyBiL2dkYi9idWlsZHN5bS5jCmluZGV4IDRhNzZlM2UuLjBj OTE4NmQgMTAwNjQ0Ci0tLSBhL2dkYi9idWlsZHN5bS5jCisrKyBiL2dkYi9i dWlsZHN5bS5jCkBAIC00NCw2ICs0NCw3IEBACiAjaW5jbHVkZSAiY3Atc3Vw cG9ydC5oIgogI2luY2x1ZGUgImRpY3Rpb25hcnkuaCIKICNpbmNsdWRlICJh ZGRybWFwLmgiCisjaW5jbHVkZSAibGFuZ3VhZ2UuaCIKIAogLyogQXNrIGJ1 aWxkc3ltLmggdG8gZGVmaW5lIHRoZSB2YXJzIGl0IG5vcm1hbGx5IGRlY2xh cmVzIGBleHRlcm4nLiAgKi8KICNkZWZpbmUJRVhURVJOCkBAIC02MjEsNiAr NjIyLDkgQEAgc3RhcnRfc3ViZmlsZSAoY29uc3QgY2hhciAqbmFtZSwgY29u c3QgY2hhciAqZGlybmFtZSkKICAgICB7CiAgICAgICBzdWJmaWxlLT5sYW5n dWFnZSA9IHN1YmZpbGUtPm5leHQtPmxhbmd1YWdlOwogICAgIH0KKworICBz ZXRfbGFuZ3VhZ2VfaGFzX2N1X2xvYWRlZChzdWJmaWxlLT5sYW5ndWFnZSk7 CisKIH0KIAogLyogRm9yIHN0YWJzIHJlYWRlcnMsIHRoZSBmaXJzdCBOX1NP IHN5bWJvbCBpcyBhc3N1bWVkIHRvIGJlIHRoZQpkaWZmIC0tZ2l0IGEvZ2Ri L2RieHJlYWQuYyBiL2dkYi9kYnhyZWFkLmMKaW5kZXggYWY5NDY1OS4uNTdl OWIyOSAxMDA2NDQKLS0tIGEvZ2RiL2RieHJlYWQuYworKysgYi9nZGIvZGJ4 cmVhZC5jCkBAIC01Niw2ICs1Niw3IEBACiAjaW5jbHVkZSAiY3AtYWJpLmgi CiAjaW5jbHVkZSAiY3Atc3VwcG9ydC5oIgogI2luY2x1ZGUgInBzeW1wcml2 LmgiCisjaW5jbHVkZSAibGFuZ3VhZ2UuaCIKIAogI2luY2x1ZGUgImdkYl9h c3NlcnQuaCIKICNpbmNsdWRlICJnZGJfc3RyaW5nLmgiCkBAIC0xNTY0LDYg KzE1NjUsNyBAQCByZWFkX2RieF9zeW10YWIgKHN0cnVjdCBvYmpmaWxlICpv YmpmaWxlKQogCiAJICAgIG5hbWVzdHJpbmcgPSBzZXRfbmFtZXN0cmluZyAo b2JqZmlsZSwgJm5saXN0KTsKIAkgICAgdG1wX2xhbmd1YWdlID0gZGVkdWNl X2xhbmd1YWdlX2Zyb21fZmlsZW5hbWUgKG5hbWVzdHJpbmcpOworCSAgICBz ZXRfbGFuZ3VhZ2VfaGFzX2N1X2xvYWRlZCAodG1wX2xhbmd1YWdlKTsKIAog CSAgICAvKiBPbmx5IGNoYW5nZSB0aGUgcHN5bXRhYidzIGxhbmd1YWdlIGlm IHdlJ3ZlIGxlYXJuZWQKIAkgICAgICAgc29tZXRoaW5nIHVzZWZ1bCAoZWcu IHRtcF9sYW5ndWFnZSBpcyBub3QgbGFuZ3VhZ2VfdW5rbm93bikuCmRpZmYg LS1naXQgYS9nZGIvZGVmcy5oIGIvZ2RiL2RlZnMuaAppbmRleCA5ZTQ4MDBj Li4zMDRkMWM5IDEwMDY0NAotLS0gYS9nZGIvZGVmcy5oCisrKyBiL2dkYi9k ZWZzLmgKQEAgLTE4NSw3ICsxODUsOSBAQCBleHRlcm4gdm9pZCBxdWl0ICh2 b2lkKTsKIC8qIExhbmd1YWdlcyByZXByZXNlbnRlZCBpbiB0aGUgc3ltYm9s IHRhYmxlIGFuZCBlbHNld2hlcmUuCiAgICBUaGlzIHNob3VsZCBwcm9iYWJs eSBiZSBpbiBsYW5ndWFnZS5oLCBidXQgc2luY2UgZW51bSdzIGNhbid0CiAg ICBiZSBmb3J3YXJkIGRlY2xhcmVkIHRvIHNhdGlzZnkgb3BhcXVlIHJlZmVy ZW5jZXMgYmVmb3JlIHRoZWlyCi0gICBhY3R1YWwgZGVmaW5pdGlvbiwgbmVl ZHMgdG8gYmUgaGVyZS4gKi8KKyAgIGFjdHVhbCBkZWZpbml0aW9uLCBuZWVk cyB0byBiZSBoZXJlLgorCisgICBXaGVuIGFkZGluZyBhIHRhbmdpYmxlIGxh bmd1YWdlIGFsc28gdXBkYXRlIGxhbmd1YWdlLmM6bWFza19mb3JfbGFuZ3Vh Z2UgKi8KIAogZW51bSBsYW5ndWFnZQogICB7CmRpZmYgLS1naXQgYS9nZGIv ZHdhcmYycmVhZC5jIGIvZ2RiL2R3YXJmMnJlYWQuYwppbmRleCBiZjM2ZTAx Li5lMGQ0ZDUyIDEwMDY0NAotLS0gYS9nZGIvZHdhcmYycmVhZC5jCisrKyBi L2dkYi9kd2FyZjJyZWFkLmMKQEAgLTk2NDYsNiArOTY0Niw3IEBAIHNldF9j dV9sYW5ndWFnZSAodW5zaWduZWQgaW50IGxhbmcsIHN0cnVjdCBkd2FyZjJf Y3UgKmN1KQogICAgICAgYnJlYWs7CiAgICAgfQogICBjdS0+bGFuZ3VhZ2Vf ZGVmbiA9IGxhbmd1YWdlX2RlZiAoY3UtPmxhbmd1YWdlKTsKKyAgc2V0X2xh bmd1YWdlX2hhc19jdV9sb2FkZWQgKGN1LT5sYW5ndWFnZSk7CiB9CiAKIC8q IFJldHVybiB0aGUgbmFtZWQgYXR0cmlidXRlIG9yIE5VTEwgaWYgbm90IHRo ZXJlLiAgKi8KZGlmZiAtLWdpdCBhL2dkYi9sYW5ndWFnZS5jIGIvZ2RiL2xh bmd1YWdlLmMKaW5kZXggM2NlMDhiNS4uY2RjNjljOSAxMDA2NDQKLS0tIGEv Z2RiL2xhbmd1YWdlLmMKKysrIGIvZ2RiL2xhbmd1YWdlLmMKQEAgLTQzNSw2 ICs0MzUsNyBAQCBzZXRfbGFuZ3VhZ2UgKGVudW0gbGFuZ3VhZ2UgbGFuZykK ICAgICAgIGlmIChsYW5ndWFnZXNbaV0tPmxhX2xhbmd1YWdlID09IGxhbmcp CiAJewogCSAgY3VycmVudF9sYW5ndWFnZSA9IGxhbmd1YWdlc1tpXTsKKwkg IHNldF9sYW5ndWFnZV9oYXNfY3VfbG9hZGVkKGN1cnJlbnRfbGFuZ3VhZ2Ut PmxhX2xhbmd1YWdlKTsKIAkgIHNldF90eXBlX3JhbmdlX2Nhc2UgKCk7CiAJ ICBicmVhazsKIAl9CkBAIC0xMDYwLDYgKzEwNjEsODIgQEAgZGVmYXVsdF9n ZXRfc3RyaW5nIChzdHJ1Y3QgdmFsdWUgKnZhbHVlLCBnZGJfYnl0ZSAqKmJ1 ZmZlciwgaW50ICpsZW5ndGgsCiAgIGVycm9yIChfKCJHZXR0aW5nIGEgc3Ry aW5nIGlzIHVuc3VwcG9ydGVkIGluIHRoaXMgbGFuZ3VhZ2UuIikpOwogfQog CisKKy8qIEEgbWFzayBmb3IgbGFuZ3VhZ2VzIHRoYXQgd2FudCB0byBlbmFi bGUgc3BlY2lmaWMgYmVoYXZpb3VycyBpZiAobm90IHdoZW4pCisgICBhIGNv bXBpbGF0aW9uIHVuaXQgb2YgdGhhdCBsYW5ndWFnZSBoYXMgYmVlbiBsb2Fk ZWQuICovCisjZGVmaW5lIENVX0xPQURFRF9DX0xBTkdfTUFTSwkJMHgxIDw8 IDAKKyNkZWZpbmUgQ1VfTE9BREVEX0NQTFVTX0xBTkdfTUFTSwkweDEgPDwg MQorI2RlZmluZSBDVV9MT0FERURfRF9MQU5HX01BU0sJCTB4MSA8PCAyCisj ZGVmaW5lIENVX0xPQURFRF9PQkpDX0xBTkdfTUFTSwkweDEgPDwgMworI2Rl ZmluZSBDVV9MT0FERURfSkFWQV9MQU5HX01BU0sJMHgxIDw8IDQKKyNkZWZp bmUgQ1VfTE9BREVEX0ZPUlRSQU5fTEFOR19NQVNLCTB4MSA8PCA1CisjZGVm aW5lIENVX0xPQURFRF9NMl9MQU5HX01BU0sJCTB4MSA8PCA2CisjZGVmaW5l IENVX0xPQURFRF9BU01fTEFOR19NQVNLCQkweDEgPDwgNworI2RlZmluZSBD VV9MT0FERURfUEFTQ0FMX0xBTkdfTUFTSwkweDEgPDwgOAorI2RlZmluZSBD VV9MT0FERURfQURBX0xBTkdfTUFTSwkJMHgxIDw8IDkKKyNkZWZpbmUgQ1Vf TE9BREVEX1NDTV9MQU5HX01BU0sJCTB4MSA8PCAxMAorCitzdGF0aWMgdW5z aWduZWQgaW50IGN1X2xhbmd1YWdlc19sb2FkZWRfbWFzazsKKworc3RhdGlj IHVuc2lnbmVkIGludAorbWFza19mb3JfbGFuZ3VhZ2UoZW51bSBsYW5ndWFn ZSBsYW5nKQoreworICB1bnNpZ25lZCBpbnQgbGFuZ19tYXNrOworICBzd2l0 Y2gobGFuZykKKyAgICB7CisgICAgICBjYXNlIGxhbmd1YWdlX2M6CQkJLyog QyAqLworICAgICAgICBsYW5nX21hc2sgPSBDVV9MT0FERURfQ19MQU5HX01B U0s7CisgICAgICBicmVhazsKKyAgICAgIGNhc2UgbGFuZ3VhZ2VfY3BsdXM6 CQkvKiBDKysgKi8KKyAgICAgICAgbGFuZ19tYXNrID0gQ1VfTE9BREVEX0NQ TFVTX0xBTkdfTUFTSzsKKyAgICAgIGJyZWFrOworICAgICAgY2FzZSBsYW5n dWFnZV9kOgkJCS8qIEQgKi8KKyAgICAgICAgbGFuZ19tYXNrID0gQ1VfTE9B REVEX0RfTEFOR19NQVNLOworICAgICAgYnJlYWs7CisgICAgICBjYXNlIGxh bmd1YWdlX29iamM6CQkvKiBPYmplY3RpdmUtQyAqLworICAgICAgICBsYW5n X21hc2sgPSBDVV9MT0FERURfT0JKQ19MQU5HX01BU0s7CisgICAgICBicmVh azsKKyAgICAgIGNhc2UgbGFuZ3VhZ2VfamF2YToJCS8qIEphdmEgKi8KKyAg ICAgICAgbGFuZ19tYXNrID0gQ1VfTE9BREVEX0pBVkFfTEFOR19NQVNLOwor ICAgICAgYnJlYWs7CisgICAgICBjYXNlIGxhbmd1YWdlX2ZvcnRyYW46CQkv KiBGb3J0cmFuICovCisgICAgICAgIGxhbmdfbWFzayA9IENVX0xPQURFRF9G T1JUUkFOX0xBTkdfTUFTSzsKKyAgICAgIGJyZWFrOworICAgICAgY2FzZSBs YW5ndWFnZV9tMjoJCQkvKiBNb2R1bGEtMiAqLworICAgICAgICBsYW5nX21h c2sgPSBDVV9MT0FERURfTTJfTEFOR19NQVNLOworICAgICAgYnJlYWs7Cisg ICAgICBjYXNlIGxhbmd1YWdlX2FzbToJCS8qIEFzc2VtYmx5IGxhbmd1YWdl ICovCisgICAgICAgIGxhbmdfbWFzayA9IENVX0xPQURFRF9BU01fTEFOR19N QVNLOworICAgICAgYnJlYWs7CisgICAgICBjYXNlIGxhbmd1YWdlX3Bhc2Nh bDoJCS8qIFBhc2NhbCAqLworICAgICAgICBsYW5nX21hc2sgPSBDVV9MT0FE RURfUEFTQ0FMX0xBTkdfTUFTSzsKKyAgICAgIGJyZWFrOworICAgICAgY2Fz ZSBsYW5ndWFnZV9hZGE6CQkvKiBBZGEgKi8KKyAgICAgICAgbGFuZ19tYXNr ID0gQ1VfTE9BREVEX0FEQV9MQU5HX01BU0s7CisgICAgICBicmVhazsKKyAg ICAgIGNhc2UgbGFuZ3VhZ2Vfc2NtOgkJLyogR3VpbGUgU2NoZW1lKi8KKyAg ICAgICAgbGFuZ19tYXNrID0gQ1VfTE9BREVEX1NDTV9MQU5HX01BU0s7Cisg ICAgICBicmVhazsKKyAgICAgIGRlZmF1bHQ6CisJcmV0dXJuIDA7CisgICAg fQorICByZXR1cm4gbGFuZ19tYXNrOworfQorCit1bnNpZ25lZCBpbnQKK2xh bmd1YWdlX2hhc19jdV9sb2FkZWQgKGVudW0gbGFuZ3VhZ2UgbGFuZykKK3sK KyAgdW5zaWduZWQgaW50IGxhbmdfbWFzayA9IG1hc2tfZm9yX2xhbmd1YWdl IChsYW5nKTsKKyAgcmV0dXJuIGN1X2xhbmd1YWdlc19sb2FkZWRfbWFzayAm IGxhbmdfbWFzazsKK30KKwordm9pZAorc2V0X2xhbmd1YWdlX2hhc19jdV9s b2FkZWQgKGVudW0gbGFuZ3VhZ2UgbGFuZykKK3sKKyAgdW5zaWduZWQgaW50 IGxhbmdfbWFzayA9IG1hc2tfZm9yX2xhbmd1YWdlIChsYW5nKTsKKyAgY3Vf bGFuZ3VhZ2VzX2xvYWRlZF9tYXNrIHw9IGxhbmdfbWFzazsKK30KKwogLyog RGVmaW5lIHRoZSBsYW5ndWFnZSB0aGF0IGlzIG5vIGxhbmd1YWdlLiAgKi8K IAogc3RhdGljIGludApkaWZmIC0tZ2l0IGEvZ2RiL2xhbmd1YWdlLmggYi9n ZGIvbGFuZ3VhZ2UuaAppbmRleCBhYTA1MjNiLi42ZmRlNDAxIDEwMDY0NAot LS0gYS9nZGIvbGFuZ3VhZ2UuaAorKysgYi9nZGIvbGFuZ3VhZ2UuaApAQCAt NTIzLDQgKzUyMywxMiBAQCB2b2lkIGRlZmF1bHRfZ2V0X3N0cmluZyAoc3Ry dWN0IHZhbHVlICp2YWx1ZSwgZ2RiX2J5dGUgKipidWZmZXIsIGludCAqbGVu Z3RoLAogdm9pZCBjX2dldF9zdHJpbmcgKHN0cnVjdCB2YWx1ZSAqdmFsdWUs IGdkYl9ieXRlICoqYnVmZmVyLCBpbnQgKmxlbmd0aCwKIAkJICAgc3RydWN0 IHR5cGUgKipjaGFyX3R5cGUsIGNvbnN0IGNoYXIgKipjaGFyc2V0KTsKIAor LyogUmV0dXJucyBub24temVybyBpZiBjdSBvZiB0aGUgbGFuZ3VhZ2UgdHlw ZSBoYXMgYmVlbiBwcmV2aW91c2x5IGxvYWRlZC4gKi8KK3Vuc2lnbmVkIGlu dAorbGFuZ3VhZ2VfaGFzX2N1X2xvYWRlZCAoZW51bSBsYW5ndWFnZSBsYW5n KTsKKworLyogU2V0cyB0aGF0IGEgY3Ugb2YgdGhlIGxhbmd1YWdlIHR5cGUg aGFzIGJlZW4gcHJldmlvdXNseSBsb2FkZWQuICovCit2b2lkCitzZXRfbGFu Z3VhZ2VfaGFzX2N1X2xvYWRlZCAoZW51bSBsYW5ndWFnZSBsYW5nKTsKKwog I2VuZGlmIC8qIGRlZmluZWQgKExBTkdVQUdFX0gpICovCmRpZmYgLS1naXQg YS9nZGIvbGluZXNwZWMuYyBiL2dkYi9saW5lc3BlYy5jCmluZGV4IDkxYzVi OTAuLmI3NGM5OTcgMTAwNjQ0Ci0tLSBhL2dkYi9saW5lc3BlYy5jCisrKyBi L2dkYi9saW5lc3BlYy5jCkBAIC03NzEsMTQgKzc3MSwxNSBAQCBkZWNvZGVf bGluZV8xIChjaGFyICoqYXJncHRyLCBpbnQgZnVuZmlyc3RsaW5lLCBzdHJ1 Y3Qgc3ltdGFiICpkZWZhdWx0X3N5bXRhYiwKIAogICAvKiBDaGVjayBpZiB0 aGUgc3ltYm9sIGNvdWxkIGJlIGFuIE9iamVjdGl2ZS1DIHNlbGVjdG9yLiAg Ki8KIAotICB7Ci0gICAgc3RydWN0IHN5bXRhYnNfYW5kX2xpbmVzIHZhbHVl czsKKyAgaWYgKGlzX29iamNfbWV0aG9kIHx8IGxhbmd1YWdlX2hhc19jdV9s b2FkZWQobGFuZ3VhZ2Vfb2JqYykpCisgICAgeworICAgICAgc3RydWN0IHN5 bXRhYnNfYW5kX2xpbmVzIHZhbHVlczsKIAotICAgIHZhbHVlcyA9IGRlY29k ZV9vYmpjIChhcmdwdHIsIGZ1bmZpcnN0bGluZSwgTlVMTCwKKyAgICAgIHZh bHVlcyA9IGRlY29kZV9vYmpjIChhcmdwdHIsIGZ1bmZpcnN0bGluZSwgTlVM TCwKIAkJCSAgY2Fub25pY2FsLCBzYXZlZF9hcmcpOwotICAgIGlmICh2YWx1 ZXMuc2FscyAhPSBOVUxMKQotICAgICAgcmV0dXJuIHZhbHVlczsKLSAgfQor ICAgICAgaWYgKHZhbHVlcy5zYWxzICE9IE5VTEwpCisgICAgICAgIHJldHVy biB2YWx1ZXM7CisgICAgfQogCiAgIC8qIERvZXMgaXQgbG9vayBsaWtlIHRo ZXJlIGFjdHVhbGx5IHdlcmUgdHdvIHBhcnRzPyAgKi8KIApkaWZmIC0tZ2l0 IGEvZ2RiL21kZWJ1Z3JlYWQuYyBiL2dkYi9tZGVidWdyZWFkLmMKaW5kZXgg NWNlNWRiMi4uMzEzNjk0MCAxMDA2NDQKLS0tIGEvZ2RiL21kZWJ1Z3JlYWQu YworKysgYi9nZGIvbWRlYnVncmVhZC5jCkBAIC01OCw2ICs1OCw3IEBACiAj aW5jbHVkZSAiZ2RiX3N0YXQuaCIKICNpbmNsdWRlICJnZGJfc3RyaW5nLmgi CiAjaW5jbHVkZSAicHN5bXByaXYuaCIKKyNpbmNsdWRlICJsYW5ndWFnZS5o IgogCiAjaW5jbHVkZSAiYmZkLmgiCiAKQEAgLTI3MDAsNiArMjcwMSw5IEBA IHBhcnNlX3BhcnRpYWxfc3ltYm9scyAoc3RydWN0IG9iamZpbGUgKm9iamZp bGUpCiAJICBwc3ltdGFiX2xhbmd1YWdlID0gZGVkdWNlX2xhbmd1YWdlX2Zy b21fZmlsZW5hbWUgKGZkcl9uYW1lIChmaCkpOwogCSAgYnJlYWs7CiAJfQor CisgICAgICBzZXRfbGFuZ3VhZ2VfaGFzX2N1X2xvYWRlZCAocHN5bXRhYl9s YW5ndWFnZSk7CisKICAgICAgIGlmIChwc3ltdGFiX2xhbmd1YWdlID09IGxh bmd1YWdlX3Vua25vd24pCiAJcHN5bXRhYl9sYW5ndWFnZSA9IHByZXZfbGFu Z3VhZ2U7CiAgICAgICBQU1RfUFJJVkFURSAocHN0KS0+cHN0X2xhbmd1YWdl ID0gcHN5bXRhYl9sYW5ndWFnZTsKZGlmZiAtLWdpdCBhL2dkYi94Y29mZnJl YWQuYyBiL2dkYi94Y29mZnJlYWQuYwppbmRleCA5MDJkNDhmLi41NDFlYzIy IDEwMDY0NAotLS0gYS9nZGIveGNvZmZyZWFkLmMKKysrIGIvZ2RiL3hjb2Zm cmVhZC5jCkBAIC0xOTczLDYgKzE5NzMsNyBAQCB4Y29mZl9zdGFydF9wc3lt dGFiIChzdHJ1Y3Qgb2JqZmlsZSAqb2JqZmlsZSwgY2hhciAqZmlsZW5hbWUs IGludCBmaXJzdF9zeW1udW0sCiAKICAgLyogRGVkdWNlIHRoZSBzb3VyY2Ug bGFuZ3VhZ2UgZnJvbSB0aGUgZmlsZW5hbWUgZm9yIHRoaXMgcHN5bXRhYi4g Ki8KICAgcHN5bXRhYl9sYW5ndWFnZSA9IGRlZHVjZV9sYW5ndWFnZV9mcm9t X2ZpbGVuYW1lIChmaWxlbmFtZSk7CisgIHNldF9sYW5ndWFnZV9oYXNfY3Vf bG9hZGVkIChwc3ltdGFiX2xhbmd1YWdlKTsKIAogICByZXR1cm4gcmVzdWx0 OwogfQo= --005045015a182fa0600491f286fc--