From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd41.google.com (mail-io1-xd41.google.com [IPv6:2607:f8b0:4864:20::d41]) by sourceware.org (Postfix) with ESMTPS id F3CDF384402C; Mon, 27 Jul 2020 19:15:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F3CDF384402C Received: by mail-io1-xd41.google.com with SMTP id g19so6092349ioh.8; Mon, 27 Jul 2020 12:15:34 -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=WhR1f2h8GBr+skhb2kSAQRY7eqZ1Hf5q0jsI0YAURCE=; b=XJ0Ky55CHojncI1EjKSve2mPgHmEWRC1Tmd3S7557Rpn5QnE0QTvpenM8g9MwrElNe QjmLuTHfRfQYileB9rZM4DCDGDyfjuP8wGmXtlThHltirDZ0coLaP17SwZE8h5f6fdps RUtR8EYbYKwtUmwy08TVAhL/a9RiJmSaOwY9ZVZcH02b+O3M4OiRLmUvaxePdkbU66Tx NY7DUlMVPs2CKgcMxBi3asiz+qf1DevBOrfAoJgzpm59uh7Qij2UIhK1VMthnez3lzPo RKC44kZ2uQYYXRd67RARPbEZ0qvqWcrwN7lRaP12462Q3u1Wh6/pX0pNHT3I2fyp6VJs ZblA== X-Gm-Message-State: AOAM533QZ5IzLeEO1cTIsedE3fy2lVxf9IBhzPrTMuwTIlv/yNS79tVf Qy3/kIN7J3y7uxOUQzjf3N9mBeXD1Z70CxRSJ7g= X-Google-Smtp-Source: ABdhPJzSE/tZDAFKrD7skQi1XCQsF9wev2CC0FF1fvymzO1edFAdSBREapX1Wm+0bX5OVGOdEM3iR8/1MI95j6mHhiw= X-Received: by 2002:a02:7419:: with SMTP id o25mr28044447jac.4.1595877334394; Mon, 27 Jul 2020 12:15:34 -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 12:14:58 -0700 Message-ID: Subject: [PATCH] PKG_CHECK_MODULES: Check if $pkg_cv_[]$1[]_LIBS works To: Aaron Merey Cc: Tom Tromey , Simon Marchi , GCC Patches , Aaron Merey via Binutils , GDB Content-Type: multipart/mixed; boundary="0000000000009f9f2505ab712598" X-Spam-Status: No, score=-8.5 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 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 19:15:36 -0000 --0000000000009f9f2505ab712598 Content-Type: text/plain; charset="UTF-8" On Mon, Jul 27, 2020 at 9:11 AM Aaron Merey wrote: > > On Mon, Jul 27, 2020 at 11:32 AM H.J. Lu wrote: > > > > On Sat, Jul 25, 2020 at 9:01 AM H.J. Lu wrote: > > > 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? > > Thanks for spotting this. Normally PKG_CHECH_MODULES would correctly > detect whether the .so and header are installed and build accordingly, > but when cross compiling the AC_CHECK_LIB may be needed. I am not cross compiling. I am simply using "gcc -m32". The problem is PKG_CHECK_MODULES which doesn't check if $pkg_cv_[]$1[]_LIBS actually works. Here is the updated patch to fix PKG_CHECK_MODULES. Any comments or objections? -- H.J. --0000000000009f9f2505ab712598 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-PKG_CHECK_MODULES-Check-if-pkg_cv_-1-_LIBS-works.patch" Content-Disposition: attachment; filename="0001-PKG_CHECK_MODULES-Check-if-pkg_cv_-1-_LIBS-works.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kd4w26b10 RnJvbSA0MmQ0OWIxNDQ0YWQ2Yzg0NzU2NzJmNmE2YTE2ODEwZDllN2MxNWVmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiSC5KLiBMdSIgPGhqbC50b29sc0BnbWFpbC5jb20+CkRhdGU6 IE1vbiwgMjcgSnVsIDIwMjAgMDg6MjQ6MTUgLTA3MDAKU3ViamVjdDogW1BBVENIXSBQS0dfQ0hF Q0tfTU9EVUxFUzogQ2hlY2sgaWYgJHBrZ19jdl9bXSQxW11fTElCUyB3b3JrcwoKSXQgaXMgcXVp dGUgbm9ybWFsIHRvIGhhdmUgaGVhZGVycyB3aXRob3V0IGxpYnJhcnkgb24gbXVsdGlsaWIgT1Nl cy4KQWRkIEFDX1RSWV9MSU5LIHRvIFBLR19DSEVDS19NT0RVTEVTIHRvIGNoZWNrIGlmICRwa2df Y3ZfW10kMVtdX0xJQlMKd29ya3MuICBBbmQgYWx3YXlzIGRlZmluZSBIQVZFX0xJQkRFQlVHSU5G T0QgdG8gMCBvciAxIGZvcgoKYmludXRpbHMvZHdhcmYuYzojaWYgSEFWRV9MSUJERUJVR0lORk9E CmJpbnV0aWxzL2R3YXJmLmM6I2lmIEhBVkVfTElCREVCVUdJTkZPRApiaW51dGlscy9kd2FyZi5j OiNpZiBIQVZFX0xJQkRFQlVHSU5GT0QKYmludXRpbHMvZHdhcmYuaDojaWYgSEFWRV9MSUJERUJV R0lORk9ECmJpbnV0aWxzL29iamR1bXAuYzojaWYgSEFWRV9MSUJERUJVR0lORk9ECmJpbnV0aWxz L29iamR1bXAuYzojZW5kaWYgLyogSEFWRV9MSUJERUJVR0lORk9EICovCmJpbnV0aWxzL3JlYWRl bGYuYzojaWYgSEFWRV9MSUJERUJVR0lORk9ECmJpbnV0aWxzL3JlYWRlbGYuYzojZW5kaWYgLyog SEFWRV9MSUJERUJVR0lORk9EICovCmdkYi90b3AuYzojaWYgSEFWRV9MSUJERUJVR0lORk9ECgpj b25maWcvCgoJUFIgYmludXRpbHMvMjYzMDEKCSogZGVidWdpbmZvZC5tNCAoQUNfREVCVUdJTkZP RCk6IEFsd2F5cyBkZWZpbmUgSEFWRV9MSUJERUJVR0lORk9ECgl0byAwIG9yIDEuCgkqIHBrZy5t NCAoUEtHX0NIRUNLX01PRFVMRVMpOiBBZGQgQUNfVFJZX0xJTksgdG8gY2hlY2sgaWYKCSRwa2df Y3ZfW10kMVtdX0xJQlMgd29ya3MuCgpiaW51dGlscy8KCglQUiBiaW51dGlscy8yNjMwMQoJKiBj b25maWd1cmU6IFJlZ2VuZXJhdGVkLgoKZ2RiLwoKCVBSIGJpbnV0aWxzLzI2MzAxCgkqIGNvbmZp Z3VyZTogUmVnZW5lcmF0ZWQuCi0tLQogYmludXRpbHMvY29uZmlndXJlICAgfCAzOCArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLQogY29uZmlnL2RlYnVnaW5mb2QubTQgfCAg OSArKysrKysrLS0KIGNvbmZpZy9wa2cubTQgICAgICAgIHwgIDYgKysrKysrCiBnZGIvY29uZmln dXJlICAgICAgICB8IDM4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tCiA0 IGZpbGVzIGNoYW5nZWQsIDc5IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2JpbnV0aWxzL2NvbmZpZ3VyZSBiL2JpbnV0aWxzL2NvbmZpZ3VyZQppbmRleCBjOWZj NTEwOGUwLi4zZjlhYzg4OTkwIDEwMDc1NQotLS0gYS9iaW51dGlscy9jb25maWd1cmUKKysrIGIv YmludXRpbHMvY29uZmlndXJlCkBAIC0xMjM5OCw2ICsxMjM5OCw3IEBAICRhc19lY2hvX24gImNo ZWNraW5nIHdoZXRoZXIgdG8gdXNlIGRlYnVnaW5mb2QuLi4gIiA+JjY7IH0KIHsgJGFzX2VjaG8g IiRhc19tZToke2FzX2xpbmVuby0kTElORU5PfTogcmVzdWx0OiAkd2l0aF9kZWJ1Z2luZm9kIiA+ JjUKICRhc19lY2hvICIkd2l0aF9kZWJ1Z2luZm9kIiA+JjY7IH0KIAoraGF2ZV9saWJkZWJ1Z2lu Zm9kPTAKIGlmIHRlc3QgIngkd2l0aF9kZWJ1Z2luZm9kIiAhPSB4bm87IHRoZW4KIAogcGtnX2Zh aWxlZD1ubwpAQCAtMTI0MzksNiArMTI0NDAsMjggQEAgZmkKICAgICBwa2dfZmFpbGVkPXVudHJp ZWQKIGZpCiAKK3BrZ19zYXZlX0xERkxBR1M9IiRMREZMQUdTIgorTERGTEFHUz0iJExERkxBR1Mg JHBrZ19jdl9ERUJVR0lORk9EX0xJQlMiCitjYXQgY29uZmRlZnMuaCAtIDw8X0FDRU9GID5jb25m dGVzdC4kYWNfZXh0CisvKiBlbmQgY29uZmRlZnMuaC4gICovCisKK2ludAorbWFpbiAoKQorewor cmV0dXJuIDA7CisgIDsKKyAgcmV0dXJuIDA7Cit9CitfQUNFT0YKK2lmIGFjX2ZuX2NfdHJ5X2xp bmsgIiRMSU5FTk8iOyB0aGVuIDoKKyAgcGtnX2ZhaWxlZD1ubworZWxzZQorICBwa2dfZmFpbGVk PXllcworZmkKK3JtIC1mIGNvcmUgY29uZnRlc3QuZXJyIGNvbmZ0ZXN0LiRhY19vYmpleHQgXAor ICAgIGNvbmZ0ZXN0JGFjX2V4ZWV4dCBjb25mdGVzdC4kYWNfZXh0CitMREZMQUdTPSRwa2dfc2F2 ZV9MREZMQUdTCisKIAogCiBpZiB0ZXN0ICRwa2dfZmFpbGVkID0geWVzOyB0aGVuCkBAIC0xMjQ1 OCw3ICsxMjQ4MSw4IEBAIGZpCiAJIyBQdXQgdGhlIG5hc3R5IGVycm9yIG1lc3NhZ2UgaW4gY29u ZmlnLmxvZyB3aGVyZSBpdCBiZWxvbmdzCiAJZWNobyAiJERFQlVHSU5GT0RfUEtHX0VSUk9SUyIg PiY1CiAKLQlpZiB0ZXN0ICJ4JHdpdGhfZGVidWdpbmZvZCIgPSB4eWVzOyB0aGVuCisJaGF2ZV9s aWJkZWJ1Z2luZm9kPTAKKyAgICAgaWYgdGVzdCAieCR3aXRoX2RlYnVnaW5mb2QiID0geHllczsg dGhlbgogICAgICAgIGFzX2ZuX2Vycm9yICQ/ICJcIi0td2l0aC1kZWJ1Z2luZm9kIHdhcyBnaXZl biwgYnV0IGxpYmRlYnVnaW5mb2QgaXMgbWlzc2luZyBvciB1bnVzYWJsZS5cIiIgIiRMSU5FTk8i IDUKICAgICAgZWxzZQogICAgICAgIHsgJGFzX2VjaG8gIiRhc19tZToke2FzX2xpbmVuby0kTElO RU5PfTogV0FSTklORzogbGliZGVidWdpbmZvZCBpcyBtaXNzaW5nIG9yIHVudXNhYmxlOyBzb21l IGZlYXR1cmVzIG1heSBiZSB1bmF2YWlsYWJsZS4iID4mNQpAQCAtMTI0NjcsNyArMTI0OTEsOCBA QCAkYXNfZWNobyAiJGFzX21lOiBXQVJOSU5HOiBsaWJkZWJ1Z2luZm9kIGlzIG1pc3Npbmcgb3Ig dW51c2FibGU7IHNvbWUgZmVhdHVyZXMgbQogZWxpZiB0ZXN0ICRwa2dfZmFpbGVkID0gdW50cmll ZDsgdGhlbgogICAgICAgICB7ICRhc19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306 IHJlc3VsdDogbm8iID4mNQogJGFzX2VjaG8gIm5vIiA+JjY7IH0KLQlpZiB0ZXN0ICJ4JHdpdGhf ZGVidWdpbmZvZCIgPSB4eWVzOyB0aGVuCisJaGF2ZV9saWJkZWJ1Z2luZm9kPTAKKyAgICAgaWYg dGVzdCAieCR3aXRoX2RlYnVnaW5mb2QiID0geHllczsgdGhlbgogICAgICAgIGFzX2ZuX2Vycm9y ICQ/ICJcIi0td2l0aC1kZWJ1Z2luZm9kIHdhcyBnaXZlbiwgYnV0IGxpYmRlYnVnaW5mb2QgaXMg bWlzc2luZyBvciB1bnVzYWJsZS5cIiIgIiRMSU5FTk8iIDUKICAgICAgZWxzZQogICAgICAgIHsg JGFzX2VjaG8gIiRhc19tZToke2FzX2xpbmVuby0kTElORU5PfTogV0FSTklORzogbGliZGVidWdp bmZvZCBpcyBtaXNzaW5nIG9yIHVudXNhYmxlOyBzb21lIGZlYXR1cmVzIG1heSBiZSB1bmF2YWls YWJsZS4iID4mNQpAQCAtMTI0NzgsMTUgKzEyNTAzLDE4IEBAIGVsc2UKIAlERUJVR0lORk9EX0xJ QlM9JHBrZ19jdl9ERUJVR0lORk9EX0xJQlMKICAgICAgICAgeyAkYXNfZWNobyAiJGFzX21lOiR7 YXNfbGluZW5vLSRMSU5FTk99OiByZXN1bHQ6IHllcyIgPiY1CiAkYXNfZWNobyAieWVzIiA+JjY7 IH0KLQotJGFzX2VjaG8gIiNkZWZpbmUgSEFWRV9MSUJERUJVR0lORk9EIDEiID4+Y29uZmRlZnMu aAotCisJaGF2ZV9saWJkZWJ1Z2luZm9kPTEKIGZpCiBlbHNlCiAgIHsgJGFzX2VjaG8gIiRhc19t ZToke2FzX2xpbmVuby0kTElORU5PfTogV0FSTklORzogZGVidWdpbmZvZCBzdXBwb3J0IGRpc2Fi bGVkOyBzb21lIGZlYXR1cmVzIG1heSBiZSB1bmF2YWlsYWJsZS4iID4mNQogJGFzX2VjaG8gIiRh c19tZTogV0FSTklORzogZGVidWdpbmZvZCBzdXBwb3J0IGRpc2FibGVkOyBzb21lIGZlYXR1cmVz IG1heSBiZSB1bmF2YWlsYWJsZS4iID4mMjt9CiBmaQogCitjYXQgPj5jb25mZGVmcy5oIDw8X0FD RU9GCisjZGVmaW5lIEhBVkVfTElCREVCVUdJTkZPRCAkaGF2ZV9saWJkZWJ1Z2luZm9kCitfQUNF T0YKKworCiAKIAogY2F0ID4+Y29uZmRlZnMuaCA8PF9BQ0VPRgpkaWZmIC0tZ2l0IGEvY29uZmln L2RlYnVnaW5mb2QubTQgYi9jb25maWcvZGVidWdpbmZvZC5tNAppbmRleCBmOWViMDk4OGUzLi5h ZWMwNTEwNGJlIDEwMDY0NAotLS0gYS9jb25maWcvZGVidWdpbmZvZC5tNAorKysgYi9jb25maWcv ZGVidWdpbmZvZC5tNApAQCAtMTYsMTAgKzE2LDEyIEBAIEFDX0FSR19XSVRIKFtkZWJ1Z2luZm9k XSwKIEFDX01TR19DSEVDS0lORyhbd2hldGhlciB0byB1c2UgZGVidWdpbmZvZF0pCiBBQ19NU0df UkVTVUxUKFskd2l0aF9kZWJ1Z2luZm9kXSkKIAoraGF2ZV9saWJkZWJ1Z2luZm9kPTAKIGlmIHRl c3QgIngkd2l0aF9kZWJ1Z2luZm9kIiAhPSB4bm87IHRoZW4KICAgUEtHX0NIRUNLX01PRFVMRVMo W0RFQlVHSU5GT0RdLCBbbGliZGVidWdpbmZvZCA+PSAwLjE3OV0sCi0gICAgW0FDX0RFRklORShb SEFWRV9MSUJERUJVR0lORk9EXSwgWzFdLCBbRGVmaW5lIHRvIDEgaWYgZGVidWdpbmZvZCBpcyBl bmFibGVkLl0pXSwKLSAgICBbaWYgdGVzdCAieCR3aXRoX2RlYnVnaW5mb2QiID0geHllczsgdGhl bgorICAgIFtoYXZlX2xpYmRlYnVnaW5mb2Q9MV0sCisgICAgW2hhdmVfbGliZGVidWdpbmZvZD0w CisgICAgIGlmIHRlc3QgIngkd2l0aF9kZWJ1Z2luZm9kIiA9IHh5ZXM7IHRoZW4KICAgICAgICBB Q19NU0dfRVJST1IoWyItLXdpdGgtZGVidWdpbmZvZCB3YXMgZ2l2ZW4sIGJ1dCBsaWJkZWJ1Z2lu Zm9kIGlzIG1pc3Npbmcgb3IgdW51c2FibGUuIl0pCiAgICAgIGVsc2UKICAgICAgICBBQ19NU0df V0FSTihbbGliZGVidWdpbmZvZCBpcyBtaXNzaW5nIG9yIHVudXNhYmxlOyBzb21lIGZlYXR1cmVz IG1heSBiZSB1bmF2YWlsYWJsZS5dKQpAQCAtMjcsNCArMjksNyBAQCBpZiB0ZXN0ICJ4JHdpdGhf ZGVidWdpbmZvZCIgIT0geG5vOyB0aGVuCiBlbHNlCiAgIEFDX01TR19XQVJOKFtkZWJ1Z2luZm9k IHN1cHBvcnQgZGlzYWJsZWQ7IHNvbWUgZmVhdHVyZXMgbWF5IGJlIHVuYXZhaWxhYmxlLl0pCiBm aQorQUNfREVGSU5FX1VOUVVPVEVEKFtIQVZFX0xJQkRFQlVHSU5GT0RdLAorCQkgICBbJGhhdmVf bGliZGVidWdpbmZvZF0sCisJCSAgIFtEZWZpbmUgdG8gMSBpZiBkZWJ1Z2luZm9kIGlzIGVuYWJs ZWQuXSkKIF0pCmRpZmYgLS1naXQgYS9jb25maWcvcGtnLm00IGIvY29uZmlnL3BrZy5tNAppbmRl eCAxM2E4ODkwMTc4Li40NTU4N2U5N2M4IDEwMDY0NAotLS0gYS9jb25maWcvcGtnLm00CisrKyBi L2NvbmZpZy9wa2cubTQKQEAgLTE0Nyw2ICsxNDcsMTIgQEAgQUNfTVNHX0NIRUNLSU5HKFtmb3Ig JDJdKQogX1BLR19DT05GSUcoWyQxXVtfQ0ZMQUdTXSwgW2NmbGFnc10sIFskMl0pCiBfUEtHX0NP TkZJRyhbJDFdW19MSUJTXSwgW2xpYnNdLCBbJDJdKQogCitkbmwgQ2hlY2sgd2hldGhlciAkcGtn X2N2X1tdJDFbXV9MSUJTIHdvcmtzLgorcGtnX3NhdmVfTERGTEFHUz0iJExERkxBR1MiCitMREZM QUdTPSIkTERGTEFHUyAkcGtnX2N2X1tdJDFbXV9MSUJTIgorQUNfVFJZX0xJTksoW10sW3JldHVy biAwO10sIFtwa2dfZmFpbGVkPW5vXSwgW3BrZ19mYWlsZWQ9eWVzXSkKK0xERkxBR1M9JHBrZ19z YXZlX0xERkxBR1MKKwogbTRfZGVmaW5lKFtfUEtHX1RFWFRdLCBbQWx0ZXJuYXRpdmVseSwgeW91 IG1heSBzZXQgdGhlIGVudmlyb25tZW50IHZhcmlhYmxlcyAkMVtdX0NGTEFHUwogYW5kICQxW11f TElCUyB0byBhdm9pZCB0aGUgbmVlZCB0byBjYWxsIHBrZy1jb25maWcuCiBTZWUgdGhlIHBrZy1j b25maWcgbWFuIHBhZ2UgZm9yIG1vcmUgZGV0YWlscy5dKQpkaWZmIC0tZ2l0IGEvZ2RiL2NvbmZp Z3VyZSBiL2dkYi9jb25maWd1cmUKaW5kZXggYWRjZmE0OWM2My4uNzQ3NjA1YWFhMiAxMDA3NTUK LS0tIGEvZ2RiL2NvbmZpZ3VyZQorKysgYi9nZGIvY29uZmlndXJlCkBAIC02OTk2LDYgKzY5OTYs NyBAQCAkYXNfZWNob19uICJjaGVja2luZyB3aGV0aGVyIHRvIHVzZSBkZWJ1Z2luZm9kLi4uICIg PiY2OyB9CiB7ICRhc19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IHJlc3VsdDog JHdpdGhfZGVidWdpbmZvZCIgPiY1CiAkYXNfZWNobyAiJHdpdGhfZGVidWdpbmZvZCIgPiY2OyB9 CiAKK2hhdmVfbGliZGVidWdpbmZvZD0wCiBpZiB0ZXN0ICJ4JHdpdGhfZGVidWdpbmZvZCIgIT0g eG5vOyB0aGVuCiAKIHBrZ19mYWlsZWQ9bm8KQEAgLTcwMzcsNiArNzAzOCwyOCBAQCBmaQogICAg IHBrZ19mYWlsZWQ9dW50cmllZAogZmkKIAorcGtnX3NhdmVfTERGTEFHUz0iJExERkxBR1MiCitM REZMQUdTPSIkTERGTEFHUyAkcGtnX2N2X0RFQlVHSU5GT0RfTElCUyIKK2NhdCBjb25mZGVmcy5o IC0gPDxfQUNFT0YgPmNvbmZ0ZXN0LiRhY19leHQKKy8qIGVuZCBjb25mZGVmcy5oLiAgKi8KKwor aW50CittYWluICgpCit7CityZXR1cm4gMDsKKyAgOworICByZXR1cm4gMDsKK30KK19BQ0VPRgor aWYgYWNfZm5fY190cnlfbGluayAiJExJTkVOTyI7IHRoZW4gOgorICBwa2dfZmFpbGVkPW5vCitl bHNlCisgIHBrZ19mYWlsZWQ9eWVzCitmaQorcm0gLWYgY29yZSBjb25mdGVzdC5lcnIgY29uZnRl c3QuJGFjX29iamV4dCBcCisgICAgY29uZnRlc3QkYWNfZXhlZXh0IGNvbmZ0ZXN0LiRhY19leHQK K0xERkxBR1M9JHBrZ19zYXZlX0xERkxBR1MKKwogCiAKIGlmIHRlc3QgJHBrZ19mYWlsZWQgPSB5 ZXM7IHRoZW4KQEAgLTcwNTYsNyArNzA3OSw4IEBAIGZpCiAJIyBQdXQgdGhlIG5hc3R5IGVycm9y IG1lc3NhZ2UgaW4gY29uZmlnLmxvZyB3aGVyZSBpdCBiZWxvbmdzCiAJZWNobyAiJERFQlVHSU5G T0RfUEtHX0VSUk9SUyIgPiY1CiAKLQlpZiB0ZXN0ICJ4JHdpdGhfZGVidWdpbmZvZCIgPSB4eWVz OyB0aGVuCisJaGF2ZV9saWJkZWJ1Z2luZm9kPTAKKyAgICAgaWYgdGVzdCAieCR3aXRoX2RlYnVn aW5mb2QiID0geHllczsgdGhlbgogICAgICAgIGFzX2ZuX2Vycm9yICQ/ICJcIi0td2l0aC1kZWJ1 Z2luZm9kIHdhcyBnaXZlbiwgYnV0IGxpYmRlYnVnaW5mb2QgaXMgbWlzc2luZyBvciB1bnVzYWJs ZS5cIiIgIiRMSU5FTk8iIDUKICAgICAgZWxzZQogICAgICAgIHsgJGFzX2VjaG8gIiRhc19tZTok e2FzX2xpbmVuby0kTElORU5PfTogV0FSTklORzogbGliZGVidWdpbmZvZCBpcyBtaXNzaW5nIG9y IHVudXNhYmxlOyBzb21lIGZlYXR1cmVzIG1heSBiZSB1bmF2YWlsYWJsZS4iID4mNQpAQCAtNzA2 NSw3ICs3MDg5LDggQEAgJGFzX2VjaG8gIiRhc19tZTogV0FSTklORzogbGliZGVidWdpbmZvZCBp cyBtaXNzaW5nIG9yIHVudXNhYmxlOyBzb21lIGZlYXR1cmVzIG0KIGVsaWYgdGVzdCAkcGtnX2Zh aWxlZCA9IHVudHJpZWQ7IHRoZW4KICAgICAgICAgeyAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGlu ZW5vLSRMSU5FTk99OiByZXN1bHQ6IG5vIiA+JjUKICRhc19lY2hvICJubyIgPiY2OyB9Ci0JaWYg dGVzdCAieCR3aXRoX2RlYnVnaW5mb2QiID0geHllczsgdGhlbgorCWhhdmVfbGliZGVidWdpbmZv ZD0wCisgICAgIGlmIHRlc3QgIngkd2l0aF9kZWJ1Z2luZm9kIiA9IHh5ZXM7IHRoZW4KICAgICAg ICBhc19mbl9lcnJvciAkPyAiXCItLXdpdGgtZGVidWdpbmZvZCB3YXMgZ2l2ZW4sIGJ1dCBsaWJk ZWJ1Z2luZm9kIGlzIG1pc3Npbmcgb3IgdW51c2FibGUuXCIiICIkTElORU5PIiA1CiAgICAgIGVs c2UKICAgICAgICB7ICRhc19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IFdBUk5J Tkc6IGxpYmRlYnVnaW5mb2QgaXMgbWlzc2luZyBvciB1bnVzYWJsZTsgc29tZSBmZWF0dXJlcyBt YXkgYmUgdW5hdmFpbGFibGUuIiA+JjUKQEAgLTcwNzYsMTUgKzcxMDEsMTggQEAgZWxzZQogCURF QlVHSU5GT0RfTElCUz0kcGtnX2N2X0RFQlVHSU5GT0RfTElCUwogICAgICAgICB7ICRhc19lY2hv ICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IHJlc3VsdDogeWVzIiA+JjUKICRhc19lY2hv ICJ5ZXMiID4mNjsgfQotCi0kYXNfZWNobyAiI2RlZmluZSBIQVZFX0xJQkRFQlVHSU5GT0QgMSIg Pj5jb25mZGVmcy5oCi0KKwloYXZlX2xpYmRlYnVnaW5mb2Q9MQogZmkKIGVsc2UKICAgeyAkYXNf ZWNobyAiJGFzX21lOiR7YXNfbGluZW5vLSRMSU5FTk99OiBXQVJOSU5HOiBkZWJ1Z2luZm9kIHN1 cHBvcnQgZGlzYWJsZWQ7IHNvbWUgZmVhdHVyZXMgbWF5IGJlIHVuYXZhaWxhYmxlLiIgPiY1CiAk YXNfZWNobyAiJGFzX21lOiBXQVJOSU5HOiBkZWJ1Z2luZm9kIHN1cHBvcnQgZGlzYWJsZWQ7IHNv bWUgZmVhdHVyZXMgbWF5IGJlIHVuYXZhaWxhYmxlLiIgPiYyO30KIGZpCiAKK2NhdCA+PmNvbmZk ZWZzLmggPDxfQUNFT0YKKyNkZWZpbmUgSEFWRV9MSUJERUJVR0lORk9EICRoYXZlX2xpYmRlYnVn aW5mb2QKK19BQ0VPRgorCisKIAogIyBMaWJ1bndpbmQgc3VwcG9ydCBmb3IgaWE2NC4KIAotLSAK Mi4yNi4yCgo= --0000000000009f9f2505ab712598--