From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 88841 invoked by alias); 1 Jul 2015 20:53:27 -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 88830 invoked by uid 89); 1 Jul 2015 20:53:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.7 required=5.0 tests=AWL,BAYES_00,KAM_ASCII_DIVIDERS,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD,SPF_HELO_PASS,WEIRD_QUOTING autolearn=no 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; Wed, 01 Jul 2015 20:53:24 +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 (Postfix) with ESMTPS id 7402C8E4ED for ; Wed, 1 Jul 2015 20:53:23 +0000 (UTC) Received: from YAAKOV04.redhat.com ([10.10.116.36]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t61KrLm8021536 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 1 Jul 2015 16:53:22 -0400 Message-ID: <1435783997.10408.9.camel@redhat.com> Subject: Re: [PATCH] config: fix AM_ICONV for in-tree libiconv From: Yaakov Selkowitz To: gcc-patches@gcc.gnu.org Date: Wed, 01 Jul 2015 20:53:00 -0000 In-Reply-To: <1435783562.10408.6.camel@redhat.com> References: <1432934749.13692.9.camel@redhat.com> <1435783562.10408.6.camel@redhat.com> Content-Type: multipart/mixed; boundary="=-1Zjwo6yrC/feKTDyVse/" Mime-Version: 1.0 X-SW-Source: 2015-07/txt/msg00086.txt.bz2 --=-1Zjwo6yrC/feKTDyVse/ Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Content-length: 1102 On Wed, 2015-07-01 at 15:46 -0500, Yaakov Selkowitz wrote: > On Fri, 2015-05-29 at 16:25 -0500, Yaakov Selkowitz wrote: > > This is the second in a series of patches to make a build with an > > in-tree GNU libiconv work as designed. > > > > Currently GDB is the only toolchain component which actually uses an > > in-tree libiconv. This patch modifies the common AM_ICONV to use an > > in-tree libiconv when present and not already provided by libc. (GDB's > > workaround uses an in-tree libiconv even when libc provides iconv(3); > > I'm not sure when or why that would be desirable.) > > > > Once these two patches are merged in to each tree, I will follow with > > patches to regenerate the various configure scripts and a few other > > minor corresponding changes. > > This patch was bootstrapped in conjunction with the toplevel libiconv > patch. I don't have write permissions to either repository, so please > apply once approved. This patch includes the relevant changes for libcpp/configure and gcc/configure{.ac,}. -- Yaakov Selkowitz Associate Software Engineer, ARM Red Hat, Inc. --=-1Zjwo6yrC/feKTDyVse/ Content-Disposition: attachment; filename="0004-gcc-autoconf.patch" Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0004-gcc-autoconf.patch"; charset="UTF-8" Content-length: 16682 MjAxNS0wNy0wMSAgWWFha292IFNlbGtvd2l0eiAgPHlzZWxrb3dpQHJlZGhh dC5jb20+CgoJbGliY3BwLwoJKiBjb25maWd1cmU6IFJlZ2VuZXJhdGUuCgoJ Z2NjLwoJKiBjb25maWd1cmUuYWM6IERlZmluZSBMSUJJQ09OVl9ERVAgd2l0 aCBpbi10cmVlIGxpYmljb252LgoJKiBjb25maWd1cmU6IFJlZ2VuZXJhdGUu CgpJbmRleDogbGliY3BwL2NvbmZpZ3VyZQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBsaWJjcHAvY29uZmlndXJlCShyZXZpc2lvbiAyMjUyMTUpCisr KyBsaWJjcHAvY29uZmlndXJlCSh3b3JraW5nIGNvcHkpCkBAIC00NzMzLDYg KzQ3MzMsMTIgQEAKICMgRmlndXJlIG91dCB3aGF0IGNvbXBpbGVyIHdhcm5p bmdzIHdlIGNhbiBlbmFibGUuCiAjIFNlZSBjb25maWcvd2FybmluZ3MubTQg Zm9yIGRldGFpbHMuCiAKK2FjX2V4dD1jCithY19jcHA9JyRDUFAgJENQUEZM QUdTJworYWNfY29tcGlsZT0nJENDIC1jICRDRkxBR1MgJENQUEZMQUdTIGNv bmZ0ZXN0LiRhY19leHQgPiY1JworYWNfbGluaz0nJENDIC1vIGNvbmZ0ZXN0 JGFjX2V4ZWV4dCAkQ0ZMQUdTICRDUFBGTEFHUyAkTERGTEFHUyBjb25mdGVz dC4kYWNfZXh0ICRMSUJTID4mNScKK2FjX2NvbXBpbGVyX2dudT0kYWNfY3Zf Y19jb21waWxlcl9nbnUKKwogd2Fybj0KIHNhdmVfQ0ZMQUdTPSIkQ0ZMQUdT IgogZm9yIHJlYWxfb3B0aW9uIGluIC1XIC1XYWxsIC1Xbm8tbmFycm93aW5n IC1Xd3JpdGUtc3RyaW5ncyBcCkBAIC00Nzc4LDcgKzQ3ODQsMTkgQEAKIGZp CiAgIGRvbmUKIENGTEFHUz0iJHNhdmVfQ0ZMQUdTIgorYWNfZXh0PWMKK2Fj X2NwcD0nJENQUCAkQ1BQRkxBR1MnCithY19jb21waWxlPSckQ0MgLWMgJENG TEFHUyAkQ1BQRkxBR1MgY29uZnRlc3QuJGFjX2V4dCA+JjUnCithY19saW5r PSckQ0MgLW8gY29uZnRlc3QkYWNfZXhlZXh0ICRDRkxBR1MgJENQUEZMQUdT ICRMREZMQUdTIGNvbmZ0ZXN0LiRhY19leHQgJExJQlMgPiY1JworYWNfY29t cGlsZXJfZ251PSRhY19jdl9jX2NvbXBpbGVyX2dudQogCisKK2FjX2V4dD1j CithY19jcHA9JyRDUFAgJENQUEZMQUdTJworYWNfY29tcGlsZT0nJENDIC1j ICRDRkxBR1MgJENQUEZMQUdTIGNvbmZ0ZXN0LiRhY19leHQgPiY1JworYWNf bGluaz0nJENDIC1vIGNvbmZ0ZXN0JGFjX2V4ZWV4dCAkQ0ZMQUdTICRDUFBG TEFHUyAkTERGTEFHUyBjb25mdGVzdC4kYWNfZXh0ICRMSUJTID4mNScKK2Fj X2NvbXBpbGVyX2dudT0kYWNfY3ZfY19jb21waWxlcl9nbnUKKwogY193YXJu PQogc2F2ZV9DRkxBR1M9IiRDRkxBR1MiCiBmb3IgcmVhbF9vcHRpb24gaW4g LVdzdHJpY3QtcHJvdG90eXBlcyAtV21pc3NpbmctcHJvdG90eXBlcyBcCkBA IC00ODI0LDcgKzQ4NDIsMTkgQEAKIGZpCiAgIGRvbmUKIENGTEFHUz0iJHNh dmVfQ0ZMQUdTIgorYWNfZXh0PWMKK2FjX2NwcD0nJENQUCAkQ1BQRkxBR1Mn CithY19jb21waWxlPSckQ0MgLWMgJENGTEFHUyAkQ1BQRkxBR1MgY29uZnRl c3QuJGFjX2V4dCA+JjUnCithY19saW5rPSckQ0MgLW8gY29uZnRlc3QkYWNf ZXhlZXh0ICRDRkxBR1MgJENQUEZMQUdTICRMREZMQUdTIGNvbmZ0ZXN0LiRh Y19leHQgJExJQlMgPiY1JworYWNfY29tcGlsZXJfZ251PSRhY19jdl9jX2Nv bXBpbGVyX2dudQogCisKK2FjX2V4dD1jCithY19jcHA9JyRDUFAgJENQUEZM QUdTJworYWNfY29tcGlsZT0nJENDIC1jICRDRkxBR1MgJENQUEZMQUdTIGNv bmZ0ZXN0LiRhY19leHQgPiY1JworYWNfbGluaz0nJENDIC1vIGNvbmZ0ZXN0 JGFjX2V4ZWV4dCAkQ0ZMQUdTICRDUFBGTEFHUyAkTERGTEFHUyBjb25mdGVz dC4kYWNfZXh0ICRMSUJTID4mNScKK2FjX2NvbXBpbGVyX2dudT0kYWNfY3Zf Y19jb21waWxlcl9nbnUKKwogV0FSTl9QRURBTlRJQz0KICMgRG8gdGhlIGNo ZWNrIHdpdGggdGhlIG5vLSBwcmVmaXggcmVtb3ZlZCBmcm9tIHRoZSB3YXJu aW5nIG9wdGlvbnMKICMgc2luY2UgZ2NjIHNpbGVudGx5IGFjY2VwdHMgYW55 IC1Xbm8tKiBvcHRpb24gb24gcHVycG9zZQpAQCAtNDg2Miw5ICs0ODkyLDIx IEBACiBmaQogCiBmaQorYWNfZXh0PWMKK2FjX2NwcD0nJENQUCAkQ1BQRkxB R1MnCithY19jb21waWxlPSckQ0MgLWMgJENGTEFHUyAkQ1BQRkxBR1MgY29u ZnRlc3QuJGFjX2V4dCA+JjUnCithY19saW5rPSckQ0MgLW8gY29uZnRlc3Qk YWNfZXhlZXh0ICRDRkxBR1MgJENQUEZMQUdTICRMREZMQUdTIGNvbmZ0ZXN0 LiRhY19leHQgJExJQlMgPiY1JworYWNfY29tcGlsZXJfZ251PSRhY19jdl9j X2NvbXBpbGVyX2dudQogCiAKKwogIyBEaXNhYmxlIGV4Y2VwdGlvbnMgYW5k IFJUVEkgaWYgYnVpbGRpbmcgd2l0aCBnKysKK2FjX2V4dD1jCithY19jcHA9 JyRDUFAgJENQUEZMQUdTJworYWNfY29tcGlsZT0nJENDIC1jICRDRkxBR1Mg JENQUEZMQUdTIGNvbmZ0ZXN0LiRhY19leHQgPiY1JworYWNfbGluaz0nJEND IC1vIGNvbmZ0ZXN0JGFjX2V4ZWV4dCAkQ0ZMQUdTICRDUFBGTEFHUyAkTERG TEFHUyBjb25mdGVzdC4kYWNfZXh0ICRMSUJTID4mNScKK2FjX2NvbXBpbGVy X2dudT0kYWNfY3ZfY19jb21waWxlcl9nbnUKKwogbm9leGNlcHRpb25fZmxh Z3M9CiBzYXZlX0NGTEFHUz0iJENGTEFHUyIKIGZvciByZWFsX29wdGlvbiBp biAtZm5vLWV4Y2VwdGlvbnMgLWZuby1ydHRpOyBkbwpAQCAtNDkwOSwxMCAr NDk1MSwyMiBAQAogZmkKICAgZG9uZQogQ0ZMQUdTPSIkc2F2ZV9DRkxBR1Mi CithY19leHQ9YworYWNfY3BwPSckQ1BQICRDUFBGTEFHUycKK2FjX2NvbXBp bGU9JyRDQyAtYyAkQ0ZMQUdTICRDUFBGTEFHUyBjb25mdGVzdC4kYWNfZXh0 ID4mNScKK2FjX2xpbms9JyRDQyAtbyBjb25mdGVzdCRhY19leGVleHQgJENG TEFHUyAkQ1BQRkxBR1MgJExERkxBR1MgY29uZnRlc3QuJGFjX2V4dCAkTElC UyA+JjUnCithY19jb21waWxlcl9nbnU9JGFjX2N2X2NfY29tcGlsZXJfZ251 CiAKIAorCiAjIE9ubHkgZW5hYmxlIHdpdGggLS1lbmFibGUtd2Vycm9yLWFs d2F5cyB1bnRpbCBleGlzdGluZyB3YXJuaW5ncyBhcmUKICMgY29ycmVjdGVk LgorYWNfZXh0PWMKK2FjX2NwcD0nJENQUCAkQ1BQRkxBR1MnCithY19jb21w aWxlPSckQ0MgLWMgJENGTEFHUyAkQ1BQRkxBR1MgY29uZnRlc3QuJGFjX2V4 dCA+JjUnCithY19saW5rPSckQ0MgLW8gY29uZnRlc3QkYWNfZXhlZXh0ICRD RkxBR1MgJENQUEZMQUdTICRMREZMQUdTIGNvbmZ0ZXN0LiRhY19leHQgJExJ QlMgPiY1JworYWNfY29tcGlsZXJfZ251PSRhY19jdl9jX2NvbXBpbGVyX2du dQorCiBXRVJST1I9CiAjIENoZWNrIHdoZXRoZXIgLS1lbmFibGUtd2Vycm9y LWFsd2F5cyB3YXMgZ2l2ZW4uCiBpZiB0ZXN0ICIke2VuYWJsZV93ZXJyb3Jf YWx3YXlzK3NldH0iID0gc2V0OyB0aGVuIDoKQEAgLTQ5MjUsOCArNDk3OSwx NCBAQAogICBXRVJST1I9IiRXRVJST1Ike1dFUlJPUjorIH0tV2Vycm9yIgog ZmkKIAorYWNfZXh0PWMKK2FjX2NwcD0nJENQUCAkQ1BQRkxBR1MnCithY19j b21waWxlPSckQ0MgLWMgJENGTEFHUyAkQ1BQRkxBR1MgY29uZnRlc3QuJGFj X2V4dCA+JjUnCithY19saW5rPSckQ0MgLW8gY29uZnRlc3QkYWNfZXhlZXh0 ICRDRkxBR1MgJENQUEZMQUdTICRMREZMQUdTIGNvbmZ0ZXN0LiRhY19leHQg JExJQlMgPiY1JworYWNfY29tcGlsZXJfZ251PSRhY19jdl9jX2NvbXBpbGVy X2dudQogCiAKKwogIyBEZXBlbmRlbmN5IGNoZWNraW5nLgogcm0gLXJmIC50 c3QgMj4vZGV2L251bGwKIG1rZGlyIC50c3QgMj4vZGV2L251bGwKQEAgLTY5 NzEsMzEgKzcwMzEsNiBAQAogCiAKIAotICAgICAgICAgIGFtX3NhdmVfQ1BQ RkxBR1M9IiRDUFBGTEFHUyIKLQotICBmb3IgZWxlbWVudCBpbiAkSU5DSUNP TlY7IGRvCi0gICAgaGF2ZWl0PQotICAgIGZvciB4IGluICRDUFBGTEFHUzsg ZG8KLQotICBhY2xfc2F2ZV9wcmVmaXg9IiRwcmVmaXgiCi0gIHByZWZpeD0i JGFjbF9maW5hbF9wcmVmaXgiCi0gIGFjbF9zYXZlX2V4ZWNfcHJlZml4PSIk ZXhlY19wcmVmaXgiCi0gIGV4ZWNfcHJlZml4PSIkYWNsX2ZpbmFsX2V4ZWNf cHJlZml4IgotICBldmFsIHg9XCIkeFwiCi0gIGV4ZWNfcHJlZml4PSIkYWNs X3NhdmVfZXhlY19wcmVmaXgiCi0gIHByZWZpeD0iJGFjbF9zYXZlX3ByZWZp eCIKLQotICAgICAgaWYgdGVzdCAiWCR4IiA9ICJYJGVsZW1lbnQiOyB0aGVu Ci0gICAgICAgIGhhdmVpdD15ZXMKLSAgICAgICAgYnJlYWsKLSAgICAgIGZp Ci0gICAgZG9uZQotICAgIGlmIHRlc3QgLXogIiRoYXZlaXQiOyB0aGVuCi0g ICAgICBDUFBGTEFHUz0iJHtDUFBGTEFHU30ke0NQUEZMQUdTOisgfSRlbGVt ZW50IgotICAgIGZpCi0gIGRvbmUKLQotCiAgIHsgJGFzX2VjaG8gIiRhc19t ZToke2FzX2xpbmVuby0kTElORU5PfTogY2hlY2tpbmcgZm9yIGljb252IiA+ JjUKICRhc19lY2hvX24gImNoZWNraW5nIGZvciBpY29udi4uLiAiID4mNjsg fQogaWYgdGVzdCAiJHthbV9jdl9mdW5jX2ljb252K3NldH0iID0gc2V0OyB0 aGVuIDoKQEAgLTcwMDQsNiArNzAzOSw4IEBACiAKICAgICBhbV9jdl9mdW5j X2ljb252PSJubywgY29uc2lkZXIgaW5zdGFsbGluZyBHTlUgbGliaWNvbnYi CiAgICAgYW1fY3ZfbGliX2ljb252PW5vCisgICAgICAgICAgICAgICAgICAg IGFtX3NhdmVfQ1BQRkxBR1M9IiRDUFBGTEFHUyIKKyAgICBDUFBGTEFHUz0i JENQUEZMQUdTICRJTkNJQ09OViIKICAgICBjYXQgY29uZmRlZnMuaCAtIDw8 X0FDRU9GID5jb25mdGVzdC4kYWNfZXh0CiAvKiBlbmQgY29uZmRlZnMuaC4g ICovCiAjaW5jbHVkZSA8c3RkbGliLmg+CkBAIC03MDIzLDggKzcwNjAsNDkg QEAKIGZpCiBybSAtZiBjb3JlIGNvbmZ0ZXN0LmVyciBjb25mdGVzdC4kYWNf b2JqZXh0IFwKICAgICBjb25mdGVzdCRhY19leGVleHQgY29uZnRlc3QuJGFj X2V4dAorICAgIENQUEZMQUdTPSIkYW1fc2F2ZV9DUFBGTEFHUyIKKworICAg IGlmIHRlc3QgIiRhbV9jdl9mdW5jX2ljb252IiAhPSB5ZXMgJiYgdGVzdCAt ZCAuLi9saWJpY29udjsgdGhlbgorICAgICAgZm9yIF9saWJzIGluIC5saWJz IF9saWJzOyBkbworICAgICAgICBhbV9zYXZlX0NQUEZMQUdTPSIkQ1BQRkxB R1MiCisgICAgICAgIGFtX3NhdmVfTElCUz0iJExJQlMiCisgICAgICAgIENQ UEZMQUdTPSIkQ1BQRkxBR1MgLUkuLi9saWJpY29udi9pbmNsdWRlIgorICAg ICAgICBMSUJTPSIkTElCUyAuLi9saWJpY29udi9saWIvJF9saWJzL2xpYmlj b252LmEiCisgICAgICAgIGNhdCBjb25mZGVmcy5oIC0gPDxfQUNFT0YgPmNv bmZ0ZXN0LiRhY19leHQKKy8qIGVuZCBjb25mZGVmcy5oLiAgKi8KKyNpbmNs dWRlIDxzdGRsaWIuaD4KKyNpbmNsdWRlIDxpY29udi5oPgoraW50CittYWlu ICgpCit7CitpY29udl90IGNkID0gaWNvbnZfb3BlbigiIiwiIik7CisgICAg ICAgICAgIGljb252KGNkLE5VTEwsTlVMTCxOVUxMLE5VTEwpOworICAgICAg ICAgICBpY29udl9jbG9zZShjZCk7CisgIDsKKyAgcmV0dXJuIDA7Cit9Citf QUNFT0YKK2lmIGFjX2ZuX2N4eF90cnlfbGluayAiJExJTkVOTyI7IHRoZW4g OgorICBJTkNJQ09OVj0iLUkuLi9saWJpY29udi9pbmNsdWRlIgorICAgICAg ICAgIExJQklDT05WPScke3RvcF9idWlsZGRpcn0nLy4uL2xpYmljb252L2xp Yi8kX2xpYnMvbGliaWNvbnYuYQorICAgICAgICAgIExUTElCSUNPTlY9JyR7 dG9wX2J1aWxkZGlyfScvLi4vbGliaWNvbnYvbGliL2xpYmljb252LmxhCisg ICAgICAgICAgYW1fY3ZfbGliX2ljb252PXllcworICAgICAgICAgIGFtX2N2 X2Z1bmNfaWNvbnY9eWVzCitmaQorcm0gLWYgY29yZSBjb25mdGVzdC5lcnIg Y29uZnRlc3QuJGFjX29iamV4dCBcCisgICAgY29uZnRlc3QkYWNfZXhlZXh0 IGNvbmZ0ZXN0LiRhY19leHQKKyAgICAgICAgQ1BQRkxBR1M9IiRhbV9zYXZl X0NQUEZMQUdTIgorICAgICAgICBMSUJTPSIkYW1fc2F2ZV9MSUJTIgorICAg ICAgICBpZiB0ZXN0ICIkYW1fY3ZfZnVuY19pY29udiIgPSAieWVzIjsgdGhl bgorICAgICAgICAgIGJyZWFrCisgICAgICAgIGZpCisgICAgICBkb25lCisg ICAgZmkKKwogICAgIGlmIHRlc3QgIiRhbV9jdl9mdW5jX2ljb252IiAhPSB5 ZXM7IHRoZW4KKyAgICAgIGFtX3NhdmVfQ1BQRkxBR1M9IiRDUFBGTEFHUyIK ICAgICAgIGFtX3NhdmVfTElCUz0iJExJQlMiCisgICAgICBDUFBGTEFHUz0i JExJQlMgJElOQ0lDT05WIgogICAgICAgTElCUz0iJExJQlMgJExJQklDT05W IgogICAgICAgY2F0IGNvbmZkZWZzLmggLSA8PF9BQ0VPRiA+Y29uZnRlc3Qu JGFjX2V4dAogLyogZW5kIGNvbmZkZWZzLmguICAqLwpAQCAtNzA0Niw2ICs3 MTI0LDcgQEAKIGZpCiBybSAtZiBjb3JlIGNvbmZ0ZXN0LmVyciBjb25mdGVz dC4kYWNfb2JqZXh0IFwKICAgICBjb25mdGVzdCRhY19leGVleHQgY29uZnRl c3QuJGFjX2V4dAorICAgICAgQ1BQRkxBR1M9IiRhbV9zYXZlX0NQUEZMQUdT IgogICAgICAgTElCUz0iJGFtX3NhdmVfTElCUyIKICAgICBmaQogCkBAIC03 MDU4LDEyICs3MTM3LDM0IEBACiAKICAgZmkKICAgaWYgdGVzdCAiJGFtX2N2 X2xpYl9pY29udiIgPSB5ZXM7IHRoZW4KKworICBmb3IgZWxlbWVudCBpbiAk SU5DSUNPTlY7IGRvCisgICAgaGF2ZWl0PQorICAgIGZvciB4IGluICRDUFBG TEFHUzsgZG8KKworICBhY2xfc2F2ZV9wcmVmaXg9IiRwcmVmaXgiCisgIHBy ZWZpeD0iJGFjbF9maW5hbF9wcmVmaXgiCisgIGFjbF9zYXZlX2V4ZWNfcHJl Zml4PSIkZXhlY19wcmVmaXgiCisgIGV4ZWNfcHJlZml4PSIkYWNsX2ZpbmFs X2V4ZWNfcHJlZml4IgorICBldmFsIHg9XCIkeFwiCisgIGV4ZWNfcHJlZml4 PSIkYWNsX3NhdmVfZXhlY19wcmVmaXgiCisgIHByZWZpeD0iJGFjbF9zYXZl X3ByZWZpeCIKKworICAgICAgaWYgdGVzdCAiWCR4IiA9ICJYJGVsZW1lbnQi OyB0aGVuCisgICAgICAgIGhhdmVpdD15ZXMKKyAgICAgICAgYnJlYWsKKyAg ICAgIGZpCisgICAgZG9uZQorICAgIGlmIHRlc3QgLXogIiRoYXZlaXQiOyB0 aGVuCisgICAgICBDUFBGTEFHUz0iJHtDUFBGTEFHU30ke0NQUEZMQUdTOisg fSRlbGVtZW50IgorICAgIGZpCisgIGRvbmUKKwogICAgIHsgJGFzX2VjaG8g IiRhc19tZToke2FzX2xpbmVuby0kTElORU5PfTogY2hlY2tpbmcgaG93IHRv IGxpbmsgd2l0aCBsaWJpY29udiIgPiY1CiAkYXNfZWNob19uICJjaGVja2lu ZyBob3cgdG8gbGluayB3aXRoIGxpYmljb252Li4uICIgPiY2OyB9CiAgICAg eyAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGluZW5vLSRMSU5FTk99OiByZXN1 bHQ6ICRMSUJJQ09OViIgPiY1CiAkYXNfZWNobyAiJExJQklDT05WIiA+JjY7 IH0KICAgZWxzZQotICAgICAgICAgICAgQ1BQRkxBR1M9IiRhbV9zYXZlX0NQ UEZMQUdTIgogICAgIExJQklDT05WPQogICAgIExUTElCSUNPTlY9CiAgIGZp CkluZGV4OiBnY2MvY29uZmlndXJlLmFjCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIGdjYy9jb25maWd1cmUuYWMJKHJldmlzaW9uIDIyNTIxNSkKKysr IGdjYy9jb25maWd1cmUuYWMJKHdvcmtpbmcgY29weSkKQEAgLTExOTEsNiAr MTE5MSw5IEBACiAKICMgVW50aWwgd2UgaGF2ZSBpbi10cmVlIEdOVSBpY29u djoKIExJQklDT05WX0RFUD0KK2lmIHRlc3QgLWYgIiRMVExJQklDT05WIjsg dGhlbgorICBMSUJJQ09OVl9ERVA9JExUTElCSUNPTlYKK2ZpCiBBQ19TVUJT VChMSUJJQ09OVl9ERVApCiAKIEFNX0xDX01FU1NBR0VTCkluZGV4OiBnY2Mv Y29uZmlndXJlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGdjYy9jb25m aWd1cmUJKHJldmlzaW9uIDIyNTIxNSkKKysrIGdjYy9jb25maWd1cmUJKHdv cmtpbmcgY29weSkKQEAgLTEwNTcxLDMxICsxMDU3MSw2IEBACiAKIAogCi0g ICAgICAgICAgYW1fc2F2ZV9DUFBGTEFHUz0iJENQUEZMQUdTIgotCi0gIGZv ciBlbGVtZW50IGluICRJTkNJQ09OVjsgZG8KLSAgICBoYXZlaXQ9Ci0gICAg Zm9yIHggaW4gJENQUEZMQUdTOyBkbwotCi0gIGFjbF9zYXZlX3ByZWZpeD0i JHByZWZpeCIKLSAgcHJlZml4PSIkYWNsX2ZpbmFsX3ByZWZpeCIKLSAgYWNs X3NhdmVfZXhlY19wcmVmaXg9IiRleGVjX3ByZWZpeCIKLSAgZXhlY19wcmVm aXg9IiRhY2xfZmluYWxfZXhlY19wcmVmaXgiCi0gIGV2YWwgeD1cIiR4XCIK LSAgZXhlY19wcmVmaXg9IiRhY2xfc2F2ZV9leGVjX3ByZWZpeCIKLSAgcHJl Zml4PSIkYWNsX3NhdmVfcHJlZml4IgotCi0gICAgICBpZiB0ZXN0ICJYJHgi ID0gIlgkZWxlbWVudCI7IHRoZW4KLSAgICAgICAgaGF2ZWl0PXllcwotICAg ICAgICBicmVhawotICAgICAgZmkKLSAgICBkb25lCi0gICAgaWYgdGVzdCAt eiAiJGhhdmVpdCI7IHRoZW4KLSAgICAgIENQUEZMQUdTPSIke0NQUEZMQUdT fSR7Q1BQRkxBR1M6KyB9JGVsZW1lbnQiCi0gICAgZmkKLSAgZG9uZQotCi0K ICAgeyAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGluZW5vLSRMSU5FTk99OiBj aGVja2luZyBmb3IgaWNvbnYiID4mNQogJGFzX2VjaG9fbiAiY2hlY2tpbmcg Zm9yIGljb252Li4uICIgPiY2OyB9CiBpZiB0ZXN0ICIke2FtX2N2X2Z1bmNf aWNvbnYrc2V0fSIgPSBzZXQ7IHRoZW4gOgpAQCAtMTA2MDQsNiArMTA1Nzks OCBAQAogCiAgICAgYW1fY3ZfZnVuY19pY29udj0ibm8sIGNvbnNpZGVyIGlu c3RhbGxpbmcgR05VIGxpYmljb252IgogICAgIGFtX2N2X2xpYl9pY29udj1u bworICAgICAgICAgICAgICAgICAgICBhbV9zYXZlX0NQUEZMQUdTPSIkQ1BQ RkxBR1MiCisgICAgQ1BQRkxBR1M9IiRDUFBGTEFHUyAkSU5DSUNPTlYiCiAg ICAgY2F0IGNvbmZkZWZzLmggLSA8PF9BQ0VPRiA+Y29uZnRlc3QuJGFjX2V4 dAogLyogZW5kIGNvbmZkZWZzLmguICAqLwogI2luY2x1ZGUgPHN0ZGxpYi5o PgpAQCAtMTA2MjMsOCArMTA2MDAsNDkgQEAKIGZpCiBybSAtZiBjb3JlIGNv bmZ0ZXN0LmVyciBjb25mdGVzdC4kYWNfb2JqZXh0IFwKICAgICBjb25mdGVz dCRhY19leGVleHQgY29uZnRlc3QuJGFjX2V4dAorICAgIENQUEZMQUdTPSIk YW1fc2F2ZV9DUFBGTEFHUyIKKworICAgIGlmIHRlc3QgIiRhbV9jdl9mdW5j X2ljb252IiAhPSB5ZXMgJiYgdGVzdCAtZCAuLi9saWJpY29udjsgdGhlbgor ICAgICAgZm9yIF9saWJzIGluIC5saWJzIF9saWJzOyBkbworICAgICAgICBh bV9zYXZlX0NQUEZMQUdTPSIkQ1BQRkxBR1MiCisgICAgICAgIGFtX3NhdmVf TElCUz0iJExJQlMiCisgICAgICAgIENQUEZMQUdTPSIkQ1BQRkxBR1MgLUku Li9saWJpY29udi9pbmNsdWRlIgorICAgICAgICBMSUJTPSIkTElCUyAuLi9s aWJpY29udi9saWIvJF9saWJzL2xpYmljb252LmEiCisgICAgICAgIGNhdCBj b25mZGVmcy5oIC0gPDxfQUNFT0YgPmNvbmZ0ZXN0LiRhY19leHQKKy8qIGVu ZCBjb25mZGVmcy5oLiAgKi8KKyNpbmNsdWRlIDxzdGRsaWIuaD4KKyNpbmNs dWRlIDxpY29udi5oPgoraW50CittYWluICgpCit7CitpY29udl90IGNkID0g aWNvbnZfb3BlbigiIiwiIik7CisgICAgICAgICAgIGljb252KGNkLE5VTEws TlVMTCxOVUxMLE5VTEwpOworICAgICAgICAgICBpY29udl9jbG9zZShjZCk7 CisgIDsKKyAgcmV0dXJuIDA7Cit9CitfQUNFT0YKK2lmIGFjX2ZuX2N4eF90 cnlfbGluayAiJExJTkVOTyI7IHRoZW4gOgorICBJTkNJQ09OVj0iLUkuLi9s aWJpY29udi9pbmNsdWRlIgorICAgICAgICAgIExJQklDT05WPScke3RvcF9i dWlsZGRpcn0nLy4uL2xpYmljb252L2xpYi8kX2xpYnMvbGliaWNvbnYuYQor ICAgICAgICAgIExUTElCSUNPTlY9JyR7dG9wX2J1aWxkZGlyfScvLi4vbGli aWNvbnYvbGliL2xpYmljb252LmxhCisgICAgICAgICAgYW1fY3ZfbGliX2lj b252PXllcworICAgICAgICAgIGFtX2N2X2Z1bmNfaWNvbnY9eWVzCitmaQor cm0gLWYgY29yZSBjb25mdGVzdC5lcnIgY29uZnRlc3QuJGFjX29iamV4dCBc CisgICAgY29uZnRlc3QkYWNfZXhlZXh0IGNvbmZ0ZXN0LiRhY19leHQKKyAg ICAgICAgQ1BQRkxBR1M9IiRhbV9zYXZlX0NQUEZMQUdTIgorICAgICAgICBM SUJTPSIkYW1fc2F2ZV9MSUJTIgorICAgICAgICBpZiB0ZXN0ICIkYW1fY3Zf ZnVuY19pY29udiIgPSAieWVzIjsgdGhlbgorICAgICAgICAgIGJyZWFrCisg ICAgICAgIGZpCisgICAgICBkb25lCisgICAgZmkKKwogICAgIGlmIHRlc3Qg IiRhbV9jdl9mdW5jX2ljb252IiAhPSB5ZXM7IHRoZW4KKyAgICAgIGFtX3Nh dmVfQ1BQRkxBR1M9IiRDUFBGTEFHUyIKICAgICAgIGFtX3NhdmVfTElCUz0i JExJQlMiCisgICAgICBDUFBGTEFHUz0iJExJQlMgJElOQ0lDT05WIgogICAg ICAgTElCUz0iJExJQlMgJExJQklDT05WIgogICAgICAgY2F0IGNvbmZkZWZz LmggLSA8PF9BQ0VPRiA+Y29uZnRlc3QuJGFjX2V4dAogLyogZW5kIGNvbmZk ZWZzLmguICAqLwpAQCAtMTA2NDYsNiArMTA2NjQsNyBAQAogZmkKIHJtIC1m IGNvcmUgY29uZnRlc3QuZXJyIGNvbmZ0ZXN0LiRhY19vYmpleHQgXAogICAg IGNvbmZ0ZXN0JGFjX2V4ZWV4dCBjb25mdGVzdC4kYWNfZXh0CisgICAgICBD UFBGTEFHUz0iJGFtX3NhdmVfQ1BQRkxBR1MiCiAgICAgICBMSUJTPSIkYW1f c2F2ZV9MSUJTIgogICAgIGZpCiAKQEAgLTEwNjU4LDEyICsxMDY3NywzNCBA QAogCiAgIGZpCiAgIGlmIHRlc3QgIiRhbV9jdl9saWJfaWNvbnYiID0geWVz OyB0aGVuCisKKyAgZm9yIGVsZW1lbnQgaW4gJElOQ0lDT05WOyBkbworICAg IGhhdmVpdD0KKyAgICBmb3IgeCBpbiAkQ1BQRkxBR1M7IGRvCisKKyAgYWNs X3NhdmVfcHJlZml4PSIkcHJlZml4IgorICBwcmVmaXg9IiRhY2xfZmluYWxf cHJlZml4IgorICBhY2xfc2F2ZV9leGVjX3ByZWZpeD0iJGV4ZWNfcHJlZml4 IgorICBleGVjX3ByZWZpeD0iJGFjbF9maW5hbF9leGVjX3ByZWZpeCIKKyAg ZXZhbCB4PVwiJHhcIgorICBleGVjX3ByZWZpeD0iJGFjbF9zYXZlX2V4ZWNf cHJlZml4IgorICBwcmVmaXg9IiRhY2xfc2F2ZV9wcmVmaXgiCisKKyAgICAg IGlmIHRlc3QgIlgkeCIgPSAiWCRlbGVtZW50IjsgdGhlbgorICAgICAgICBo YXZlaXQ9eWVzCisgICAgICAgIGJyZWFrCisgICAgICBmaQorICAgIGRvbmUK KyAgICBpZiB0ZXN0IC16ICIkaGF2ZWl0IjsgdGhlbgorICAgICAgQ1BQRkxB R1M9IiR7Q1BQRkxBR1N9JHtDUFBGTEFHUzorIH0kZWxlbWVudCIKKyAgICBm aQorICBkb25lCisKICAgICB7ICRhc19lY2hvICIkYXNfbWU6JHthc19saW5l bm8tJExJTkVOT306IGNoZWNraW5nIGhvdyB0byBsaW5rIHdpdGggbGliaWNv bnYiID4mNQogJGFzX2VjaG9fbiAiY2hlY2tpbmcgaG93IHRvIGxpbmsgd2l0 aCBsaWJpY29udi4uLiAiID4mNjsgfQogICAgIHsgJGFzX2VjaG8gIiRhc19t ZToke2FzX2xpbmVuby0kTElORU5PfTogcmVzdWx0OiAkTElCSUNPTlYiID4m NQogJGFzX2VjaG8gIiRMSUJJQ09OViIgPiY2OyB9CiAgIGVsc2UKLSAgICAg ICAgICAgIENQUEZMQUdTPSIkYW1fc2F2ZV9DUFBGTEFHUyIKICAgICBMSUJJ Q09OVj0KICAgICBMVExJQklDT05WPQogICBmaQpAQCAtMTA3MjQsOSArMTA3 NjUsMTMgQEAKIAogIyBVbnRpbCB3ZSBoYXZlIGluLXRyZWUgR05VIGljb252 OgogTElCSUNPTlZfREVQPQoraWYgdGVzdCAtZiAiJExUTElCSUNPTlYiOyB0 aGVuCisgIExJQklDT05WX0RFUD0kTFRMSUJJQ09OVgorZmkKIAogCiAKKwog ICB7ICRhc19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IGNo ZWNraW5nIGZvciBMQ19NRVNTQUdFUyIgPiY1CiAkYXNfZWNob19uICJjaGVj a2luZyBmb3IgTENfTUVTU0FHRVMuLi4gIiA+JjY7IH0KIGlmIHRlc3QgIiR7 YW1fY3ZfdmFsX0xDX01FU1NBR0VTK3NldH0iID0gc2V0OyB0aGVuIDoKQEAg LTE4Mjk4LDcgKzE4MzQzLDcgQEAKICAgbHRfZGx1bmtub3duPTA7IGx0X2Rs bm9fdXNjb3JlPTE7IGx0X2RsbmVlZF91c2NvcmU9MgogICBsdF9zdGF0dXM9 JGx0X2RsdW5rbm93bgogICBjYXQgPiBjb25mdGVzdC4kYWNfZXh0IDw8X0xU X0VPRgotI2xpbmUgMTgzMDEgImNvbmZpZ3VyZSIKKyNsaW5lIDE4MzQyICJj b25maWd1cmUiCiAjaW5jbHVkZSAiY29uZmRlZnMuaCIKIAogI2lmIEhBVkVf RExGQ05fSApAQCAtMTg0MDQsNyArMTg0NDksNyBAQAogICBsdF9kbHVua25v d249MDsgbHRfZGxub191c2NvcmU9MTsgbHRfZGxuZWVkX3VzY29yZT0yCiAg IGx0X3N0YXR1cz0kbHRfZGx1bmtub3duCiAgIGNhdCA+IGNvbmZ0ZXN0LiRh Y19leHQgPDxfTFRfRU9GCi0jbGluZSAxODQwNyAiY29uZmlndXJlIgorI2xp bmUgMTg0NDggImNvbmZpZ3VyZSIKICNpbmNsdWRlICJjb25mZGVmcy5oIgog CiAjaWYgSEFWRV9ETEZDTl9ICg== --=-1Zjwo6yrC/feKTDyVse/--