From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 94809 invoked by alias); 20 Jul 2017 21:22:37 -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 94126 invoked by uid 89); 20 Jul 2017 21:22:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=ham version=3.3.2 spammy=staticlibstdc, staticlibgcc, static-libgcc, static-libstdc X-HELO: mail-oi0-f47.google.com Received: from mail-oi0-f47.google.com (HELO mail-oi0-f47.google.com) (209.85.218.47) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 20 Jul 2017 21:22:33 +0000 Received: by mail-oi0-f47.google.com with SMTP id x187so37418180oig.3 for ; Thu, 20 Jul 2017 14:22:33 -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:in-reply-to:references:from:date :message-id:subject:to:cc; bh=2zxPn2qX391Tmh4KIDpE34iUnr31ZeTSXx9kFtnFASU=; b=LdKeDkgkIEBH0opTsdvPu+2+x8jwwcO5Vxwassy0XVD6BIEYg16C5LGqTQM0dBf35y 3R/ayzm7G3Gf1bMgCIsLcm0JvQfZU4GgoLS2cZ/0/wnlPy7Jak6N39ALz32NPPsHT5Yb s3jueyjmBknzyDHwBdKnG652ZCMFv1JNn82WZ6aUcygHlbs6XsBhdnweBh/bjAyfKNO6 eZ+TCKuMAFB+vl0Iy0jSOyJ+2bIwpDDvVv9871GEeDVKEPIRWothpq6x267RnNsN/sNy zEbEatOt6NILMEyQzPGqZI1gINQRZAIRfcRp120z0jE3ykhyO6TKLQm+AQ5ljBStEhHB KawQ== X-Gm-Message-State: AIVw11111FagG7R6NtgmDNN6QB19B+5YE+BRgLs2hILkpYnNB0gxw7po 3YuyRxuunom8rbqnbmk67+eCYRGxqQ== X-Received: by 10.202.179.196 with SMTP id c187mr487721oif.5.1500585751938; Thu, 20 Jul 2017 14:22:31 -0700 (PDT) MIME-Version: 1.0 Received: by 10.74.140.71 with HTTP; Thu, 20 Jul 2017 14:22:31 -0700 (PDT) In-Reply-To: <20170719051152.GM14520@bubble.grove.modra.org> References: <20170622152859.GG8406@bubble.grove.modra.org> <20170717123325.GG14520@bubble.grove.modra.org> <20170718040219.GH14520@bubble.grove.modra.org> <20170718140953.GL14520@bubble.grove.modra.org> <20170719051152.GM14520@bubble.grove.modra.org> From: "H.J. Lu" Date: Thu, 20 Jul 2017 21:22:00 -0000 Message-ID: Subject: Re: [PATCH] Fix pr80044, -static and -pie insanity, and pr81170 To: Alan Modra Cc: Joseph Myers , GCC Patches Content-Type: multipart/mixed; boundary="001a113cd182b34f530554c658ae" X-IsSubscribed: yes X-SW-Source: 2017-07/txt/msg01266.txt.bz2 --001a113cd182b34f530554c658ae Content-Type: text/plain; charset="UTF-8" Content-length: 2124 On Tue, Jul 18, 2017 at 10:11 PM, Alan Modra wrote: > On Tue, Jul 18, 2017 at 07:49:48AM -0700, H.J. Lu wrote: >> The difference is with --enable-default-pie, the gcc driver doesn't pass >> both -pie and -static ld when "-static -pie" is used. Does your change >> pass both -pie and -static ld when "-static -pie" is used? > > Again, as I said in the original post: "In both cases you now will > have -static completely overriding -pie". > > That means "gcc -pie -static" and "gcc -static -pie" just pass > "-static" to ld, and select the appropriate startup files for a static > executable, when configured with --disable-default-pie. Which is what > happens currently for --enable-default-pie. > > None of this is rocket science. I know what I'm doing where the > linker and startup files are concerned, and I'm comfortable with the > gcc specs language. The patch is simple! It should be easy to > review, except for trying to understand the "-" lines. Yet it has sat > unreviewed for nearly four weeks. And it fixes a powerpc > --enable-default-pie bootstrap failure (pr81295). > > Joseph, would you please take a look? > https://gcc.gnu.org/ml/gcc-patches/2017-06/msg01678.html > > I know there is more to do in this area, for example, it seems to me > that the HAVE_LD_PIE definition of GNU_USER_TARGET_STARTFILE_SPEC is > good for !HAVE_LD_PIE, and similarly for GNU_USE_TARGET_ENDFILE_SPEC. > And yes, I propagated that duplication into rs6000/sysv4.h, which > needs some serious tidying. rs6000/sysv4.h linux support ought to be > using the gnu-user.h defines rather than copying them, something I've > told Segher I'll look at after this patch goes in. > Before your patch, I can creating static PIE when GCC is configured with --disable-default-pie. After your change, both --enable-default-pie and --disable-default-pie prevent creating static PIE. I opened a bug report for -static-pie: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81498 This patch, which should be applied on top of your patch, adds support for -static-pie. Can we merge 2 patches into 1? Thanks. -- H.J. --001a113cd182b34f530554c658ae Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Add-static-pie-to-GCC-driver-for-static-PIE.patch" Content-Disposition: attachment; filename="0001-Add-static-pie-to-GCC-driver-for-static-PIE.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_j5cxy6l40 Content-length: 10814 RnJvbSBiNjVlNjQ3N2E4YzQxYzdjOGI0NjAyYzIyZTkyYjdiOGIxMDk2MGFi IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiAiSC5KLiBMdSIgPGhq bC50b29sc0BnbWFpbC5jb20+CkRhdGU6IFRodSwgMjAgSnVsIDIwMTcgMTQ6 MDg6MTggLTA3MDAKU3ViamVjdDogW1BBVENIXSBBZGQgLXN0YXRpYy1waWUg dG8gR0NDIGRyaXZlciBmb3Igc3RhdGljIFBJRQoKQSBzdGF0aWMgcG9zaXRp b24gaW5kZXBlbmRlbnQgZXhlY3V0YWJsZSBpcyBzaW1pbGFyIHRvIHN0YXRp YyBleGVjdXRhYmxlLApidXQgY2FuIGJlIGxvYWRlZCBhdCBhbnkgYWRkcmVz cyB3aXRob3V0IGEgZHluYW1pYyBsaW5rZXIuICBBbGwgbGlua2VyCmlucHV0 IGZpbGVzIG11c3QgYmUgY29tcGlsZWQgd2l0aCAtZnBpZSBvciAtZlBJRSBh bmQgbGlua2VyIG11c3Qgc3VwcG9ydAotLW5vLWR5bmFtaWMtbGlua2VyIHRv IGF2b2lkIGxpbmtpbmcgd2l0aCBkeW5hbWljIGxpbmtlci4gICIteiB0ZXh0 IiBpcwphbHNvIHBhc3NlZCB0byBsaW5rZXIgdG8gcHJldmVudCBkeW5hbWlj IHJlbG9jYXRpb25zIGluIHJlYWRvbmx5IHNlZ21lbnRzLgoKCVBSIGRyaXZl ci84MTQ5OAoJKiBjb21tb24ub3B0ICgtc3RhdGljLXBpZSk6IE5ldyBhbGlh cy4KCShzaGFyZWQpOiBOZWdhdGUgc3RhdGljLXBpZS4KCShzdGF0aWMtcGll KTogTmV3IG9wdGlvbi4KCSogY29uZmlnL2dudS11c2VyLmggKEdOVV9VU0VS X1RBUkdFVF9TVEFSVEZJTEVfU1BFQyk6IEFkZAoJLXN0YXRpYy1waWUgc3Vw cG9ydC4KCShHTlVfVVNFUl9UQVJHRVRfRU5ERklMRV9TUEVDKTogTGlrZXdp c2UuCgkoTElOS19HQ0NfQ19TRVFVRU5DRV9TUEVDKTogTGlrZXdpc2UuCgkq IGNvbmZpZy9pMzg2L2dudS11c2VyLmggKEdOVV9VU0VSX1RBUkdFVF9MSU5L X1NQRUMpOiBMaWtld2lzZS4KCSogY29uZmlnL2kzODYvZ251LXVzZXI2NC5o IChHTlVfVVNFUl9UQVJHRVRfTElOS19TUEVDKTogTGlrZXdpc2UuCgkqIGdj Yy5jIChpbml0X2djY19zcGVjcyk6IExpa2V3aXNlLgoJKiBkb2MvaW52b2tl LnRleGk6IERvY3VtZW50IC1zdGF0aWMtcGllLgotLS0KIGdjYy9jb21tb24u b3B0ICAgICAgICAgICAgICAgfCAgOSArKysrKysrKy0KIGdjYy9jb25maWcv Z251LXVzZXIuaCAgICAgICAgfCAxMyArKysrKysrLS0tLS0tCiBnY2MvY29u ZmlnL2kzODYvZ251LXVzZXIuaCAgIHwgIDcgKysrKy0tLQogZ2NjL2NvbmZp Zy9pMzg2L2dudS11c2VyNjQuaCB8IDExICsrKysrKy0tLS0tCiBnY2MvZG9j L2ludm9rZS50ZXhpICAgICAgICAgIHwgIDkgKysrKysrKystCiBnY2MvZ2Nj LmMgICAgICAgICAgICAgICAgICAgIHwgIDYgKysrLS0tCiA2IGZpbGVzIGNo YW5nZWQsIDM2IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2djYy9jb21tb24ub3B0IGIvZ2NjL2NvbW1vbi5vcHQKaW5k ZXggZTgxMTY1YzQ4OGIuLjRhZGE4NWE2NWEwIDEwMDY0NAotLS0gYS9nY2Mv Y29tbW9uLm9wdAorKysgYi9nY2MvY29tbW9uLm9wdApAQCAtMzQ2LDYgKzM0 Niw5IEBAIENvbW1vbiBBbGlhcyhwZWRhbnRpYy1lcnJvcnMpCiAtcGllCiBE cml2ZXIgQWxpYXMocGllKQogCistc3RhdGljLXBpZQorRHJpdmVyIEFsaWFz KHN0YXRpYy1waWUpCisKIC1waXBlCiBEcml2ZXIgQWxpYXMocGlwZSkKIApA QCAtMzA1MCw3ICszMDUzLDcgQEAgeAogRHJpdmVyIEpvaW5lZCBTZXBhcmF0 ZQogCiBzaGFyZWQKLURyaXZlciBSZWplY3ROZWdhdGl2ZSBOZWdhdGl2ZShw aWUpCitEcml2ZXIgUmVqZWN0TmVnYXRpdmUgTmVnYXRpdmUoc3RhdGljLXBp ZSkKIENyZWF0ZSBhIHNoYXJlZCBsaWJyYXJ5LgogCiBzaGFyZWQtbGliZ2Nj CkBAIC0zMTAyLDYgKzMxMDUsMTAgQEAgcGllCiBEcml2ZXIgUmVqZWN0TmVn YXRpdmUgTmVnYXRpdmUobm8tcGllKQogQ3JlYXRlIGEgcG9zaXRpb24gaW5k ZXBlbmRlbnQgZXhlY3V0YWJsZS4KIAorc3RhdGljLXBpZQorRHJpdmVyIFJl amVjdE5lZ2F0aXZlIE5lZ2F0aXZlKHBpZSkKK0NyZWF0ZSBhIHN0YXRpYyBw b3NpdGlvbiBpbmRlcGVuZGVudCBleGVjdXRhYmxlLgorCiB6CiBEcml2ZXIg Sm9pbmVkIFNlcGFyYXRlCiAKZGlmZiAtLWdpdCBhL2djYy9jb25maWcvZ251 LXVzZXIuaCBiL2djYy9jb25maWcvZ251LXVzZXIuaAppbmRleCBkZTYwNWIw YzQ2Ni4uZjBjYmRlMzM0M2MgMTAwNjQ0Ci0tLSBhL2djYy9jb25maWcvZ251 LXVzZXIuaAorKysgYi9nY2MvY29uZmlnL2dudS11c2VyLmgKQEAgLTUzLDEx ICs1MywxMSBAQCBzZWUgdGhlIGZpbGVzIENPUFlJTkczIGFuZCBDT1BZSU5H LlJVTlRJTUUgcmVzcGVjdGl2ZWx5LiAgSWYgbm90LCBzZWUKICAgIiV7c2hh cmVkOjsgXAogICAgICBwZ3xwfHByb2ZpbGU6Z2NydDEubyVzOyBcCiAgICAg IHN0YXRpYzpjcnQxLm8lczsgXAotICAgICAiIFBJRV9TUEVDICI6U2NydDEu byVzOyBcCisgICAgIHN0YXRpYy1waWV8IiBQSUVfU1BFQyAiOlNjcnQxLm8l czsgXAogICAgICA6Y3J0MS5vJXN9IFwKICAgIGNydGkubyVzIFwKICAgICV7 c3RhdGljOmNydGJlZ2luVC5vJXM7IFwKLSAgICAgc2hhcmVkfCIgUElFX1NQ RUMgIjpjcnRiZWdpblMubyVzOyBcCisgICAgIHNoYXJlZHxzdGF0aWMtcGll fCIgUElFX1NQRUMgIjpjcnRiZWdpblMubyVzOyBcCiAgICAgIDpjcnRiZWdp bi5vJXN9IFwKICAgICV7ZnZ0YWJsZS12ZXJpZnk9bm9uZTolczsgXAogICAg ICBmdnRhYmxlLXZlcmlmeT1wcmVpbml0OnZ0dl9zdGFydF9wcmVpbml0Lm8l czsgXApAQCAtNzAsNyArNzAsNyBAQCBzZWUgdGhlIGZpbGVzIENPUFlJTkcz IGFuZCBDT1BZSU5HLlJVTlRJTUUgcmVzcGVjdGl2ZWx5LiAgSWYgbm90LCBz ZWUKICAgICAgOmNydDEubyVzfSBcCiAgICBjcnRpLm8lcyBcCiAgICAle3N0 YXRpYzpjcnRiZWdpblQubyVzOyBcCi0gICAgIHNoYXJlZHxwaWU6Y3J0YmVn aW5TLm8lczsgXAorICAgICBzaGFyZWR8cGllfHN0YXRpYy1waWU6Y3J0YmVn aW5TLm8lczsgXAogICAgICA6Y3J0YmVnaW4ubyVzfSBcCiAgICAle2Z2dGFi bGUtdmVyaWZ5PW5vbmU6JXM7IFwKICAgICAgZnZ0YWJsZS12ZXJpZnk9cHJl aW5pdDp2dHZfc3RhcnRfcHJlaW5pdC5vJXM7IFwKQEAgLTkyLDcgKzkyLDcg QEAgc2VlIHRoZSBmaWxlcyBDT1BZSU5HMyBhbmQgQ09QWUlORy5SVU5USU1F IHJlc3BlY3RpdmVseS4gIElmIG5vdCwgc2VlCiAgICAgIGZ2dGFibGUtdmVy aWZ5PXByZWluaXQ6dnR2X2VuZF9wcmVpbml0Lm8lczsgXAogICAgICBmdnRh YmxlLXZlcmlmeT1zdGQ6dnR2X2VuZC5vJXN9IFwKICAgICV7c3RhdGljOmNy dGVuZC5vJXM7IFwKLSAgICAgc2hhcmVkfCIgUElFX1NQRUMgIjpjcnRlbmRT Lm8lczsgXAorICAgICBzaGFyZWR8c3RhdGljLXBpZXwiIFBJRV9TUEVDICI6 Y3J0ZW5kUy5vJXM7IFwKICAgICAgOmNydGVuZC5vJXN9IFwKICAgIGNydG4u byVzIFwKICAgICIgQ1JUT0ZGTE9BREVORApAQCAtMTAyLDcgKzEwMiw3IEBA IHNlZSB0aGUgZmlsZXMgQ09QWUlORzMgYW5kIENPUFlJTkcuUlVOVElNRSBy ZXNwZWN0aXZlbHkuICBJZiBub3QsIHNlZQogICAgICBmdnRhYmxlLXZlcmlm eT1wcmVpbml0OnZ0dl9lbmRfcHJlaW5pdC5vJXM7IFwKICAgICAgZnZ0YWJs ZS12ZXJpZnk9c3RkOnZ0dl9lbmQubyVzfSBcCiAgICAle3N0YXRpYzpjcnRl bmQubyVzOyBcCi0gICAgIHNoYXJlZHxwaWU6Y3J0ZW5kUy5vJXM7IFwKKyAg ICAgc2hhcmVkfHBpZXxzdGF0aWMtcGllOmNydGVuZFMubyVzOyBcCiAgICAg IDpjcnRlbmQubyVzfSBcCiAgICBjcnRuLm8lcyBcCiAgICAiIENSVE9GRkxP QURFTkQKQEAgLTEzNyw3ICsxMzcsOCBAQCBzZWUgdGhlIGZpbGVzIENPUFlJ TkczIGFuZCBDT1BZSU5HLlJVTlRJTUUgcmVzcGVjdGl2ZWx5LiAgSWYgbm90 LCBzZWUKIAogI3VuZGVmIExJTktfR0NDX0NfU0VRVUVOQ0VfU1BFQwogI2Rl ZmluZSBMSU5LX0dDQ19DX1NFUVVFTkNFX1NQRUMgXAotICAiJXtzdGF0aWM6 LS1zdGFydC1ncm91cH0gJUcgJUwgJXtzdGF0aWM6LS1lbmQtZ3JvdXB9JXsh c3RhdGljOiVHfSIKKyAgIiV7c3RhdGljfHN0YXRpYy1waWU6LS1zdGFydC1n cm91cH0gJUcgJUwgXAorICAgJXtzdGF0aWN8c3RhdGljLXBpZTotLWVuZC1n cm91cH0leyFzdGF0aWM6JXshc3RhdGljLXBpZTolR319IgogCiAvKiBVc2Ug LS1hcy1uZWVkZWQgLWxnY2NfcyBmb3IgZWggc3VwcG9ydC4gICovCiAjaWZk ZWYgSEFWRV9MRF9BU19ORUVERUQKZGlmZiAtLWdpdCBhL2djYy9jb25maWcv aTM4Ni9nbnUtdXNlci5oIGIvZ2NjL2NvbmZpZy9pMzg2L2dudS11c2VyLmgK aW5kZXggYTRjODhmMWE4NDguLjg5ODNkYzllY2Q3IDEwMDY0NAotLS0gYS9n Y2MvY29uZmlnL2kzODYvZ251LXVzZXIuaAorKysgYi9nY2MvY29uZmlnL2kz ODYvZ251LXVzZXIuaApAQCAtNzcsOSArNzcsMTAgQEAgYWxvbmcgd2l0aCBH Q0M7IHNlZSB0aGUgZmlsZSBDT1BZSU5HMy4gIElmIG5vdCBzZWUKICNkZWZp bmUgR05VX1VTRVJfVEFSR0VUX0xJTktfU1BFQyAiLW0gJShsaW5rX2VtdWxh dGlvbikgJXtzaGFyZWQ6LXNoYXJlZH0gXAogICAleyFzaGFyZWQ6IFwKICAg ICAleyFzdGF0aWM6IFwKLSAgICAgICV7cmR5bmFtaWM6LWV4cG9ydC1keW5h bWljfSBcCi0gICAgICAtZHluYW1pYy1saW5rZXIgJShkeW5hbWljX2xpbmtl cil9IFwKLSAgICAgICV7c3RhdGljOi1zdGF0aWN9fSIKKyAgICAgICV7IXN0 YXRpYy1waWU6IFwKKwkle3JkeW5hbWljOi1leHBvcnQtZHluYW1pY30gXAor CS1keW5hbWljLWxpbmtlciAlKGR5bmFtaWNfbGlua2VyKX19IFwKKyAgICAg ICV7c3RhdGljOi1zdGF0aWN9ICV7c3RhdGljLXBpZTotc3RhdGljIC1waWUg LS1uby1keW5hbWljLWxpbmtlciAteiB0ZXh0fX0iCiAKICN1bmRlZglMSU5L X1NQRUMKICNkZWZpbmUgTElOS19TUEVDIEdOVV9VU0VSX1RBUkdFVF9MSU5L X1NQRUMKZGlmZiAtLWdpdCBhL2djYy9jb25maWcvaTM4Ni9nbnUtdXNlcjY0 LmggYi9nY2MvY29uZmlnL2kzODYvZ251LXVzZXI2NC5oCmluZGV4IDM5ZjVl ZjZhNjhiLi42ZmM5ZWFlNmY2YiAxMDA2NDQKLS0tIGEvZ2NjL2NvbmZpZy9p Mzg2L2dudS11c2VyNjQuaAorKysgYi9nY2MvY29uZmlnL2kzODYvZ251LXVz ZXI2NC5oCkBAIC01OSwxMSArNTksMTIgQEAgc2VlIHRoZSBmaWxlcyBDT1BZ SU5HMyBhbmQgQ09QWUlORy5SVU5USU1FIHJlc3BlY3RpdmVseS4gIElmIG5v dCwgc2VlCiAgICV7c2hhcmVkOi1zaGFyZWR9IFwKICAgJXshc2hhcmVkOiBc CiAgICAgJXshc3RhdGljOiBcCi0gICAgICAle3JkeW5hbWljOi1leHBvcnQt ZHluYW1pY30gXAotICAgICAgJXsiIFNQRUNfMzIgIjotZHluYW1pYy1saW5r ZXIgIiBHTlVfVVNFUl9EWU5BTUlDX0xJTktFUjMyICJ9IFwKLSAgICAgICV7 IiBTUEVDXzY0ICI6LWR5bmFtaWMtbGlua2VyICIgR05VX1VTRVJfRFlOQU1J Q19MSU5LRVI2NCAifSBcCi0gICAgICAleyIgU1BFQ19YMzIgIjotZHluYW1p Yy1saW5rZXIgIiBHTlVfVVNFUl9EWU5BTUlDX0xJTktFUlgzMiAifX0gXAot ICAgICV7c3RhdGljOi1zdGF0aWN9fSIKKyAgICAgICV7IXN0YXRpYy1zdGF0 aWM6IFwKKwkle3JkeW5hbWljOi1leHBvcnQtZHluYW1pY30gXAorCSV7IiBT UEVDXzMyICI6LWR5bmFtaWMtbGlua2VyICIgR05VX1VTRVJfRFlOQU1JQ19M SU5LRVIzMiAifSBcCisJJXsiIFNQRUNfNjQgIjotZHluYW1pYy1saW5rZXIg IiBHTlVfVVNFUl9EWU5BTUlDX0xJTktFUjY0ICJ9IFwKKwkleyIgU1BFQ19Y MzIgIjotZHluYW1pYy1saW5rZXIgIiBHTlVfVVNFUl9EWU5BTUlDX0xJTktF UlgzMiAifX19IFwKKyAgICAle3N0YXRpYzotc3RhdGljfSAle3N0YXRpYy1w aWU6LXN0YXRpYyAtcGllIC0tbm8tZHluYW1pYy1saW5rZXIgLXogdGV4dH19 IgogCiAjdW5kZWYJTElOS19TUEVDCiAjZGVmaW5lIExJTktfU1BFQyBHTlVf VVNFUl9UQVJHRVRfTElOS19TUEVDCmRpZmYgLS1naXQgYS9nY2MvZG9jL2lu dm9rZS50ZXhpIGIvZ2NjL2RvYy9pbnZva2UudGV4aQppbmRleCBkZmRlNDAz Y2JmMi4uMDI3ZDlhOTdkNmIgMTAwNjQ0Ci0tLSBhL2djYy9kb2MvaW52b2tl LnRleGkKKysrIGIvZ2NjL2RvYy9pbnZva2UudGV4aQpAQCAtNDk2LDcgKzQ5 Niw3IEBAIE9iamVjdGl2ZS1DIGFuZCBPYmplY3RpdmUtQysrIERpYWxlY3Rz fS4KIEB4cmVme0xpbmsgT3B0aW9ucywsT3B0aW9ucyBmb3IgTGlua2luZ30u CiBAZ2Njb3B0bGlzdHtAdmFye29iamVjdC1maWxlLW5hbWV9ICAtZnVzZS1s ZD1AdmFye2xpbmtlcn0gIC1sQHZhcntsaWJyYXJ5fSBAZ29sCiAtbm9zdGFy dGZpbGVzICAtbm9kZWZhdWx0bGlicyAgLW5vc3RkbGliICAtcGllICAtcHRo cmVhZCAgLXJkeW5hbWljIEBnb2wKLS1zICAtc3RhdGljICAtc3RhdGljLWxp YmdjYyAgLXN0YXRpYy1saWJzdGRjKysgQGdvbAorLXMgIC1zdGF0aWMgLXN0 YXRpYy1waWUgLXN0YXRpYy1saWJnY2MgIC1zdGF0aWMtbGlic3RkYysrIEBn b2wKIC1zdGF0aWMtbGliYXNhbiAgLXN0YXRpYy1saWJ0c2FuICAtc3RhdGlj LWxpYmxzYW4gIC1zdGF0aWMtbGlidWJzYW4gQGdvbAogLXN0YXRpYy1saWJt cHggIC1zdGF0aWMtbGlibXB4d3JhcHBlcnMgQGdvbAogLXNoYXJlZCAgLXNo YXJlZC1saWJnY2MgIC1zeW1ib2xpYyBAZ29sCkBAIC0xMTc0Niw2ICsxMTc0 NiwxMyBAQCBvciBtb2RlbCBzdWJvcHRpb25zKSB3aGVuIHlvdSBzcGVjaWZ5 IHRoaXMgbGlua2VyIG9wdGlvbi4KIEBvcGluZGV4IG5vLXBpZQogRG9uJ3Qg cHJvZHVjZSBhIHBvc2l0aW9uIGluZGVwZW5kZW50IGV4ZWN1dGFibGUuCiAK K0BpdGVtIC1zdGF0aWMtcGllCitAb3BpbmRleCBzdGF0aWMtcGllCitQcm9k dWNlIGEgc3RhdGljIHBvc2l0aW9uIGluZGVwZW5kZW50IGV4ZWN1dGFibGUg b24gdGFyZ2V0cyB0aGF0IHN1cHBvcnQKK2l0LiAgRm9yIHByZWRpY3RhYmxl IHJlc3VsdHMsIHlvdSBtdXN0IGFsc28gc3BlY2lmeSB0aGUgc2FtZSBzZXQg b2YKK29wdGlvbnMgdXNlZCBmb3IgY29tcGlsYXRpb24gKEBvcHRpb257LWZw aWV9LCBAb3B0aW9uey1mUElFfSwKK29yIG1vZGVsIHN1Ym9wdGlvbnMpIHdo ZW4geW91IHNwZWNpZnkgdGhpcyBsaW5rZXIgb3B0aW9uLgorCiBAaXRlbSAt cHRocmVhZAogQG9waW5kZXggcHRocmVhZAogTGluayB3aXRoIHRoZSBQT1NJ WCB0aHJlYWRzIGxpYnJhcnkuICBUaGlzIG9wdGlvbiBpcyBzdXBwb3J0ZWQg b24gCmRpZmYgLS1naXQgYS9nY2MvZ2NjLmMgYi9nY2MvZ2NjLmMKaW5kZXgg ODBhOGI4YjJiZWUuLmZmZDZlNDIxMTRlIDEwMDY0NAotLS0gYS9nY2MvZ2Nj LmMKKysrIGIvZ2NjL2djYy5jCkBAIC0xNjY4LDggKzE2NjgsOCBAQCBpbml0 X2djY19zcGVjcyAoc3RydWN0IG9ic3RhY2sgKm9ic3RhY2ssIGNvbnN0IGNo YXIgKnNoYXJlZF9uYW1lLAogewogICBjaGFyICpidWY7CiAKLSAgYnVmID0g Y29uY2F0ICgiJXtzdGF0aWN8c3RhdGljLWxpYmdjYzoiLCBzdGF0aWNfbmFt ZSwgIiAiLCBlaF9uYW1lLCAifSIKLQkJIiV7IXN0YXRpYzoleyFzdGF0aWMt bGliZ2NjOiIKKyAgYnVmID0gY29uY2F0ICgiJXtzdGF0aWN8c3RhdGljLWxp YmdjY3xzdGF0aWMtcGllOiIsIHN0YXRpY19uYW1lLCAiICIsIGVoX25hbWUs ICJ9IgorCQkiJXshc3RhdGljOiV7IXN0YXRpYy1saWJnY2M6JXshc3RhdGlj LXBpZToiCiAjaWYgVVNFX0xEX0FTX05FRURFRAogCQkiJXshc2hhcmVkLWxp YmdjYzoiLAogCQlzdGF0aWNfbmFtZSwgIiAiIExEX0FTX05FRURFRF9PUFRJ T04gIiAiLApAQCAtMTY3Nyw3ICsxNjc3LDcgQEAgaW5pdF9nY2Nfc3BlY3Mg KHN0cnVjdCBvYnN0YWNrICpvYnN0YWNrLCBjb25zdCBjaGFyICpzaGFyZWRf bmFtZSwKIAkJIn0iCiAJCSIle3NoYXJlZC1saWJnY2M6IiwKIAkJc2hhcmVk X25hbWUsICIleyFzaGFyZWQ6ICIsIHN0YXRpY19uYW1lLCAifSIKLQkJIn0i CisJCSJ9IiAifSIKICNlbHNlCiAJCSIleyFzaGFyZWQ6IgogCQkiJXshc2hh cmVkLWxpYmdjYzoiLCBzdGF0aWNfbmFtZSwgIiAiLCBlaF9uYW1lLCAifSIK LS0gCjIuMTMuMwoK --001a113cd182b34f530554c658ae--