From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) by sourceware.org (Postfix) with ESMTPS id 4EAB83857024; Mon, 27 Jul 2020 15:32:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4EAB83857024 Received: by mail-io1-xd2f.google.com with SMTP id g19so5309418ioh.8; Mon, 27 Jul 2020 08:32:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=KGGC03lv7nn9mf2J/eFD6h3+TWt9lfiplVZdzZ6rn2s=; b=KKXy0+VWOXU9bmeD79q2val1k20RvwpdL4Dn4x75irV/EeXpfbRKtpwMqdd9/dqW86 FAugsYoSlDNPTNCbWF8e+dFJjmbQ8xhFiEFrhFMSB0NlWaxjgJbfxLzYBRPDkKmordgr pikEpBqAXp4Qz8HQgmIBCwTE2kgdET2p8Ot7rq3574XuyN2iXjHkRCyEZeWv3okL77n0 Y8YRJg+zyexnQHLubPF8EbRxrCzusH60f4l/3YWncRs4h08dGBZKSn4vd1Ou49HmW5qB ldTnP3y8XkdewQqkB35HnkU834tUYtprh3UXQs0v3KIe43GKnGENdljliQ69yg8TSAjZ 6XOA== X-Gm-Message-State: AOAM530MOUVAyIKXR2lnn8SUhox31I2p1Slw/Kyb+S5jUcR085T4CqoJ dNhrgTpYlRcQMPbJAVDBvlWtgYrGHBHHkTBqa9Y= X-Google-Smtp-Source: ABdhPJzZhF9FgGrPnlX5sbxOAAuxTanpjzlv2A0JBEjeQF6ScQOgTrt5WgFehTt23xq26Wd8dj7F4lsBVDlkyWK+e+I= X-Received: by 2002:a05:6638:1187:: with SMTP id f7mr27501410jas.58.1595863951614; Mon, 27 Jul 2020 08:32:31 -0700 (PDT) MIME-Version: 1.0 References: <20200502022903.175852-1-amerey@redhat.com> <3d9da16939fa6b503188033b56d30531e03d5d2a.camel@redhat.com> <87a72ino27.fsf@tromey.com> <64517fee-8b8f-84b2-a116-c3d146ff1119@simark.ca> <87eep4hp3s.fsf@tromey.com> In-Reply-To: From: "H.J. Lu" Date: Mon, 27 Jul 2020 08:31:55 -0700 Message-ID: Subject: [PATCH] config/debuginfod.m4: Restore AC_CHECK_LIB check To: Aaron Merey Cc: Tom Tromey , Simon Marchi , GCC Patches , Aaron Merey via Binutils , GDB Content-Type: multipart/mixed; boundary="000000000000f2b3ca05ab6e074f" X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, URIBL_CSS, URIBL_CSS_A autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jul 2020 15:32:36 -0000 --000000000000f2b3ca05ab6e074f Content-Type: text/plain; charset="UTF-8" On Sat, Jul 25, 2020 at 9:01 AM H.J. Lu wrote: > > On Fri, Jul 24, 2020 at 1:04 PM Aaron Merey via Gcc-patches > wrote: > > > > On Tue, Jul 21, 2020 at 2:11 PM Aaron Merey wrote: > > > > > > On Tue, Jul 21, 2020 at 11:20 AM Tom Tromey wrote: > > > > > > > > Simon> Since it's debuginfo.m4 that is using PKG_CHECK_MODULES, can you put the include > > > > Simon> of pkg.m4 in debuginfo.m4, instead of in {binutils,gdb}/configure.ac? > > > > > > > > Simon> Otherwise, from GDB's point of view I think it looks good, unless > > > > Simon> Tom has some things to add. > > > > > > > > I'm happy with it. Thanks for persevering. > > > > > > Great. I can push to binutils-gdb but not gcc. Should I just push to > > > binutils-gdb for now or wait until the patch can be applied to both > > > repos at once? > > > > I'm going to go ahead and push to binutils-gdb. Since these changes > > should not affect gcc there shouldn't be any conflicts. > > > > This caused: > > https://sourceware.org/bugzilla/show_bug.cgi?id=26301 > It is quite normal to have debuginfod headers without libdebuginfod on multilib OSes. Restore AC_CHECK_LIB to check if libdebuginfod exists. And always define HAVE_LIBDEBUGINFOD to 0 or 1 for binutils/dwarf.c:#if HAVE_LIBDEBUGINFOD binutils/dwarf.c:#if HAVE_LIBDEBUGINFOD binutils/dwarf.c:#if HAVE_LIBDEBUGINFOD binutils/dwarf.h:#if HAVE_LIBDEBUGINFOD binutils/objdump.c:#if HAVE_LIBDEBUGINFOD binutils/objdump.c:#endif /* HAVE_LIBDEBUGINFOD */ binutils/readelf.c:#if HAVE_LIBDEBUGINFOD binutils/readelf.c:#endif /* HAVE_LIBDEBUGINFOD */ gdb/top.c:#if HAVE_LIBDEBUGINFOD OK for master? -- H.J. --000000000000f2b3ca05ab6e074f Content-Type: text/x-patch; charset="US-ASCII"; name="0001-config-debuginfod.m4-Restore-AC_CHECK_LIB-check.patch" Content-Disposition: attachment; filename="0001-config-debuginfod.m4-Restore-AC_CHECK_LIB-check.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kd4o4xou0 RnJvbSA5NzVmNjg4OTg4MTdmMmRiMTNjNWQ3MDYxZmI2ZTZhOTE0N2IwNmFhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiSC5KLiBMdSIgPGhqbC50b29sc0BnbWFpbC5jb20+CkRhdGU6 IE1vbiwgMjcgSnVsIDIwMjAgMDg6MjQ6MTUgLTA3MDAKU3ViamVjdDogW1BBVENIXSBjb25maWcv ZGVidWdpbmZvZC5tNDogUmVzdG9yZSBBQ19DSEVDS19MSUIgY2hlY2sKCkl0IGlzIHF1aXRlIG5v cm1hbCB0byBoYXZlIGRlYnVnaW5mb2QgaGVhZGVycyB3aXRob3V0IGxpYmRlYnVnaW5mb2Qgb24K bXVsdGlsaWIgT1Nlcy4gIFJlc3RvcmUgQUNfQ0hFQ0tfTElCIHRvIGNoZWNrIGlmIGxpYmRlYnVn aW5mb2QgZXhpc3RzLgpBbmQgYWx3YXlzIGRlZmluZSBIQVZFX0xJQkRFQlVHSU5GT0QgdG8gMCBv ciAxIGZvcgoKYmludXRpbHMvZHdhcmYuYzojaWYgSEFWRV9MSUJERUJVR0lORk9ECmJpbnV0aWxz L2R3YXJmLmM6I2lmIEhBVkVfTElCREVCVUdJTkZPRApiaW51dGlscy9kd2FyZi5jOiNpZiBIQVZF X0xJQkRFQlVHSU5GT0QKYmludXRpbHMvZHdhcmYuaDojaWYgSEFWRV9MSUJERUJVR0lORk9ECmJp bnV0aWxzL29iamR1bXAuYzojaWYgSEFWRV9MSUJERUJVR0lORk9ECmJpbnV0aWxzL29iamR1bXAu YzojZW5kaWYgLyogSEFWRV9MSUJERUJVR0lORk9EICovCmJpbnV0aWxzL3JlYWRlbGYuYzojaWYg SEFWRV9MSUJERUJVR0lORk9ECmJpbnV0aWxzL3JlYWRlbGYuYzojZW5kaWYgLyogSEFWRV9MSUJE RUJVR0lORk9EICovCmdkYi90b3AuYzojaWYgSEFWRV9MSUJERUJVR0lORk9ECgpjb25maWcvCgoJ UFIgYmludXRpbHMvMjYzMDEKCSogZGVidWdpbmZvZC5tNCAoQUNfREVCVUdJTkZPRCk6IFJlc3Rv cmUgQUNfQ0hFQ0tfTElCIHRvIGNoZWNrIGlmCglsaWJkZWJ1Z2luZm9kIGV4aXN0cy4KCmJpbnV0 aWxzLwoKCVBSIGJpbnV0aWxzLzI2MzAxCgkqIGNvbmZpZ3VyZTogUmVnZW5lcmF0ZWQuCgpnZGIv CgoJUFIgYmludXRpbHMvMjYzMDEKCSogY29uZmlndXJlOiBSZWdlbmVyYXRlZC4KLS0tCiBiaW51 dGlscy9jb25maWd1cmUgICB8IDg4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KystLS0tLS0tCiBjb25maWcvZGVidWdpbmZvZC5tNCB8IDE0ICsrKysrLS0KIGdkYi9jb25maWd1 cmUgICAgICAgIHwgODggKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0t LS0KIDMgZmlsZXMgY2hhbmdlZCwgMTYxIGluc2VydGlvbnMoKyksIDI5IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2JpbnV0aWxzL2NvbmZpZ3VyZSBiL2JpbnV0aWxzL2NvbmZpZ3VyZQppbmRl eCBjOWZjNTEwOGUwLi4wMmQzM2NiNWVkIDEwMDc1NQotLS0gYS9iaW51dGlscy9jb25maWd1cmUK KysrIGIvYmludXRpbHMvY29uZmlndXJlCkBAIC0xMjM5OCw2ICsxMjM5OCw3IEBAICRhc19lY2hv X24gImNoZWNraW5nIHdoZXRoZXIgdG8gdXNlIGRlYnVnaW5mb2QuLi4gIiA+JjY7IH0KIHsgJGFz X2VjaG8gIiRhc19tZToke2FzX2xpbmVuby0kTElORU5PfTogcmVzdWx0OiAkd2l0aF9kZWJ1Z2lu Zm9kIiA+JjUKICRhc19lY2hvICIkd2l0aF9kZWJ1Z2luZm9kIiA+JjY7IH0KIAoraGF2ZV9saWJk ZWJ1Z2luZm9kPTAKIGlmIHRlc3QgIngkd2l0aF9kZWJ1Z2luZm9kIiAhPSB4bm87IHRoZW4KIAog cGtnX2ZhaWxlZD1ubwpAQCAtMTI0NTgsMzUgKzEyNDU5LDk2IEBAIGZpCiAJIyBQdXQgdGhlIG5h c3R5IGVycm9yIG1lc3NhZ2UgaW4gY29uZmlnLmxvZyB3aGVyZSBpdCBiZWxvbmdzCiAJZWNobyAi JERFQlVHSU5GT0RfUEtHX0VSUk9SUyIgPiY1CiAKLQlpZiB0ZXN0ICJ4JHdpdGhfZGVidWdpbmZv ZCIgPSB4eWVzOyB0aGVuCi0gICAgICAgYXNfZm5fZXJyb3IgJD8gIlwiLS13aXRoLWRlYnVnaW5m b2Qgd2FzIGdpdmVuLCBidXQgbGliZGVidWdpbmZvZCBpcyBtaXNzaW5nIG9yIHVudXNhYmxlLlwi IiAiJExJTkVOTyIgNQotICAgICBlbHNlCi0gICAgICAgeyAkYXNfZWNobyAiJGFzX21lOiR7YXNf bGluZW5vLSRMSU5FTk99OiBXQVJOSU5HOiBsaWJkZWJ1Z2luZm9kIGlzIG1pc3Npbmcgb3IgdW51 c2FibGU7IHNvbWUgZmVhdHVyZXMgbWF5IGJlIHVuYXZhaWxhYmxlLiIgPiY1Ci0kYXNfZWNobyAi JGFzX21lOiBXQVJOSU5HOiBsaWJkZWJ1Z2luZm9kIGlzIG1pc3Npbmcgb3IgdW51c2FibGU7IHNv bWUgZmVhdHVyZXMgbWF5IGJlIHVuYXZhaWxhYmxlLiIgPiYyO30KLSAgICAgZmkKKwlhc19mbl9l cnJvciAkPyAiUGFja2FnZSByZXF1aXJlbWVudHMgKGxpYmRlYnVnaW5mb2QgPj0gMC4xNzkpIHdl cmUgbm90IG1ldDoKKworJERFQlVHSU5GT0RfUEtHX0VSUk9SUworCitDb25zaWRlciBhZGp1c3Rp bmcgdGhlIFBLR19DT05GSUdfUEFUSCBlbnZpcm9ubWVudCB2YXJpYWJsZSBpZiB5b3UKK2luc3Rh bGxlZCBzb2Z0d2FyZSBpbiBhIG5vbi1zdGFuZGFyZCBwcmVmaXguCisKK0FsdGVybmF0aXZlbHks IHlvdSBtYXkgc2V0IHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZXMgREVCVUdJTkZPRF9DRkxBR1MK K2FuZCBERUJVR0lORk9EX0xJQlMgdG8gYXZvaWQgdGhlIG5lZWQgdG8gY2FsbCBwa2ctY29uZmln LgorU2VlIHRoZSBwa2ctY29uZmlnIG1hbiBwYWdlIGZvciBtb3JlIGRldGFpbHMuIiAiJExJTkVO TyIgNQogZWxpZiB0ZXN0ICRwa2dfZmFpbGVkID0gdW50cmllZDsgdGhlbgogICAgICAgICB7ICRh c19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IHJlc3VsdDogbm8iID4mNQogJGFz X2VjaG8gIm5vIiA+JjY7IH0KLQlpZiB0ZXN0ICJ4JHdpdGhfZGVidWdpbmZvZCIgPSB4eWVzOyB0 aGVuCi0gICAgICAgYXNfZm5fZXJyb3IgJD8gIlwiLS13aXRoLWRlYnVnaW5mb2Qgd2FzIGdpdmVu LCBidXQgbGliZGVidWdpbmZvZCBpcyBtaXNzaW5nIG9yIHVudXNhYmxlLlwiIiAiJExJTkVOTyIg NQotICAgICBlbHNlCi0gICAgICAgeyAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGluZW5vLSRMSU5F Tk99OiBXQVJOSU5HOiBsaWJkZWJ1Z2luZm9kIGlzIG1pc3Npbmcgb3IgdW51c2FibGU7IHNvbWUg ZmVhdHVyZXMgbWF5IGJlIHVuYXZhaWxhYmxlLiIgPiY1Ci0kYXNfZWNobyAiJGFzX21lOiBXQVJO SU5HOiBsaWJkZWJ1Z2luZm9kIGlzIG1pc3Npbmcgb3IgdW51c2FibGU7IHNvbWUgZmVhdHVyZXMg bWF5IGJlIHVuYXZhaWxhYmxlLiIgPiYyO30KLSAgICAgZmkKKwl7IHsgJGFzX2VjaG8gIiRhc19t ZToke2FzX2xpbmVuby0kTElORU5PfTogZXJyb3I6IGluIFxgJGFjX3B3ZCc6IiA+JjUKKyRhc19l Y2hvICIkYXNfbWU6IGVycm9yOiBpbiBcYCRhY19wd2QnOiIgPiYyO30KK2FzX2ZuX2Vycm9yICQ/ ICJUaGUgcGtnLWNvbmZpZyBzY3JpcHQgY291bGQgbm90IGJlIGZvdW5kIG9yIGlzIHRvbyBvbGQu ICBNYWtlIHN1cmUgaXQKK2lzIGluIHlvdXIgUEFUSCBvciBzZXQgdGhlIFBLR19DT05GSUcgZW52 aXJvbm1lbnQgdmFyaWFibGUgdG8gdGhlIGZ1bGwKK3BhdGggdG8gcGtnLWNvbmZpZy4KKworQWx0 ZXJuYXRpdmVseSwgeW91IG1heSBzZXQgdGhlIGVudmlyb25tZW50IHZhcmlhYmxlcyBERUJVR0lO Rk9EX0NGTEFHUworYW5kIERFQlVHSU5GT0RfTElCUyB0byBhdm9pZCB0aGUgbmVlZCB0byBjYWxs IHBrZy1jb25maWcuCitTZWUgdGhlIHBrZy1jb25maWcgbWFuIHBhZ2UgZm9yIG1vcmUgZGV0YWls cy4KKworVG8gZ2V0IHBrZy1jb25maWcsIHNlZSA8aHR0cDovL3BrZy1jb25maWcuZnJlZWRlc2t0 b3Aub3JnLz4uCitTZWUgXGBjb25maWcubG9nJyBmb3IgbW9yZSBkZXRhaWxzIiAiJExJTkVOTyIg NTsgfQogZWxzZQogCURFQlVHSU5GT0RfQ0ZMQUdTPSRwa2dfY3ZfREVCVUdJTkZPRF9DRkxBR1MK IAlERUJVR0lORk9EX0xJQlM9JHBrZ19jdl9ERUJVR0lORk9EX0xJQlMKICAgICAgICAgeyAkYXNf ZWNobyAiJGFzX21lOiR7YXNfbGluZW5vLSRMSU5FTk99OiByZXN1bHQ6IHllcyIgPiY1CiAkYXNf ZWNobyAieWVzIiA+JjY7IH0KKwl7ICRhc19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVO T306IGNoZWNraW5nIGZvciBkZWJ1Z2luZm9kX2JlZ2luIGluIC1sZGVidWdpbmZvZCIgPiY1Cisk YXNfZWNob19uICJjaGVja2luZyBmb3IgZGVidWdpbmZvZF9iZWdpbiBpbiAtbGRlYnVnaW5mb2Qu Li4gIiA+JjY7IH0KK2lmICR7YWNfY3ZfbGliX2RlYnVnaW5mb2RfZGVidWdpbmZvZF9iZWdpbis6 fSBmYWxzZTsgdGhlbiA6CisgICRhc19lY2hvX24gIihjYWNoZWQpICIgPiY2CitlbHNlCisgIGFj X2NoZWNrX2xpYl9zYXZlX0xJQlM9JExJQlMKK0xJQlM9Ii1sZGVidWdpbmZvZCAgJExJQlMiCitj YXQgY29uZmRlZnMuaCAtIDw8X0FDRU9GID5jb25mdGVzdC4kYWNfZXh0CisvKiBlbmQgY29uZmRl ZnMuaC4gICovCiAKLSRhc19lY2hvICIjZGVmaW5lIEhBVkVfTElCREVCVUdJTkZPRCAxIiA+PmNv bmZkZWZzLmgKKy8qIE92ZXJyaWRlIGFueSBHQ0MgaW50ZXJuYWwgcHJvdG90eXBlIHRvIGF2b2lk IGFuIGVycm9yLgorICAgVXNlIGNoYXIgYmVjYXVzZSBpbnQgbWlnaHQgbWF0Y2ggdGhlIHJldHVy biB0eXBlIG9mIGEgR0NDCisgICBidWlsdGluIGFuZCB0aGVuIGl0cyBhcmd1bWVudCBwcm90b3R5 cGUgd291bGQgc3RpbGwgYXBwbHkuICAqLworI2lmZGVmIF9fY3BsdXNwbHVzCitleHRlcm4gIkMi CisjZW5kaWYKK2NoYXIgZGVidWdpbmZvZF9iZWdpbiAoKTsKK2ludAorbWFpbiAoKQoreworcmV0 dXJuIGRlYnVnaW5mb2RfYmVnaW4gKCk7CisgIDsKKyAgcmV0dXJuIDA7Cit9CitfQUNFT0YKK2lm IGFjX2ZuX2NfdHJ5X2xpbmsgIiRMSU5FTk8iOyB0aGVuIDoKKyAgYWNfY3ZfbGliX2RlYnVnaW5m b2RfZGVidWdpbmZvZF9iZWdpbj15ZXMKK2Vsc2UKKyAgYWNfY3ZfbGliX2RlYnVnaW5mb2RfZGVi dWdpbmZvZF9iZWdpbj1ubworZmkKK3JtIC1mIGNvcmUgY29uZnRlc3QuZXJyIGNvbmZ0ZXN0LiRh Y19vYmpleHQgXAorICAgIGNvbmZ0ZXN0JGFjX2V4ZWV4dCBjb25mdGVzdC4kYWNfZXh0CitMSUJT PSRhY19jaGVja19saWJfc2F2ZV9MSUJTCitmaQoreyAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGlu ZW5vLSRMSU5FTk99OiByZXN1bHQ6ICRhY19jdl9saWJfZGVidWdpbmZvZF9kZWJ1Z2luZm9kX2Jl Z2luIiA+JjUKKyRhc19lY2hvICIkYWNfY3ZfbGliX2RlYnVnaW5mb2RfZGVidWdpbmZvZF9iZWdp biIgPiY2OyB9CitpZiB0ZXN0ICJ4JGFjX2N2X2xpYl9kZWJ1Z2luZm9kX2RlYnVnaW5mb2RfYmVn aW4iID0geHllczsgdGhlbiA6CisgIGhhdmVfbGliZGVidWdpbmZvZD0xCitmaQogCiBmaQorICBp ZiB0ZXN0ICJ4JGhhdmVfbGliZGVidWdpbmZvZCIgPSAieDAiOyB0aGVuCisgICAgREVCVUdJTkZP RF9MSUJTPQorICAgIGlmIHRlc3QgIngkd2l0aF9kZWJ1Z2luZm9kIiA9IHh5ZXM7IHRoZW4KKyAg ICAgICBhc19mbl9lcnJvciAkPyAiXCItLXdpdGgtZGVidWdpbmZvZCB3YXMgZ2l2ZW4sIGJ1dCBs aWJkZWJ1Z2luZm9kIGlzIG1pc3Npbmcgb3IgdW51c2FibGUuXCIiICIkTElORU5PIiA1CisgICAg IGVsc2UKKyAgICAgICB7ICRhc19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IFdB Uk5JTkc6IGxpYmRlYnVnaW5mb2QgaXMgbWlzc2luZyBvciB1bnVzYWJsZTsgc29tZSBmZWF0dXJl cyBtYXkgYmUgdW5hdmFpbGFibGUuIiA+JjUKKyRhc19lY2hvICIkYXNfbWU6IFdBUk5JTkc6IGxp YmRlYnVnaW5mb2QgaXMgbWlzc2luZyBvciB1bnVzYWJsZTsgc29tZSBmZWF0dXJlcyBtYXkgYmUg dW5hdmFpbGFibGUuIiA+JjI7fQorICAgICBmaQorICBmaQogZWxzZQogICB7ICRhc19lY2hvICIk YXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IFdBUk5JTkc6IGRlYnVnaW5mb2Qgc3VwcG9ydCBk aXNhYmxlZDsgc29tZSBmZWF0dXJlcyBtYXkgYmUgdW5hdmFpbGFibGUuIiA+JjUKICRhc19lY2hv ICIkYXNfbWU6IFdBUk5JTkc6IGRlYnVnaW5mb2Qgc3VwcG9ydCBkaXNhYmxlZDsgc29tZSBmZWF0 dXJlcyBtYXkgYmUgdW5hdmFpbGFibGUuIiA+JjI7fQogZmkKIAorY2F0ID4+Y29uZmRlZnMuaCA8 PF9BQ0VPRgorI2RlZmluZSBIQVZFX0xJQkRFQlVHSU5GT0QgJGhhdmVfbGliZGVidWdpbmZvZAor X0FDRU9GCisKKwogCiAKIGNhdCA+PmNvbmZkZWZzLmggPDxfQUNFT0YKZGlmZiAtLWdpdCBhL2Nv bmZpZy9kZWJ1Z2luZm9kLm00IGIvY29uZmlnL2RlYnVnaW5mb2QubTQKaW5kZXggZjllYjA5ODhl My4uZTA1ZDY5ZTI0YyAxMDA2NDQKLS0tIGEvY29uZmlnL2RlYnVnaW5mb2QubTQKKysrIGIvY29u ZmlnL2RlYnVnaW5mb2QubTQKQEAgLTE2LDE1ICsxNiwyMyBAQCBBQ19BUkdfV0lUSChbZGVidWdp bmZvZF0sCiBBQ19NU0dfQ0hFQ0tJTkcoW3doZXRoZXIgdG8gdXNlIGRlYnVnaW5mb2RdKQogQUNf TVNHX1JFU1VMVChbJHdpdGhfZGVidWdpbmZvZF0pCiAKK2hhdmVfbGliZGVidWdpbmZvZD0wCiBp ZiB0ZXN0ICJ4JHdpdGhfZGVidWdpbmZvZCIgIT0geG5vOyB0aGVuCiAgIFBLR19DSEVDS19NT0RV TEVTKFtERUJVR0lORk9EXSwgW2xpYmRlYnVnaW5mb2QgPj0gMC4xNzldLAotICAgIFtBQ19ERUZJ TkUoW0hBVkVfTElCREVCVUdJTkZPRF0sIFsxXSwgW0RlZmluZSB0byAxIGlmIGRlYnVnaW5mb2Qg aXMgZW5hYmxlZC5dKV0sCi0gICAgW2lmIHRlc3QgIngkd2l0aF9kZWJ1Z2luZm9kIiA9IHh5ZXM7 IHRoZW4KKyAgICBbQUNfQ0hFQ0tfTElCKFtkZWJ1Z2luZm9kXSwgW2RlYnVnaW5mb2RfYmVnaW5d LAorICAgICAgIFtoYXZlX2xpYmRlYnVnaW5mb2Q9MV0pXSkKKyAgaWYgdGVzdCAieCRoYXZlX2xp YmRlYnVnaW5mb2QiID0gIngwIjsgdGhlbgorICAgIERFQlVHSU5GT0RfTElCUz0KKyAgICBpZiB0 ZXN0ICJ4JHdpdGhfZGVidWdpbmZvZCIgPSB4eWVzOyB0aGVuCiAgICAgICAgQUNfTVNHX0VSUk9S KFsiLS13aXRoLWRlYnVnaW5mb2Qgd2FzIGdpdmVuLCBidXQgbGliZGVidWdpbmZvZCBpcyBtaXNz aW5nIG9yIHVudXNhYmxlLiJdKQogICAgICBlbHNlCiAgICAgICAgQUNfTVNHX1dBUk4oW2xpYmRl YnVnaW5mb2QgaXMgbWlzc2luZyBvciB1bnVzYWJsZTsgc29tZSBmZWF0dXJlcyBtYXkgYmUgdW5h dmFpbGFibGUuXSkKLSAgICAgZmldKQorICAgICBmaQorICBmaQogZWxzZQogICBBQ19NU0dfV0FS TihbZGVidWdpbmZvZCBzdXBwb3J0IGRpc2FibGVkOyBzb21lIGZlYXR1cmVzIG1heSBiZSB1bmF2 YWlsYWJsZS5dKQogZmkKK0FDX0RFRklORV9VTlFVT1RFRChbSEFWRV9MSUJERUJVR0lORk9EXSwK KwkJICAgWyRoYXZlX2xpYmRlYnVnaW5mb2RdLAorCQkgICBbRGVmaW5lIHRvIDEgaWYgZGVidWdp bmZvZCBpcyBlbmFibGVkLl0pCiBdKQpkaWZmIC0tZ2l0IGEvZ2RiL2NvbmZpZ3VyZSBiL2dkYi9j b25maWd1cmUKaW5kZXggYWRjZmE0OWM2My4uMTU0MzcwZjlhYiAxMDA3NTUKLS0tIGEvZ2RiL2Nv bmZpZ3VyZQorKysgYi9nZGIvY29uZmlndXJlCkBAIC02OTk2LDYgKzY5OTYsNyBAQCAkYXNfZWNo b19uICJjaGVja2luZyB3aGV0aGVyIHRvIHVzZSBkZWJ1Z2luZm9kLi4uICIgPiY2OyB9CiB7ICRh c19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IHJlc3VsdDogJHdpdGhfZGVidWdp bmZvZCIgPiY1CiAkYXNfZWNobyAiJHdpdGhfZGVidWdpbmZvZCIgPiY2OyB9CiAKK2hhdmVfbGli ZGVidWdpbmZvZD0wCiBpZiB0ZXN0ICJ4JHdpdGhfZGVidWdpbmZvZCIgIT0geG5vOyB0aGVuCiAK IHBrZ19mYWlsZWQ9bm8KQEAgLTcwNTYsMzUgKzcwNTcsOTYgQEAgZmkKIAkjIFB1dCB0aGUgbmFz dHkgZXJyb3IgbWVzc2FnZSBpbiBjb25maWcubG9nIHdoZXJlIGl0IGJlbG9uZ3MKIAllY2hvICIk REVCVUdJTkZPRF9QS0dfRVJST1JTIiA+JjUKIAotCWlmIHRlc3QgIngkd2l0aF9kZWJ1Z2luZm9k IiA9IHh5ZXM7IHRoZW4KLSAgICAgICBhc19mbl9lcnJvciAkPyAiXCItLXdpdGgtZGVidWdpbmZv ZCB3YXMgZ2l2ZW4sIGJ1dCBsaWJkZWJ1Z2luZm9kIGlzIG1pc3Npbmcgb3IgdW51c2FibGUuXCIi ICIkTElORU5PIiA1Ci0gICAgIGVsc2UKLSAgICAgICB7ICRhc19lY2hvICIkYXNfbWU6JHthc19s aW5lbm8tJExJTkVOT306IFdBUk5JTkc6IGxpYmRlYnVnaW5mb2QgaXMgbWlzc2luZyBvciB1bnVz YWJsZTsgc29tZSBmZWF0dXJlcyBtYXkgYmUgdW5hdmFpbGFibGUuIiA+JjUKLSRhc19lY2hvICIk YXNfbWU6IFdBUk5JTkc6IGxpYmRlYnVnaW5mb2QgaXMgbWlzc2luZyBvciB1bnVzYWJsZTsgc29t ZSBmZWF0dXJlcyBtYXkgYmUgdW5hdmFpbGFibGUuIiA+JjI7fQotICAgICBmaQorCWFzX2ZuX2Vy cm9yICQ/ICJQYWNrYWdlIHJlcXVpcmVtZW50cyAobGliZGVidWdpbmZvZCA+PSAwLjE3OSkgd2Vy ZSBub3QgbWV0OgorCiskREVCVUdJTkZPRF9QS0dfRVJST1JTCisKK0NvbnNpZGVyIGFkanVzdGlu ZyB0aGUgUEtHX0NPTkZJR19QQVRIIGVudmlyb25tZW50IHZhcmlhYmxlIGlmIHlvdQoraW5zdGFs bGVkIHNvZnR3YXJlIGluIGEgbm9uLXN0YW5kYXJkIHByZWZpeC4KKworQWx0ZXJuYXRpdmVseSwg eW91IG1heSBzZXQgdGhlIGVudmlyb25tZW50IHZhcmlhYmxlcyBERUJVR0lORk9EX0NGTEFHUwor YW5kIERFQlVHSU5GT0RfTElCUyB0byBhdm9pZCB0aGUgbmVlZCB0byBjYWxsIHBrZy1jb25maWcu CitTZWUgdGhlIHBrZy1jb25maWcgbWFuIHBhZ2UgZm9yIG1vcmUgZGV0YWlscy4iICIkTElORU5P IiA1CiBlbGlmIHRlc3QgJHBrZ19mYWlsZWQgPSB1bnRyaWVkOyB0aGVuCiAgICAgICAgIHsgJGFz X2VjaG8gIiRhc19tZToke2FzX2xpbmVuby0kTElORU5PfTogcmVzdWx0OiBubyIgPiY1CiAkYXNf ZWNobyAibm8iID4mNjsgfQotCWlmIHRlc3QgIngkd2l0aF9kZWJ1Z2luZm9kIiA9IHh5ZXM7IHRo ZW4KLSAgICAgICBhc19mbl9lcnJvciAkPyAiXCItLXdpdGgtZGVidWdpbmZvZCB3YXMgZ2l2ZW4s IGJ1dCBsaWJkZWJ1Z2luZm9kIGlzIG1pc3Npbmcgb3IgdW51c2FibGUuXCIiICIkTElORU5PIiA1 Ci0gICAgIGVsc2UKLSAgICAgICB7ICRhc19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVO T306IFdBUk5JTkc6IGxpYmRlYnVnaW5mb2QgaXMgbWlzc2luZyBvciB1bnVzYWJsZTsgc29tZSBm ZWF0dXJlcyBtYXkgYmUgdW5hdmFpbGFibGUuIiA+JjUKLSRhc19lY2hvICIkYXNfbWU6IFdBUk5J Tkc6IGxpYmRlYnVnaW5mb2QgaXMgbWlzc2luZyBvciB1bnVzYWJsZTsgc29tZSBmZWF0dXJlcyBt YXkgYmUgdW5hdmFpbGFibGUuIiA+JjI7fQotICAgICBmaQorCXsgeyAkYXNfZWNobyAiJGFzX21l OiR7YXNfbGluZW5vLSRMSU5FTk99OiBlcnJvcjogaW4gXGAkYWNfcHdkJzoiID4mNQorJGFzX2Vj aG8gIiRhc19tZTogZXJyb3I6IGluIFxgJGFjX3B3ZCc6IiA+JjI7fQorYXNfZm5fZXJyb3IgJD8g IlRoZSBwa2ctY29uZmlnIHNjcmlwdCBjb3VsZCBub3QgYmUgZm91bmQgb3IgaXMgdG9vIG9sZC4g IE1ha2Ugc3VyZSBpdAoraXMgaW4geW91ciBQQVRIIG9yIHNldCB0aGUgUEtHX0NPTkZJRyBlbnZp cm9ubWVudCB2YXJpYWJsZSB0byB0aGUgZnVsbAorcGF0aCB0byBwa2ctY29uZmlnLgorCitBbHRl cm5hdGl2ZWx5LCB5b3UgbWF5IHNldCB0aGUgZW52aXJvbm1lbnQgdmFyaWFibGVzIERFQlVHSU5G T0RfQ0ZMQUdTCithbmQgREVCVUdJTkZPRF9MSUJTIHRvIGF2b2lkIHRoZSBuZWVkIHRvIGNhbGwg cGtnLWNvbmZpZy4KK1NlZSB0aGUgcGtnLWNvbmZpZyBtYW4gcGFnZSBmb3IgbW9yZSBkZXRhaWxz LgorCitUbyBnZXQgcGtnLWNvbmZpZywgc2VlIDxodHRwOi8vcGtnLWNvbmZpZy5mcmVlZGVza3Rv cC5vcmcvPi4KK1NlZSBcYGNvbmZpZy5sb2cnIGZvciBtb3JlIGRldGFpbHMiICIkTElORU5PIiA1 OyB9CiBlbHNlCiAJREVCVUdJTkZPRF9DRkxBR1M9JHBrZ19jdl9ERUJVR0lORk9EX0NGTEFHUwog CURFQlVHSU5GT0RfTElCUz0kcGtnX2N2X0RFQlVHSU5GT0RfTElCUwogICAgICAgICB7ICRhc19l Y2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IHJlc3VsdDogeWVzIiA+JjUKICRhc19l Y2hvICJ5ZXMiID4mNjsgfQorCXsgJGFzX2VjaG8gIiRhc19tZToke2FzX2xpbmVuby0kTElORU5P fTogY2hlY2tpbmcgZm9yIGRlYnVnaW5mb2RfYmVnaW4gaW4gLWxkZWJ1Z2luZm9kIiA+JjUKKyRh c19lY2hvX24gImNoZWNraW5nIGZvciBkZWJ1Z2luZm9kX2JlZ2luIGluIC1sZGVidWdpbmZvZC4u LiAiID4mNjsgfQoraWYgJHthY19jdl9saWJfZGVidWdpbmZvZF9kZWJ1Z2luZm9kX2JlZ2luKzp9 IGZhbHNlOyB0aGVuIDoKKyAgJGFzX2VjaG9fbiAiKGNhY2hlZCkgIiA+JjYKK2Vsc2UKKyAgYWNf Y2hlY2tfbGliX3NhdmVfTElCUz0kTElCUworTElCUz0iLWxkZWJ1Z2luZm9kICAkTElCUyIKK2Nh dCBjb25mZGVmcy5oIC0gPDxfQUNFT0YgPmNvbmZ0ZXN0LiRhY19leHQKKy8qIGVuZCBjb25mZGVm cy5oLiAgKi8KIAotJGFzX2VjaG8gIiNkZWZpbmUgSEFWRV9MSUJERUJVR0lORk9EIDEiID4+Y29u ZmRlZnMuaAorLyogT3ZlcnJpZGUgYW55IEdDQyBpbnRlcm5hbCBwcm90b3R5cGUgdG8gYXZvaWQg YW4gZXJyb3IuCisgICBVc2UgY2hhciBiZWNhdXNlIGludCBtaWdodCBtYXRjaCB0aGUgcmV0dXJu IHR5cGUgb2YgYSBHQ0MKKyAgIGJ1aWx0aW4gYW5kIHRoZW4gaXRzIGFyZ3VtZW50IHByb3RvdHlw ZSB3b3VsZCBzdGlsbCBhcHBseS4gICovCisjaWZkZWYgX19jcGx1c3BsdXMKK2V4dGVybiAiQyIK KyNlbmRpZgorY2hhciBkZWJ1Z2luZm9kX2JlZ2luICgpOworaW50CittYWluICgpCit7CityZXR1 cm4gZGVidWdpbmZvZF9iZWdpbiAoKTsKKyAgOworICByZXR1cm4gMDsKK30KK19BQ0VPRgoraWYg YWNfZm5fY190cnlfbGluayAiJExJTkVOTyI7IHRoZW4gOgorICBhY19jdl9saWJfZGVidWdpbmZv ZF9kZWJ1Z2luZm9kX2JlZ2luPXllcworZWxzZQorICBhY19jdl9saWJfZGVidWdpbmZvZF9kZWJ1 Z2luZm9kX2JlZ2luPW5vCitmaQorcm0gLWYgY29yZSBjb25mdGVzdC5lcnIgY29uZnRlc3QuJGFj X29iamV4dCBcCisgICAgY29uZnRlc3QkYWNfZXhlZXh0IGNvbmZ0ZXN0LiRhY19leHQKK0xJQlM9 JGFjX2NoZWNrX2xpYl9zYXZlX0xJQlMKK2ZpCit7ICRhc19lY2hvICIkYXNfbWU6JHthc19saW5l bm8tJExJTkVOT306IHJlc3VsdDogJGFjX2N2X2xpYl9kZWJ1Z2luZm9kX2RlYnVnaW5mb2RfYmVn aW4iID4mNQorJGFzX2VjaG8gIiRhY19jdl9saWJfZGVidWdpbmZvZF9kZWJ1Z2luZm9kX2JlZ2lu IiA+JjY7IH0KK2lmIHRlc3QgIngkYWNfY3ZfbGliX2RlYnVnaW5mb2RfZGVidWdpbmZvZF9iZWdp biIgPSB4eWVzOyB0aGVuIDoKKyAgaGF2ZV9saWJkZWJ1Z2luZm9kPTEKK2ZpCiAKIGZpCisgIGlm IHRlc3QgIngkaGF2ZV9saWJkZWJ1Z2luZm9kIiA9ICJ4MCI7IHRoZW4KKyAgICBERUJVR0lORk9E X0xJQlM9CisgICAgaWYgdGVzdCAieCR3aXRoX2RlYnVnaW5mb2QiID0geHllczsgdGhlbgorICAg ICAgIGFzX2ZuX2Vycm9yICQ/ICJcIi0td2l0aC1kZWJ1Z2luZm9kIHdhcyBnaXZlbiwgYnV0IGxp YmRlYnVnaW5mb2QgaXMgbWlzc2luZyBvciB1bnVzYWJsZS5cIiIgIiRMSU5FTk8iIDUKKyAgICAg ZWxzZQorICAgICAgIHsgJGFzX2VjaG8gIiRhc19tZToke2FzX2xpbmVuby0kTElORU5PfTogV0FS TklORzogbGliZGVidWdpbmZvZCBpcyBtaXNzaW5nIG9yIHVudXNhYmxlOyBzb21lIGZlYXR1cmVz IG1heSBiZSB1bmF2YWlsYWJsZS4iID4mNQorJGFzX2VjaG8gIiRhc19tZTogV0FSTklORzogbGli ZGVidWdpbmZvZCBpcyBtaXNzaW5nIG9yIHVudXNhYmxlOyBzb21lIGZlYXR1cmVzIG1heSBiZSB1 bmF2YWlsYWJsZS4iID4mMjt9CisgICAgIGZpCisgIGZpCiBlbHNlCiAgIHsgJGFzX2VjaG8gIiRh c19tZToke2FzX2xpbmVuby0kTElORU5PfTogV0FSTklORzogZGVidWdpbmZvZCBzdXBwb3J0IGRp c2FibGVkOyBzb21lIGZlYXR1cmVzIG1heSBiZSB1bmF2YWlsYWJsZS4iID4mNQogJGFzX2VjaG8g IiRhc19tZTogV0FSTklORzogZGVidWdpbmZvZCBzdXBwb3J0IGRpc2FibGVkOyBzb21lIGZlYXR1 cmVzIG1heSBiZSB1bmF2YWlsYWJsZS4iID4mMjt9CiBmaQogCitjYXQgPj5jb25mZGVmcy5oIDw8 X0FDRU9GCisjZGVmaW5lIEhBVkVfTElCREVCVUdJTkZPRCAkaGF2ZV9saWJkZWJ1Z2luZm9kCitf QUNFT0YKKworCiAKICMgTGlidW53aW5kIHN1cHBvcnQgZm9yIGlhNjQuCiAKLS0gCjIuMjYuMgoK --000000000000f2b3ca05ab6e074f--