From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 64DAF3858D38 for ; Thu, 25 Apr 2024 17:59:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 64DAF3858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 64DAF3858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714067955; cv=none; b=UIlcQLljzttHTovQkc3suxn8h0H/51/c8+Lz2KdkFf4V5TCEpe5c054rXODw7bZGnp0vBAb18jVqPfHaQIvc/6Cl74mWUSe8BjUhr2UeU5kYWuS3yn9ifh94oxySFI63tWi6a7J8HHd2m9YCZ2kMGPU5uzNkKB/tueut4UX8Rpw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714067955; c=relaxed/simple; bh=spttzBs5QsqeUTQmZ2KtFEXS1MM0ilh9roY8C3fmHXM=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=cQc9jYUqE8bmzSbRabG8JJMnWvJV3+eAYU+nNGPArTG4BlLpTVM5Ny5OCPZwudsYJCQ3TEfA8H2C5IiCw7VbrS9zNjbfl3hnSCEP/Wk+hB5AKvRPhKbUzNfZ6MCkK7KCJpHo4ugQDiiUcCtMPrWlZ6qGe7y0k3XddkRCVRiNsBc= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714067953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=spttzBs5QsqeUTQmZ2KtFEXS1MM0ilh9roY8C3fmHXM=; b=UKQItAoriwnxGAHmZIvzf4P/AtqglGdI/oPmQ7POB5tPq+JtzRi/ck6fhtgJkYUpfplQjq IiPRNdpIegxOmww66IPt4lctPa7Si6H17mowWBgDaKdRIkrtmRetanmbKz+JxeU+TBSYLW L/JOhVHyAtuZMo7+L3zj5OlIOJTEbk8= Received: from mail-yw1-f197.google.com (mail-yw1-f197.google.com [209.85.128.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-678-2I75v2bwMVS0eaH0cu0_6w-1; Thu, 25 Apr 2024 13:59:10 -0400 X-MC-Unique: 2I75v2bwMVS0eaH0cu0_6w-1 Received: by mail-yw1-f197.google.com with SMTP id 00721157ae682-61ab00d8a2eso21341247b3.3 for ; Thu, 25 Apr 2024 10:59:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714067949; x=1714672749; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=spttzBs5QsqeUTQmZ2KtFEXS1MM0ilh9roY8C3fmHXM=; b=Byy6yBz5jdUqM6oovNrC613v+ps3uv96EHzbWSqNI06EgOWA3GS1WCtqzZX8qytOJa y83XwYBaqWv2wztdYK3RcAEb2jq+0BrnyrMONCiLUQrH7VcMkch0sYBsVCem8In8Oeh4 V8MVW3sWbWgUX4W8BNyzeks4o7SzD4SuhMD/SCL0Y0qIvaCmVTkmFBxEB1w2gNA3XVtN uMPkffqsFi+5YRsqPlSAoGJMiHx/wGa+J5HR4Nz7NgyfOkhDmsKepYYqYzCdbIa1OUen k0y8BC8uMuh7AFsynaVMqK6QKO93KgeHq59ieqrha0jHsMkbwtSS3Br6WHuqVL+YfT9q hBEg== X-Forwarded-Encrypted: i=1; AJvYcCWo2T+iO6IGQtEmBvmkc43Tr/iH7agkuvx+Semw0oL+mIZjtdKaL/RK1p5oC0ud0PsTIPy1F8IfmUhHNt58QhIsNzV6IGBs7w== X-Gm-Message-State: AOJu0Yw56GYmGoP2QQP8BZvBd68Ps8M0DZO91KmBRSaW7xQUb/MCiuMn S/UN8DMU3Z+C/p3eIg5fKhdWhtfzbP1oT6fNxC+93mIYKQidkA175D99pIf5a/3N2xT+ZaooSNB RT7xVzMDA5FhN+ALPClCTWzOIqrIUU2S3kqbh8Vgl8XLGESWIlBaT3nHJF47X65QKSi0ikfRuXj Mc3f29SD7THatY2k0XY9uRDk4/wC+YqqMcQ65ZSQ== X-Received: by 2002:a25:2701:0:b0:de5:4bb7:b237 with SMTP id n1-20020a252701000000b00de54bb7b237mr332940ybn.39.1714067949564; Thu, 25 Apr 2024 10:59:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFcd/pK9HzI6TdJKcK2sJ2SMJbB+YKoIgtWffRKcqclnT3DlgMn8qOHVtG7+FEV4gh7sc/kpTRrpA8V2jeYFdA= X-Received: by 2002:a25:2701:0:b0:de5:4bb7:b237 with SMTP id n1-20020a252701000000b00de54bb7b237mr332927ybn.39.1714067949301; Thu, 25 Apr 2024 10:59:09 -0700 (PDT) MIME-Version: 1.0 References: <20240418195107.1281808-1-jwakely@redhat.com> <20240418195107.1281808-3-jwakely@redhat.com> In-Reply-To: From: Jonathan Wakely Date: Thu, 25 Apr 2024 18:58:53 +0100 Message-ID: Subject: [gcc-13 PATCH 2/2 v3] libstdc++: Add libstdc++_libbacktrace.a to libstdc++exp To: "libstdc++" , gcc Patches X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="0000000000003d63230616ef8baa" X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --0000000000003d63230616ef8baa Content-Type: text/plain; charset="UTF-8" On Thu, 18 Apr 2024 at 21:34, Jonathan Wakely wrote: > > On Thu, 18 Apr 2024 at 20:51, Jonathan Wakely wrote: > > > > This completes the fixes to put all experimental symbols into > > libstdc++exp.a. > > > > On trunk the libstdc++_libbacktrace.a was removed completely and its > > contents aded to libstdc++exp.a instead. We don't want to do that on the > > gcc-13 branch because it will break makefiles using it. We can add the > > contents to libstdc++exp.a and then install a symlink so that > > -lstdc++_libbacktrace still works, but links to libstdc++exp.a instead. > > It looks like simply duplicating all the libstdc___libbacktrace_FOO > variables in libbacktrace/Makefile.am does work (see attached patch), > so that we get an installed libstdc++_libbacktrace.a and a > not-installed libstdc++_libbacktraceconvenience.a which gets included > into the installed libstdc++exp.a > > So if that's preferable to making the installed > libstdc++_libbacktrace.a a symlink, we can do that. > > I still kinda like the symlink approach, because it reduces the size > on disk, and the same approach could be used to get rid of > libstdc++fs.a without breaking makefiles using -lstdc++fs I committed the symlink approach, but with a slightly different patch (attached). This one installs libstdc++_libbacktrace.a as a symlink, but also removes the .la libtool file for that archive, because I don't think it's any use. I also added an uninstall-local target so the symlink gets removed. --0000000000003d63230616ef8baa Content-Type: text/plain; charset="US-ASCII"; name="patch.txt" Content-Disposition: attachment; filename="patch.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lvfjsdbc0 Y29tbWl0IGYzY2ZmNzE4ZGYwY2Y3NTkwY2NmOWJjMWQ4Y2QxN2U0ZTA4ZjFlNmQKQXV0aG9yOiBK b25hdGhhbiBXYWtlbHkgPGp3YWtlbHlAcmVkaGF0LmNvbT4KRGF0ZTogICBUaHUgQXByIDE4IDE3 OjI2OjU1IDIwMjQKCiAgICBsaWJzdGRjKys6IEFkZCBsaWJzdGRjKytfbGliYmFja3RyYWNlLmEg dG8gbGlic3RkYysrZXhwCiAgICAKICAgIFRoaXMgY29tcGxldGVzIHRoZSBmaXhlcyB0byBwdXQg YWxsIGV4cGVyaW1lbnRhbCBzeW1ib2xzIGludG8KICAgIGxpYnN0ZGMrK2V4cC5hLgogICAgCiAg ICBPbiB0cnVuayB0aGUgbGlic3RkYysrX2xpYmJhY2t0cmFjZS5hIHdhcyByZW1vdmVkIGNvbXBs ZXRlbHkgYW5kIGl0cwogICAgY29udGVudHMgYWRlZCB0byBsaWJzdGRjKytleHAuYSBpbnN0ZWFk LiBXZSBkb24ndCB3YW50IHRvIHJlbW92ZSBpdCBvbgogICAgdGhlIGdjYy0xMyBicmFuY2ggYmVj YXVzZSB0aGF0IHdvdWxkIGJyZWFrIG1ha2VmaWxlcyB1c2luZyBpdC4gV2UgY2FuCiAgICBhZGQg dGhlIGNvbnRlbnRzIHRvIGxpYnN0ZGMrK2V4cC5hIGFuZCB0aGVuIGluc3RhbGwgYSBzeW1saW5r IHNvIHRoYXQKICAgIHVzaW5nIC1sc3RkYysrX2xpYmJhY2t0cmFjZSBzdGlsbCB3b3JrcywgYnV0 IGxpbmtzIHRvIGxpYnN0ZGMrK2V4cC5hCiAgICBpbnN0ZWFkLgogICAgCiAgICBUaGUgbGlic3Rk YysrX2xpYmJhY2t0cmFjZS5sYSBsaWJ0b29sIGNvbnRyb2wgZmlsZSBpcyByZW1vdmVkIGJ5IHRo aXMKICAgIGNoYW5nZSwgYmVjYXVzZSBJJ20gcHJldHR5IHN1cmUgaXQncyBub3QgYWN0dWFsbHkg dXNlZnVsLCBhbmQgSSBkb24ndAogICAga25vdyB3aGV0aGVyIGl0IHNob3VsZCBiZSBhIHN5bWxp bmsgdG8gbGlic3RkYysrZXhwLmxhIG9yIGEgcmVndWxhciBmaWxlCiAgICB0aGF0IHJlZmVycyB0 byBsaWJzdGRjKytfbGliYmFja3RyYWNlLmEuCiAgICAKICAgIGxpYnN0ZGMrKy12My9DaGFuZ2VM b2c6CiAgICAKICAgICAgICAgICAgKiBzcmMvZXhwZXJpbWVudGFsL01ha2VmaWxlLmFtIChpbnN0 YWxsLWV4ZWMtbG9jYWwpOiBOZXcgdGFyZ2V0LgogICAgICAgICAgICAodW5pbnN0YWxsLWxvY2Fs KTogTmV3IHRhcmdldC4KICAgICAgICAgICAgKiBzcmMvZXhwZXJpbWVudGFsL01ha2VmaWxlLmlu OiBSZWdlbmVyYXRlLgogICAgICAgICAgICAqIHNyYy9saWJiYWNrdHJhY2UvTWFrZWZpbGUuYW06 IEJ1aWxkIGxpYnN0ZGMrK19saWJiYWNrdHJhY2UgYXMKICAgICAgICAgICAgbm9pbnN0X0xUTElC UkFSSUVTIHNvIGl0J3Mgb25seSBhIGNvbnZlbmllbmNlIGxpYnJhcnkuCiAgICAgICAgICAgICog c3JjL2xpYmJhY2t0cmFjZS9NYWtlZmlsZS5pbjogUmVnZW5lcmF0ZS4KCmRpZmYgLS1naXQgYS9s aWJzdGRjKystdjMvc3JjL2V4cGVyaW1lbnRhbC9NYWtlZmlsZS5hbSBiL2xpYnN0ZGMrKy12My9z cmMvZXhwZXJpbWVudGFsL01ha2VmaWxlLmFtCmluZGV4IGM1YTM4ZDg4MmMyLi42NTM2ZTc1OWFi ZCAxMDA2NDQKLS0tIGEvbGlic3RkYysrLXYzL3NyYy9leHBlcmltZW50YWwvTWFrZWZpbGUuYW0K KysrIGIvbGlic3RkYysrLXYzL3NyYy9leHBlcmltZW50YWwvTWFrZWZpbGUuYW0KQEAgLTY2LDYg KzY2LDE1IEBAIEFNX0NYWEZMQUdTID0gXAogQU1fTUFLRUZMQUdTID0gXAogCSJneHhfaW5jbHVk ZV9kaXI9JChneHhfaW5jbHVkZV9kaXIpIgogCitpZiBFTkFCTEVfQkFDS1RSQUNFCitpbnN0YWxs LWV4ZWMtbG9jYWw6CisJLWNkICckKERFU1RESVIpJCh0b29sZXhlY2xpYmRpciknICYmIFwKKwkk KExOX1MpIGxpYnN0ZGMrK2V4cC5hIGxpYnN0ZGMrK19saWJiYWNrdHJhY2UuYQordW5pbnN0YWxs LWxvY2FsOgorCS1jZCAnJChERVNURElSKSQodG9vbGV4ZWNsaWJkaXIpJyAmJiBcCisJcm0gLWYg bGlic3RkYysrX2xpYmJhY2t0cmFjZS5hCitlbmRpZgorCiAjIExpYnRvb2wgbm90ZXMKIAogIyAx KSBJbiBnZW5lcmFsLCBsaWJ0b29sIGV4cGVjdHMgYW4gYXJndW1lbnQgc3VjaCBhcyBgLS10YWc9 Q1hYJyB3aGVuCmRpZmYgLS1naXQgYS9saWJzdGRjKystdjMvc3JjL2V4cGVyaW1lbnRhbC9NYWtl ZmlsZS5pbiBiL2xpYnN0ZGMrKy12My9zcmMvZXhwZXJpbWVudGFsL01ha2VmaWxlLmluCmluZGV4 IGMxNjA4M2E3ZmM4Li4yMzhjOTZkOWY5YSAxMDA2NDQKLS0tIGEvbGlic3RkYysrLXYzL3NyYy9l eHBlcmltZW50YWwvTWFrZWZpbGUuaW4KKysrIGIvbGlic3RkYysrLXYzL3NyYy9leHBlcmltZW50 YWwvTWFrZWZpbGUuaW4KQEAgLTcxMiw2ICs3MTIsOCBAQCBkaXN0Y2xlYW4tZ2VuZXJpYzoKIG1h aW50YWluZXItY2xlYW4tZ2VuZXJpYzoKIAlAZWNobyAiVGhpcyBjb21tYW5kIGlzIGludGVuZGVk IGZvciBtYWludGFpbmVycyB0byB1c2UiCiAJQGVjaG8gIml0IGRlbGV0ZXMgZmlsZXMgdGhhdCBt YXkgcmVxdWlyZSBzcGVjaWFsIHRvb2xzIHRvIHJlYnVpbGQuIgorQEVOQUJMRV9CQUNLVFJBQ0Vf RkFMU0VAaW5zdGFsbC1leGVjLWxvY2FsOgorQEVOQUJMRV9CQUNLVFJBQ0VfRkFMU0VAdW5pbnN0 YWxsLWxvY2FsOgogY2xlYW46IGNsZWFuLWFtCiAKIGNsZWFuLWFtOiBjbGVhbi1nZW5lcmljIGNs ZWFuLWxpYnRvb2wgY2xlYW4tdG9vbGV4ZWNsaWJMVExJQlJBUklFUyBcCkBAIC03NDAsNyArNzQy LDcgQEAgaW5zdGFsbC1kdmk6IGluc3RhbGwtZHZpLWFtCiAKIGluc3RhbGwtZHZpLWFtOgogCi1p bnN0YWxsLWV4ZWMtYW06IGluc3RhbGwtdG9vbGV4ZWNsaWJMVExJQlJBUklFUworaW5zdGFsbC1l eGVjLWFtOiBpbnN0YWxsLWV4ZWMtbG9jYWwgaW5zdGFsbC10b29sZXhlY2xpYkxUTElCUkFSSUVT CiAKIGluc3RhbGwtaHRtbDogaW5zdGFsbC1odG1sLWFtCiAKQEAgLTc3OSw3ICs3ODEsNyBAQCBw czogcHMtYW0KIAogcHMtYW06CiAKLXVuaW5zdGFsbC1hbTogdW5pbnN0YWxsLXRvb2xleGVjbGli TFRMSUJSQVJJRVMKK3VuaW5zdGFsbC1hbTogdW5pbnN0YWxsLWxvY2FsIHVuaW5zdGFsbC10b29s ZXhlY2xpYkxUTElCUkFSSUVTCiAKIC5NQUtFOiBpbnN0YWxsLWFtIGluc3RhbGwtc3RyaXAKIApA QCAtNzg5LDE4ICs3OTEsMjUgQEAgdW5pbnN0YWxsLWFtOiB1bmluc3RhbGwtdG9vbGV4ZWNsaWJM VExJQlJBUklFUwogCWRpc3RjbGVhbi1saWJ0b29sIGRpc3RjbGVhbi10YWdzIGR2aSBkdmktYW0g aHRtbCBodG1sLWFtIGluZm8gXAogCWluZm8tYW0gaW5zdGFsbCBpbnN0YWxsLWFtIGluc3RhbGwt ZGF0YSBpbnN0YWxsLWRhdGEtYW0gXAogCWluc3RhbGwtZHZpIGluc3RhbGwtZHZpLWFtIGluc3Rh bGwtZXhlYyBpbnN0YWxsLWV4ZWMtYW0gXAotCWluc3RhbGwtaHRtbCBpbnN0YWxsLWh0bWwtYW0g aW5zdGFsbC1pbmZvIGluc3RhbGwtaW5mby1hbSBcCi0JaW5zdGFsbC1tYW4gaW5zdGFsbC1wZGYg aW5zdGFsbC1wZGYtYW0gaW5zdGFsbC1wcyBcCi0JaW5zdGFsbC1wcy1hbSBpbnN0YWxsLXN0cmlw IGluc3RhbGwtdG9vbGV4ZWNsaWJMVExJQlJBUklFUyBcCi0JaW5zdGFsbGNoZWNrIGluc3RhbGxj aGVjay1hbSBpbnN0YWxsZGlycyBtYWludGFpbmVyLWNsZWFuIFwKLQltYWludGFpbmVyLWNsZWFu LWdlbmVyaWMgbW9zdGx5Y2xlYW4gbW9zdGx5Y2xlYW4tY29tcGlsZSBcCi0JbW9zdGx5Y2xlYW4t Z2VuZXJpYyBtb3N0bHljbGVhbi1saWJ0b29sIHBkZiBwZGYtYW0gcHMgcHMtYW0gXAotCXRhZ3Mg dGFncy1hbSB1bmluc3RhbGwgdW5pbnN0YWxsLWFtIFwKLQl1bmluc3RhbGwtdG9vbGV4ZWNsaWJM VExJQlJBUklFUworCWluc3RhbGwtZXhlYy1sb2NhbCBpbnN0YWxsLWh0bWwgaW5zdGFsbC1odG1s LWFtIGluc3RhbGwtaW5mbyBcCisJaW5zdGFsbC1pbmZvLWFtIGluc3RhbGwtbWFuIGluc3RhbGwt cGRmIGluc3RhbGwtcGRmLWFtIFwKKwlpbnN0YWxsLXBzIGluc3RhbGwtcHMtYW0gaW5zdGFsbC1z dHJpcCBcCisJaW5zdGFsbC10b29sZXhlY2xpYkxUTElCUkFSSUVTIGluc3RhbGxjaGVjayBpbnN0 YWxsY2hlY2stYW0gXAorCWluc3RhbGxkaXJzIG1haW50YWluZXItY2xlYW4gbWFpbnRhaW5lci1j bGVhbi1nZW5lcmljIFwKKwltb3N0bHljbGVhbiBtb3N0bHljbGVhbi1jb21waWxlIG1vc3RseWNs ZWFuLWdlbmVyaWMgXAorCW1vc3RseWNsZWFuLWxpYnRvb2wgcGRmIHBkZi1hbSBwcyBwcy1hbSB0 YWdzIHRhZ3MtYW0gdW5pbnN0YWxsIFwKKwl1bmluc3RhbGwtYW0gdW5pbnN0YWxsLWxvY2FsIHVu aW5zdGFsbC10b29sZXhlY2xpYkxUTElCUkFSSUVTCiAKIC5QUkVDSU9VUzogTWFrZWZpbGUKIAog CitARU5BQkxFX0JBQ0tUUkFDRV9UUlVFQGluc3RhbGwtZXhlYy1sb2NhbDoKK0BFTkFCTEVfQkFD S1RSQUNFX1RSVUVACS1jZCAnJChERVNURElSKSQodG9vbGV4ZWNsaWJkaXIpJyAmJiBcCitARU5B QkxFX0JBQ0tUUkFDRV9UUlVFQAkkKExOX1MpIGxpYnN0ZGMrK2V4cC5hIGxpYnN0ZGMrK19saWJi YWNrdHJhY2UuYQorQEVOQUJMRV9CQUNLVFJBQ0VfVFJVRUB1bmluc3RhbGwtbG9jYWw6CitARU5B QkxFX0JBQ0tUUkFDRV9UUlVFQAktY2QgJyQoREVTVERJUikkKHRvb2xleGVjbGliZGlyKScgJiYg XAorQEVOQUJMRV9CQUNLVFJBQ0VfVFJVRUAJcm0gLWYgbGlic3RkYysrX2xpYmJhY2t0cmFjZS5h CisKICMgVGVsbCB2ZXJzaW9ucyBbMy41OSwzLjYzKSBvZiBHTlUgbWFrZSB0byBub3QgZXhwb3J0 IGFsbCB2YXJpYWJsZXMuCiAjIE90aGVyd2lzZSBhIHN5c3RlbSBsaW1pdCAoZm9yIFN5c1YgYXQg bGVhc3QpIG1heSBiZSBleGNlZWRlZC4KIC5OT0VYUE9SVDoKZGlmZiAtLWdpdCBhL2xpYnN0ZGMr Ky12My9zcmMvbGliYmFja3RyYWNlL01ha2VmaWxlLmFtIGIvbGlic3RkYysrLXYzL3NyYy9saWJi YWNrdHJhY2UvTWFrZWZpbGUuYW0KaW5kZXggMzk5MmYzYWI5YzUuLjRhMDhmMTFkYTFlIDEwMDY0 NAotLS0gYS9saWJzdGRjKystdjMvc3JjL2xpYmJhY2t0cmFjZS9NYWtlZmlsZS5hbQorKysgYi9s aWJzdGRjKystdjMvc3JjL2xpYmJhY2t0cmFjZS9NYWtlZmlsZS5hbQpAQCAtMzEsNyArMzEsNyBA QAogCiBpbmNsdWRlICQodG9wX3NyY2RpcikvZnJhZ21lbnQuYW0KIAotdG9vbGV4ZWNsaWJfTFRM SUJSQVJJRVMgPSBsaWJzdGRjKytfbGliYmFja3RyYWNlLmxhCitub2luc3RfTFRMSUJSQVJJRVMg PSBsaWJzdGRjKytfbGliYmFja3RyYWNlLmxhCiAKIEFDTE9DQUxfQU1GTEFHUyA9IC1JIC4uLy4u IC1JIC4uLy4uL2NvbmZpZwogCmRpZmYgLS1naXQgYS9saWJzdGRjKystdjMvc3JjL2xpYmJhY2t0 cmFjZS9NYWtlZmlsZS5pbiBiL2xpYnN0ZGMrKy12My9zcmMvbGliYmFja3RyYWNlL01ha2VmaWxl LmluCmluZGV4IGY1ZjE5MTQ5YWU2Li42Yjg5OGY2NWIwNiAxMDA2NDQKLS0tIGEvbGlic3RkYysr LXYzL3NyYy9saWJiYWNrdHJhY2UvTWFrZWZpbGUuaW4KKysrIGIvbGlic3RkYysrLXYzL3NyYy9s aWJiYWNrdHJhY2UvTWFrZWZpbGUuaW4KQEAgLTE1MCwzNSArMTUwLDcgQEAgRElTVF9DT01NT04g PSAkKHNyY2RpcikvTWFrZWZpbGUuYW0KIENPTkZJR19IRUFERVIgPSAkKHRvcF9idWlsZGRpcikv Y29uZmlnLmgKIENPTkZJR19DTEVBTl9GSUxFUyA9IGJhY2t0cmFjZS1zdXBwb3J0ZWQuaAogQ09O RklHX0NMRUFOX1ZQQVRIX0ZJTEVTID0KLWFtX192cGF0aF9hZGpfc2V0dXAgPSBzcmNkaXJzdHJp cD1gZWNobyAiJChzcmNkaXIpIiB8IHNlZCAnc3wufC58ZydgOwotYW1fX3ZwYXRoX2FkaiA9IGNh c2UgJCRwIGluIFwKLSAgICAkKHNyY2RpcikvKikgZj1gZWNobyAiJCRwIiB8IHNlZCAic3xeJCRz cmNkaXJzdHJpcC98fCJgOzsgXAotICAgICopIGY9JCRwOzsgXAotICBlc2FjOwotYW1fX3N0cmlw X2RpciA9IGY9YGVjaG8gJCRwIHwgc2VkIC1lICdzfF4uKi98fCdgOwotYW1fX2luc3RhbGxfbWF4 ID0gNDAKLWFtX19ub2Jhc2Vfc3RyaXBfc2V0dXAgPSBcCi0gIHNyY2RpcnN0cmlwPWBlY2hvICIk KHNyY2RpcikiIHwgc2VkICdzL1tdLlteJCRcXCp8XS9cXFxcJi9nJ2AKLWFtX19ub2Jhc2Vfc3Ry aXAgPSBcCi0gIGZvciBwIGluICQkbGlzdDsgZG8gZWNobyAiJCRwIjsgZG9uZSB8IHNlZCAtZSAi c3wkJHNyY2RpcnN0cmlwL3x8IgotYW1fX25vYmFzZV9saXN0ID0gJChhbV9fbm9iYXNlX3N0cmlw X3NldHVwKTsgXAotICBmb3IgcCBpbiAkJGxpc3Q7IGRvIGVjaG8gIiQkcCAkJHAiOyBkb25lIHwg XAotICBzZWQgInN8ICQkc3JjZGlyc3RyaXAvfCB8OyInIC8gLipcLy8hcy8gLiovIC4vOyBzLFwo IC4qXCkvW14vXSokJCxcMSwnIHwgXAotICAkKEFXSykgJ0JFR0lOIHsgZmlsZXNbIi4iXSA9ICIi IH0geyBmaWxlc1skJDJdID0gZmlsZXNbJCQyXSAiICIgJCQxOyBcCi0gICAgaWYgKCsrblskJDJd ID09ICQoYW1fX2luc3RhbGxfbWF4KSkgXAotICAgICAgeyBwcmludCAkJDIsIGZpbGVzWyQkMl07 IG5bJCQyXSA9IDA7IGZpbGVzWyQkMl0gPSAiIiB9IH0gXAotICAgIEVORCB7IGZvciAoZGlyIGlu IGZpbGVzKSBwcmludCBkaXIsIGZpbGVzW2Rpcl0gfScKLWFtX19iYXNlX2xpc3QgPSBcCi0gIHNl ZCAnJCQhTjskJCFOOyQkIU47JCQhTjskJCFOOyQkIU47JCQhTjtzL1xuLyAvZycgfCBcCi0gIHNl ZCAnJCQhTjskJCFOOyQkIU47JCQhTjtzL1xuLyAvZycKLWFtX191bmluc3RhbGxfZmlsZXNfZnJv bV9kaXIgPSB7IFwKLSAgdGVzdCAteiAiJCRmaWxlcyIgXAotICAgIHx8IHsgdGVzdCAhIC1kICIk JGRpciIgJiYgdGVzdCAhIC1mICIkJGRpciIgJiYgdGVzdCAhIC1yICIkJGRpciI7IH0gXAotICAg IHx8IHsgZWNobyAiICggY2QgJyQkZGlyJyAmJiBybSAtZiIgJCRmaWxlcyAiKSI7IFwKLSAgICAg ICAgICQoYW1fX2NkKSAiJCRkaXIiICYmIHJtIC1mICQkZmlsZXM7IH07IFwKLSAgfQotYW1fX2lu c3RhbGxkaXJzID0gIiQoREVTVERJUikkKHRvb2xleGVjbGliZGlyKSIKLUxUTElCUkFSSUVTID0g JCh0b29sZXhlY2xpYl9MVExJQlJBUklFUykKK0xUTElCUkFSSUVTID0gJChub2luc3RfTFRMSUJS QVJJRVMpCiBhbV9saWJzdGRjX19fbGliYmFja3RyYWNlX2xhX09CSkVDVFMgPSAkKG9ial9wcmVm aXgpLWF0b21pYy5sbyBcCiAJJChvYmpfcHJlZml4KS1iYWNrdHJhY2UubG8gJChvYmpfcHJlZml4 KS1kd2FyZi5sbyBcCiAJJChvYmpfcHJlZml4KS1maWxlbGluZS5sbyAkKG9ial9wcmVmaXgpLXBv c2l4LmxvIFwKQEAgLTQ4NCw3ICs0NTYsNyBAQCBXQVJOX0NYWEZMQUdTID0gXAogCiAjIC1JLy1E IGZsYWdzIHRvIHBhc3Mgd2hlbiBjb21waWxpbmcuCiBBTV9DUFBGTEFHUyA9ICQoR0xJQkNYWF9J TkNMVURFUykgJChDUFBGTEFHUykKLXRvb2xleGVjbGliX0xUTElCUkFSSUVTID0gbGlic3RkYysr X2xpYmJhY2t0cmFjZS5sYQorbm9pbnN0X0xUTElCUkFSSUVTID0gbGlic3RkYysrX2xpYmJhY2t0 cmFjZS5sYQogQUNMT0NBTF9BTUZMQUdTID0gLUkgLi4vLi4gLUkgLi4vLi4vY29uZmlnCiAKICMg VGhpcyB3aWxsIGJlIHVzZWQgaW5zdGVhZCBvZiB0aGUgY29tbW9uIEFNX0NQUEZMQUdTIGZyb20g ZnJhZ21lbnQuYW0KQEAgLTU5NCwzMyArNTY2LDkgQEAgJChhbV9fYWNsb2NhbF9tNF9kZXBzKToK IGJhY2t0cmFjZS1zdXBwb3J0ZWQuaDogJCh0b3BfYnVpbGRkaXIpL2NvbmZpZy5zdGF0dXMgJChz cmNkaXIpL2JhY2t0cmFjZS1zdXBwb3J0ZWQuaC5pbgogCWNkICQodG9wX2J1aWxkZGlyKSAmJiAk KFNIRUxMKSAuL2NvbmZpZy5zdGF0dXMgJChzdWJkaXIpLyRACiAKLWluc3RhbGwtdG9vbGV4ZWNs aWJMVExJQlJBUklFUzogJCh0b29sZXhlY2xpYl9MVExJQlJBUklFUykKLQlAJChOT1JNQUxfSU5T VEFMTCkKLQlAbGlzdD0nJCh0b29sZXhlY2xpYl9MVExJQlJBUklFUyknOyB0ZXN0IC1uICIkKHRv b2xleGVjbGliZGlyKSIgfHwgbGlzdD07IFwKLQlsaXN0Mj07IGZvciBwIGluICQkbGlzdDsgZG8g XAotCSAgaWYgdGVzdCAtZiAkJHA7IHRoZW4gXAotCSAgICBsaXN0Mj0iJCRsaXN0MiAkJHAiOyBc Ci0JICBlbHNlIDo7IGZpOyBcCi0JZG9uZTsgXAotCXRlc3QgLXogIiQkbGlzdDIiIHx8IHsgXAot CSAgZWNobyAiICQoTUtESVJfUCkgJyQoREVTVERJUikkKHRvb2xleGVjbGliZGlyKSciOyBcCi0J ICAkKE1LRElSX1ApICIkKERFU1RESVIpJCh0b29sZXhlY2xpYmRpcikiIHx8IGV4aXQgMTsgXAot CSAgZWNobyAiICQoTElCVE9PTCkgJChBTV9MSUJUT09MRkxBR1MpICQoTElCVE9PTEZMQUdTKSAt LW1vZGU9aW5zdGFsbCAkKElOU1RBTEwpICQoSU5TVEFMTF9TVFJJUF9GTEFHKSAkJGxpc3QyICck KERFU1RESVIpJCh0b29sZXhlY2xpYmRpciknIjsgXAotCSAgJChMSUJUT09MKSAkKEFNX0xJQlRP T0xGTEFHUykgJChMSUJUT09MRkxBR1MpIC0tbW9kZT1pbnN0YWxsICQoSU5TVEFMTCkgJChJTlNU QUxMX1NUUklQX0ZMQUcpICQkbGlzdDIgIiQoREVTVERJUikkKHRvb2xleGVjbGliZGlyKSI7IFwK LQl9Ci0KLXVuaW5zdGFsbC10b29sZXhlY2xpYkxUTElCUkFSSUVTOgotCUAkKE5PUk1BTF9VTklO U1RBTEwpCi0JQGxpc3Q9JyQodG9vbGV4ZWNsaWJfTFRMSUJSQVJJRVMpJzsgdGVzdCAtbiAiJCh0 b29sZXhlY2xpYmRpcikiIHx8IGxpc3Q9OyBcCi0JZm9yIHAgaW4gJCRsaXN0OyBkbyBcCi0JICAk KGFtX19zdHJpcF9kaXIpIFwKLQkgIGVjaG8gIiAkKExJQlRPT0wpICQoQU1fTElCVE9PTEZMQUdT KSAkKExJQlRPT0xGTEFHUykgLS1tb2RlPXVuaW5zdGFsbCBybSAtZiAnJChERVNURElSKSQodG9v bGV4ZWNsaWJkaXIpLyQkZiciOyBcCi0JICAkKExJQlRPT0wpICQoQU1fTElCVE9PTEZMQUdTKSAk KExJQlRPT0xGTEFHUykgLS1tb2RlPXVuaW5zdGFsbCBybSAtZiAiJChERVNURElSKSQodG9vbGV4 ZWNsaWJkaXIpLyQkZiI7IFwKLQlkb25lCi0KLWNsZWFuLXRvb2xleGVjbGliTFRMSUJSQVJJRVM6 Ci0JLXRlc3QgLXogIiQodG9vbGV4ZWNsaWJfTFRMSUJSQVJJRVMpIiB8fCBybSAtZiAkKHRvb2xl eGVjbGliX0xUTElCUkFSSUVTKQotCUBsaXN0PSckKHRvb2xleGVjbGliX0xUTElCUkFSSUVTKSc7 IFwKK2NsZWFuLW5vaW5zdExUTElCUkFSSUVTOgorCS10ZXN0IC16ICIkKG5vaW5zdF9MVExJQlJB UklFUykiIHx8IHJtIC1mICQobm9pbnN0X0xUTElCUkFSSUVTKQorCUBsaXN0PSckKG5vaW5zdF9M VExJQlJBUklFUyknOyBcCiAJbG9jcz1gZm9yIHAgaW4gJCRsaXN0OyBkbyBlY2hvICQkcDsgZG9u ZSB8IFwKIAkgICAgICBzZWQgJ3N8XlteL10qJCR8Lnw7IHN8L1teL10qJCR8fDsgc3wkJHwvc29f bG9jYXRpb25zfCcgfCBcCiAJICAgICAgc29ydCAtdWA7IFwKQEAgLTYzMCw3ICs1NzgsNyBAQCBj bGVhbi10b29sZXhlY2xpYkxUTElCUkFSSUVTOgogCX0KIAogbGlic3RkYysrX2xpYmJhY2t0cmFj ZS5sYTogJChsaWJzdGRjX19fbGliYmFja3RyYWNlX2xhX09CSkVDVFMpICQobGlic3RkY19fX2xp YmJhY2t0cmFjZV9sYV9ERVBFTkRFTkNJRVMpICQoRVhUUkFfbGlic3RkY19fX2xpYmJhY2t0cmFj ZV9sYV9ERVBFTkRFTkNJRVMpIAotCSQoQU1fVl9DQ0xEKSQoTElOSykgLXJwYXRoICQodG9vbGV4 ZWNsaWJkaXIpICQobGlic3RkY19fX2xpYmJhY2t0cmFjZV9sYV9PQkpFQ1RTKSAkKGxpYnN0ZGNf X19saWJiYWNrdHJhY2VfbGFfTElCQUREKSAkKExJQlMpCisJJChBTV9WX0NDTEQpJChMSU5LKSAg JChsaWJzdGRjX19fbGliYmFja3RyYWNlX2xhX09CSkVDVFMpICQobGlic3RkY19fX2xpYmJhY2t0 cmFjZV9sYV9MSUJBREQpICQoTElCUykKIAogbW9zdGx5Y2xlYW4tY29tcGlsZToKIAktcm0gLWYg Ki4kKE9CSkVYVCkKQEAgLTc1Niw5ICs3MDQsNiBAQCBjaGVjay1hbTogYWxsLWFtCiBjaGVjazog Y2hlY2stYW0KIGFsbC1hbTogTWFrZWZpbGUgJChMVExJQlJBUklFUykKIGluc3RhbGxkaXJzOgot CWZvciBkaXIgaW4gIiQoREVTVERJUikkKHRvb2xleGVjbGliZGlyKSI7IGRvIFwKLQkgIHRlc3Qg LXogIiQkZGlyIiB8fCAkKE1LRElSX1ApICIkJGRpciI7IFwKLQlkb25lCiBpbnN0YWxsOiBpbnN0 YWxsLWFtCiBpbnN0YWxsLWV4ZWM6IGluc3RhbGwtZXhlYy1hbQogaW5zdGFsbC1kYXRhOiBpbnN0 YWxsLWRhdGEtYW0KQEAgLTc5MSw3ICs3MzYsNyBAQCBtYWludGFpbmVyLWNsZWFuLWdlbmVyaWM6 CiAJQGVjaG8gIml0IGRlbGV0ZXMgZmlsZXMgdGhhdCBtYXkgcmVxdWlyZSBzcGVjaWFsIHRvb2xz IHRvIHJlYnVpbGQuIgogY2xlYW46IGNsZWFuLWFtCiAKLWNsZWFuLWFtOiBjbGVhbi1nZW5lcmlj IGNsZWFuLWxpYnRvb2wgY2xlYW4tdG9vbGV4ZWNsaWJMVExJQlJBUklFUyBcCitjbGVhbi1hbTog Y2xlYW4tZ2VuZXJpYyBjbGVhbi1saWJ0b29sIGNsZWFuLW5vaW5zdExUTElCUkFSSUVTIFwKIAlt b3N0bHljbGVhbi1hbQogCiBkaXN0Y2xlYW46IGRpc3RjbGVhbi1hbQpAQCAtODE3LDcgKzc2Miw3 IEBAIGluc3RhbGwtZHZpOiBpbnN0YWxsLWR2aS1hbQogCiBpbnN0YWxsLWR2aS1hbToKIAotaW5z dGFsbC1leGVjLWFtOiBpbnN0YWxsLXRvb2xleGVjbGliTFRMSUJSQVJJRVMKK2luc3RhbGwtZXhl Yy1hbToKIAogaW5zdGFsbC1odG1sOiBpbnN0YWxsLWh0bWwtYW0KIApAQCAtODU2LDI0ICs4MDEs MjMgQEAgcHM6IHBzLWFtCiAKIHBzLWFtOgogCi11bmluc3RhbGwtYW06IHVuaW5zdGFsbC10b29s ZXhlY2xpYkxUTElCUkFSSUVTCit1bmluc3RhbGwtYW06CiAKIC5NQUtFOiBpbnN0YWxsLWFtIGlu c3RhbGwtc3RyaXAKIAogLlBIT05ZOiBDVEFHUyBHVEFHUyBUQUdTIGFsbCBhbGwtYW0gY2hlY2sg Y2hlY2stYW0gY2xlYW4gY2xlYW4tZ2VuZXJpYyBcCi0JY2xlYW4tbGlidG9vbCBjbGVhbi10b29s ZXhlY2xpYkxUTElCUkFSSUVTIGNzY29wZWxpc3QtYW0gY3RhZ3MgXAorCWNsZWFuLWxpYnRvb2wg Y2xlYW4tbm9pbnN0TFRMSUJSQVJJRVMgY3Njb3BlbGlzdC1hbSBjdGFncyBcCiAJY3RhZ3MtYW0g ZGlzdGNsZWFuIGRpc3RjbGVhbi1jb21waWxlIGRpc3RjbGVhbi1nZW5lcmljIFwKIAlkaXN0Y2xl YW4tbGlidG9vbCBkaXN0Y2xlYW4tdGFncyBkdmkgZHZpLWFtIGh0bWwgaHRtbC1hbSBpbmZvIFwK IAlpbmZvLWFtIGluc3RhbGwgaW5zdGFsbC1hbSBpbnN0YWxsLWRhdGEgaW5zdGFsbC1kYXRhLWFt IFwKIAlpbnN0YWxsLWR2aSBpbnN0YWxsLWR2aS1hbSBpbnN0YWxsLWV4ZWMgaW5zdGFsbC1leGVj LWFtIFwKIAlpbnN0YWxsLWh0bWwgaW5zdGFsbC1odG1sLWFtIGluc3RhbGwtaW5mbyBpbnN0YWxs LWluZm8tYW0gXAogCWluc3RhbGwtbWFuIGluc3RhbGwtcGRmIGluc3RhbGwtcGRmLWFtIGluc3Rh bGwtcHMgXAotCWluc3RhbGwtcHMtYW0gaW5zdGFsbC1zdHJpcCBpbnN0YWxsLXRvb2xleGVjbGli TFRMSUJSQVJJRVMgXAotCWluc3RhbGxjaGVjayBpbnN0YWxsY2hlY2stYW0gaW5zdGFsbGRpcnMg bWFpbnRhaW5lci1jbGVhbiBcCi0JbWFpbnRhaW5lci1jbGVhbi1nZW5lcmljIG1vc3RseWNsZWFu IG1vc3RseWNsZWFuLWNvbXBpbGUgXAotCW1vc3RseWNsZWFuLWdlbmVyaWMgbW9zdGx5Y2xlYW4t bGlidG9vbCBwZGYgcGRmLWFtIHBzIHBzLWFtIFwKLQl0YWdzIHRhZ3MtYW0gdW5pbnN0YWxsIHVu aW5zdGFsbC1hbSBcCi0JdW5pbnN0YWxsLXRvb2xleGVjbGliTFRMSUJSQVJJRVMKKwlpbnN0YWxs LXBzLWFtIGluc3RhbGwtc3RyaXAgaW5zdGFsbGNoZWNrIGluc3RhbGxjaGVjay1hbSBcCisJaW5z dGFsbGRpcnMgbWFpbnRhaW5lci1jbGVhbiBtYWludGFpbmVyLWNsZWFuLWdlbmVyaWMgXAorCW1v c3RseWNsZWFuIG1vc3RseWNsZWFuLWNvbXBpbGUgbW9zdGx5Y2xlYW4tZ2VuZXJpYyBcCisJbW9z dGx5Y2xlYW4tbGlidG9vbCBwZGYgcGRmLWFtIHBzIHBzLWFtIHRhZ3MgdGFncy1hbSB1bmluc3Rh bGwgXAorCXVuaW5zdGFsbC1hbQogCiAuUFJFQ0lPVVM6IE1ha2VmaWxlCiAK --0000000000003d63230616ef8baa--