194147 2019-02-01 01:43:52 -0800 [CMake] Build 32bit binaries on Linux/64bit when the --32-bit is passed to build-jsc 2021-03-05 08:32:48 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 xan.lopez webkit-unassigned ap balducci commit-queue dbates lforschler mcatanzaro msaboff webkit-bug-importer xan.lopez oldest_to_newest 1501058 0 xan.lopez 2019-02-01 01:43:52 -0800 The infrastructure to easily build 32bit binaries in a 64bit host is almost there. The following patch fixes a few issues in the build script that allow us to do this transparently. 1501060 1 360851 xan.lopez 2019-02-01 01:58:18 -0800 Created attachment 360851 Make --32-bit flag in build-jsc work in Linux/64bit 1514733 2 xan.lopez 2019-03-11 03:46:20 -0700 Adding a few more eyes here with relevant reviews in the file. 1514757 3 360851 dbates 2019-03-11 06:59:38 -0700 Comment on attachment 360851 Make --32-bit flag in build-jsc work in Linux/64bit View in context: https://bugs.webkit.org/attachment.cgi?id=360851&action=review > CMakeLists.txt:96 > + if (FORCE_32BIT) Ok as-is. Just a thought, add a comment to explain like what you did in the change log that this is a workaround/hack to support building 32 bit without having to formulate the build as a crosscompile > Tools/Scripts/webkitdirs.pm:2264 > + if ($architecture eq "x86_64" && shouldBuild32Bit()) { Looks like an extra space character before the && > Tools/Scripts/webkitdirs.pm:2266 > + # files in debian-based systems, for the others Debian > Tools/Scripts/webkitdirs.pm:2269 > + push @cmakeArgs, '-DFORCE_32BIT=ON -DCMAKE_PREFIX_PATH="/usr" -DCMAKE_LIBRARY_ARCHITECTURE=x86'; Doesn't prefix path affect install path? If so, is that what we want? I don't understand the prefix path part. > Tools/Scripts/webkitdirs.pm:2270 > + $ENV{'CFLAGS'} = "-m32" . ($ENV{'CFLAGS'} || ""); More " please and less ' but only on this line and the below. The above line is perfect. > Tools/Scripts/webkitdirs.pm:2271 > + $ENV{'CXXFLAGS'} = "-m32" . ($ENV{'CXXFLAGS'} || ""); Ditto. 1514787 4 xan.lopez 2019-03-11 08:53:01 -0700 (In reply to Daniel Bates from comment #3) > > + push @cmakeArgs, '-DFORCE_32BIT=ON -DCMAKE_PREFIX_PATH="/usr" -DCMAKE_LIBRARY_ARCHITECTURE=x86'; > > Doesn't prefix path affect install path? If so, is that what we want? I > don't understand the prefix path part. > Hrm, that would be CMAKE_INSTALL_PREFIX I guess? My understanding is that it is used by the FIND_XXX commands (see https://cmake.org/cmake/help/v3.0/variable/CMAKE_PREFIX_PATH.html). If it is set (it's empty by default) CMake search the .pc files in CMAKE_PREFIX_PATH + "/lib", which is the right path for 32bit .pc files. Otherwise, in a 64bit system, it would use /usr/lib64, etc. (That does not apply to Debian, that's why I also set another variable as indicated in the comment). 1514792 5 364259 xan.lopez 2019-03-11 09:17:14 -0700 Created attachment 364259 JSC --32-bit build/intel Patch addressing review comments. 1514881 6 364259 msaboff 2019-03-11 11:20:43 -0700 Comment on attachment 364259 JSC --32-bit build/intel rs=me 1514914 7 364259 commit-queue 2019-03-11 12:11:14 -0700 Comment on attachment 364259 JSC --32-bit build/intel Clearing flags on attachment: 364259 Committed r242724: <https://trac.webkit.org/changeset/242724> 1514915 8 commit-queue 2019-03-11 12:11:16 -0700 All reviewed patches have been landed. Closing bug. 1514916 9 webkit-bug-importer 2019-03-11 12:12:34 -0700 <rdar://problem/48776468> 1517699 10 mcatanzaro 2019-03-18 08:45:24 -0700 Please fix this: Use of uninitialized value $architecture in string eq at /home/mcatanzaro/Projects/WebKit/Tools/Scripts/webkitdirs.pm line 2265. 1736354 11 berto 2021-03-05 08:32:48 -0800 *** Bug 191944 has been marked as a duplicate of this bug. *** 360851 2019-02-01 01:58:18 -0800 2019-03-11 09:17:14 -0700 Make --32-bit flag in build-jsc work in Linux/64bit jsc-32bit-intel.diff text/plain 4654 xan.lopez RnJvbSA3NGJkZDU3NmI2YmQ4OGRlZDYxODcwNGE2M2JlNWVhN2E1NDg5ZDQyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/WGFuPTIwTD1DMz1CM3Blej89IDx4YW5AaWdh bGlhLmNvbT4KRGF0ZTogRnJpLCAxIEZlYiAyMDE5IDEwOjQ4OjQ1ICswMTAwClN1YmplY3Q6IFtQ QVRDSF0gW0NNYWtlXSBCdWlsZCAzMmJpdCBiaW5hcmllcyBvbiBMaW51eC82NGJpdCB3aGVuIHRo ZSAtLTMyLWJpdAogaXMgcGFzc2VkIHRvIGJ1aWxkLWpzYyBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTk0MTQ3CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCi46 CgoqIENNYWtlTGlzdHMudHh0OiBzZXQgV1RGX0NQVSBwcm9wZXJseSBpZiBGT1JDRV8zMkJJVCBp cyBzZXQgaW4KYnVpbGQtanNjLgoKVG9vbHM6CgpUbyBtYWtlIC0tMzItYml0IHdvcmsgY29ycmVj dGx5IG9uIExpbnV4LzY0Yml0IHdlIG5lZWQgdG86CgotIFNldCBGT1JDRV8zMkJJVCBvbiwgd2hp Y2ggd2lsbCBiZSByZWFkIGJ5IENNYWtlIHRvIHNldCBXVEZfQ1BVCmNvcnJlY3RseS4gSWRlYWxs eSB3ZSdkIGp1c3QgcmVkZWZpbmUgQ01BS0VfU1lTVEVNX1BST0NFU1NPUiwgYnV0CnVuZm9ydHVu YXRlbHkgQ01ha2Ugb25seSBhbGxvd3MgdXMgdG8gZG8gdGhpcyBkdXJpbmcKY3Jvc3Njb21waWxh dGlvbiwgd2hpY2ggaXMgb3ZlcmtpbGwgaGVyZS4KLSBTZXQgQ01BS0VfUFJFRklYX1BBVEggYW5k IENNQUtFX0xJQlJBUllfQVJDSElURUNUVVJFIHNvIHRoYXQgdGhlCnBrZy1jb25maWcgZGV0ZWN0 aW9uIG1vZHVsZSB1c2VzIHRoZSB4ODYgLnBjIGZpbGVzIGluc3RlYWQgb2YgdGhlCng4Nl82NCBv bmVzLgotIFNldCB0aGUgLW0zMiBmbGFncyBmb3IgdGhlIGNvbXBpbGVyLgoKKiBTY3JpcHRzL3dl YmtpdGRpcnMucG06CihnZW5lcmF0ZUJ1aWxkU3lzdGVtRnJvbUNNYWtlUHJvamVjdCk6Ci0tLQog Q01ha2VMaXN0cy50eHQgICAgICAgICAgICAgIHwgIDYgKysrKystCiBDaGFuZ2VMb2cgICAgICAg ICAgICAgICAgICAgfCAxMCArKysrKysrKysrCiBUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAg fCAyMSArKysrKysrKysrKysrKysrKysrKysKIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSB8 ICA5ICsrKysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCA0NSBpbnNlcnRpb25zKCspLCAxIGRlbGV0 aW9uKC0pCgpkaWZmIC0tZ2l0IGEvQ01ha2VMaXN0cy50eHQgYi9DTWFrZUxpc3RzLnR4dAppbmRl eCAzMWFkYzQ0OTY4Yy4uZDIyYjllMjg3NzkgMTAwNjQ0Ci0tLSBhL0NNYWtlTGlzdHMudHh0Cisr KyBiL0NNYWtlTGlzdHMudHh0CkBAIC05Myw3ICs5MywxMSBAQCBlbHNlaWYgKExPV0VSQ0FTRV9D TUFLRV9TWVNURU1fUFJPQ0VTU09SIE1BVENIRVMgIl5taXBzNjQiKQogZWxzZWlmIChMT1dFUkNB U0VfQ01BS0VfU1lTVEVNX1BST0NFU1NPUiBNQVRDSEVTICJebWlwcyIpCiAgICAgc2V0KFdURl9D UFVfTUlQUyAxKQogZWxzZWlmIChMT1dFUkNBU0VfQ01BS0VfU1lTVEVNX1BST0NFU1NPUiBNQVRD SEVTICIoeDY0fHg4Nl82NHxhbWQ2NCkiKQotICAgIHNldChXVEZfQ1BVX1g4Nl82NCAxKQorICAg IGlmIChGT1JDRV8zMkJJVCkKKyAgICAgICAgc2V0KFdURl9DUFUgWDg2IDEpCisgICAgZWxzZSAo KQorICAgICAgICBzZXQoV1RGX0NQVV9YODZfNjQgMSkKKyAgICBlbmRpZiAoKQogZWxzZWlmIChM T1dFUkNBU0VfQ01BS0VfU1lTVEVNX1BST0NFU1NPUiBNQVRDSEVTICIoaVszLTZdODZ8eDg2KSIp CiAgICAgc2V0KFdURl9DUFVfWDg2IDEpCiBlbHNlaWYgKExPV0VSQ0FTRV9DTUFLRV9TWVNURU1f UFJPQ0VTU09SIE1BVENIRVMgInBwYyIpCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VM b2cKaW5kZXggYTY5YjdiYTAyMWUuLjg3Y2JiNjg0MTNkIDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cK KysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTktMDItMDEgIFhhbiBMb3BleiAg PHhhbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtDTWFrZV0gQnVpbGQgMzJiaXQgYmluYXJpZXMg b24gTGludXgvNjRiaXQgd2hlbiB0aGUgLS0zMi1iaXQgaXMgcGFzc2VkIHRvIGJ1aWxkLWpzYwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0MTQ3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBDTWFrZUxp c3RzLnR4dDogc2V0IFdURl9DUFUgcHJvcGVybHkgaWYgRk9SQ0VfMzJCSVQgaXMgc2V0IGluCisg ICAgICAgIGJ1aWxkLWpzYy4KKwogMjAxOS0wMS0yNCAgR3VpbGxhdW1lIEVtb250ICA8Z3VpamVt b250QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0pTQ10gUmVlbmFibGUgYmFzZWxpbmUgSklUIG9u IG1pcHMKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRl eCBiMmRlOWE3MDZhZi4uZDA3ZjNkMWVjODYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxOS0wMi0wMSAgWGFuIExv cGV6ICA8eGFuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0NNYWtlXSBCdWlsZCAzMmJpdCBiaW5h cmllcyBvbiBMaW51eC82NGJpdCB3aGVuIHRoZSAtLTMyLWJpdCBpcyBwYXNzZWQgdG8gYnVpbGQt anNjCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQx NDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUbyBt YWtlIC0tMzItYml0IHdvcmsgY29ycmVjdGx5IG9uIExpbnV4LzY0Yml0IHdlIG5lZWQgdG86CisK KyAgICAgICAgLSBTZXQgRk9SQ0VfMzJCSVQgb24sIHdoaWNoIHdpbGwgYmUgcmVhZCBieSBDTWFr ZSB0byBzZXQgV1RGX0NQVQorICAgICAgICBjb3JyZWN0bHkuIElkZWFsbHkgd2UnZCBqdXN0IHJl ZGVmaW5lIENNQUtFX1NZU1RFTV9QUk9DRVNTT1IsIGJ1dAorICAgICAgICB1bmZvcnR1bmF0ZWx5 IENNYWtlIG9ubHkgYWxsb3dzIHVzIHRvIGRvIHRoaXMgZHVyaW5nCisgICAgICAgIGNyb3NzY29t cGlsYXRpb24sIHdoaWNoIGlzIG92ZXJraWxsIGhlcmUuCisgICAgICAgIC0gU2V0IENNQUtFX1BS RUZJWF9QQVRIIGFuZCBDTUFLRV9MSUJSQVJZX0FSQ0hJVEVDVFVSRSBzbyB0aGF0IHRoZQorICAg ICAgICBwa2ctY29uZmlnIGRldGVjdGlvbiBtb2R1bGUgdXNlcyB0aGUgeDg2IC5wYyBmaWxlcyBp bnN0ZWFkIG9mIHRoZQorICAgICAgICB4ODZfNjQgb25lcy4KKyAgICAgICAgLSBTZXQgdGhlIC1t MzIgZmxhZ3MgZm9yIHRoZSBjb21waWxlci4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGly cy5wbToKKyAgICAgICAgKGdlbmVyYXRlQnVpbGRTeXN0ZW1Gcm9tQ01ha2VQcm9qZWN0KToKKwog MjAxOS0wMS0zMSAgUnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAg ICBVcGRhdGUgZmxha2luZXNzIGRhc2hib2FyZCBjb25maWd1cmF0aW9uIGFmdGVyIHJlY2VudCBx dWV1ZSBjaGFuZ2VzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9U b29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggZTY2MDM0YTM4NjEuLmU4YjAyZmI4YTcz IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRkaXJzLnBtCkBAIC0yMjYxLDYgKzIyNjEsMTUgQEAgc3ViIGdlbmVyYXRlQnVp bGRTeXN0ZW1Gcm9tQ01ha2VQcm9qZWN0CiAgICAgIyBTb21lIHBvcnRzIGhhdmUgcHJvZHVjdGlv biBtb2RlLCBidXQgYnVpbGQtd2Via2l0IHNob3VsZCBhbHdheXMgdXNlIGRldmVsb3BlciBtb2Rl LgogICAgIHB1c2ggQGFyZ3MsICItRERFVkVMT1BFUl9NT0RFPU9OIiBpZiBpc0d0aygpIHx8IGlz SlNDT25seSgpIHx8IGlzV1BFKCkgfHwgaXNXaW5DYWlybygpOwogCisgICAgaWYgKCRhcmNoaXRl Y3R1cmUgZXEgIng4Nl82NCIgICYmIHNob3VsZEJ1aWxkMzJCaXQoKSkgeworICAgICAgICAjIENN QUtFX0xJQlJBUllfQVJDSElURUNUVVJFIGlzIG5lZWRlZCB0byBnZXQgdGhlIHJpZ2h0IC5wYwor ICAgICAgICAjIGZpbGVzIGluIGRlYmlhbi1iYXNlZCBzeXN0ZW1zLCBmb3IgdGhlIG90aGVycwor ICAgICAgICAjIENNQUtFX1BSRUZJWF9QQVRIIHdpbGwgZ2V0IHVzIC91c3IvbGliLCB3aGljaCBz aG91bGQgYmUgdGhlCisgICAgICAgICMgcmlnaHQgcGF0aCBmb3IgMzJiaXQuIFNlZSBGaW5kUGtn Q29uZmlnLmNtYWtlLgorICAgICAgICBwdXNoIEBjbWFrZUFyZ3MsICctREZPUkNFXzMyQklUPU9O IC1EQ01BS0VfUFJFRklYX1BBVEg9Ii91c3IiIC1EQ01BS0VfTElCUkFSWV9BUkNISVRFQ1RVUkU9 eDg2JzsKKyAgICAgICAgJEVOVnsnQ0ZMQUdTJ30gPSAiLW0zMiIgLiAoJEVOVnsnQ0ZMQUdTJ30g fHwgIiIpOworICAgICAgICAkRU5WeydDWFhGTEFHUyd9ID0gIi1tMzIiIC4gKCRFTlZ7J0NYWEZM QUdTJ30gfHwgIiIpOworICAgIH0KICAgICBwdXNoIEBhcmdzLCBAY21ha2VBcmdzIGlmIEBjbWFr ZUFyZ3M7CiAKICAgICBteSAkY21ha2VTb3VyY2VEaXIgPSBpc0N5Z3dpbigpID8gd2luZG93c1Nv dXJjZURpcigpIDogc291cmNlRGlyKCk7Ci0tIAoyLjIwLjEKCg== 364259 2019-03-11 09:17:14 -0700 2019-03-11 12:11:14 -0700 JSC --32-bit build/intel jsc-32bit-intel.diff text/plain 4895 xan.lopez RnJvbSBhYTEyZDE0N2YwNWQ5MTc2MjkwMTA4OTk4NWMyOTdjYTY3M2UzNDA0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/WGFuPTIwTD1DMz1CM3Blej89IDx4YW5AaWdh bGlhLmNvbT4KRGF0ZTogRnJpLCAxIEZlYiAyMDE5IDEwOjQ4OjQ1ICswMTAwClN1YmplY3Q6IFtQ QVRDSF0gW0NNYWtlXSBCdWlsZCAzMmJpdCBiaW5hcmllcyBvbiBMaW51eC82NGJpdCB3aGVuIHRo ZSAtLTMyLWJpdAogaXMgcGFzc2VkIHRvIGJ1aWxkLWpzYyBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTk0MTQ3CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCi46 CgoqIENNYWtlTGlzdHMudHh0OiBzZXQgV1RGX0NQVSBwcm9wZXJseSBpZiBGT1JDRV8zMkJJVCBp cyBzZXQgaW4KYnVpbGQtanNjLgoKVG9vbHM6CgpUbyBtYWtlIC0tMzItYml0IHdvcmsgY29ycmVj dGx5IG9uIExpbnV4LzY0Yml0IHdlIG5lZWQgdG86CgotIFNldCBGT1JDRV8zMkJJVCBvbiwgd2hp Y2ggd2lsbCBiZSByZWFkIGJ5IENNYWtlIHRvIHNldCBXVEZfQ1BVCmNvcnJlY3RseS4gSWRlYWxs eSB3ZSdkIGp1c3QgcmVkZWZpbmUgQ01BS0VfU1lTVEVNX1BST0NFU1NPUiwgYnV0CnVuZm9ydHVu YXRlbHkgQ01ha2Ugb25seSBhbGxvd3MgdXMgdG8gZG8gdGhpcyBkdXJpbmcKY3Jvc3Njb21waWxh dGlvbiwgd2hpY2ggaXMgb3ZlcmtpbGwgaGVyZS4KLSBTZXQgQ01BS0VfUFJFRklYX1BBVEggYW5k IENNQUtFX0xJQlJBUllfQVJDSElURUNUVVJFIHNvIHRoYXQgdGhlCnBrZy1jb25maWcgZGV0ZWN0 aW9uIG1vZHVsZSB1c2VzIHRoZSB4ODYgLnBjIGZpbGVzIGluc3RlYWQgb2YgdGhlCng4Nl82NCBv bmVzLgotIFNldCB0aGUgLW0zMiBmbGFncyBmb3IgdGhlIGNvbXBpbGVyLgoKKiBTY3JpcHRzL3dl YmtpdGRpcnMucG06CihnZW5lcmF0ZUJ1aWxkU3lzdGVtRnJvbUNNYWtlUHJvamVjdCk6Ci0tLQog Q01ha2VMaXN0cy50eHQgICAgICAgICAgICAgIHwgMTAgKysrKysrKysrLQogQ2hhbmdlTG9nICAg ICAgICAgICAgICAgICAgIHwgMTAgKysrKysrKysrKwogVG9vbHMvQ2hhbmdlTG9nICAgICAgICAg ICAgIHwgMjEgKysrKysrKysrKysrKysrKysrKysrCiBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMu cG0gfCAgOSArKysrKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgNDkgaW5zZXJ0aW9ucygrKSwgMSBk ZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL0NNYWtlTGlzdHMudHh0IGIvQ01ha2VMaXN0cy50eHQK aW5kZXggMzFhZGM0NDk2OGMuLjFlNzUzNzE1YzhmIDEwMDY0NAotLS0gYS9DTWFrZUxpc3RzLnR4 dAorKysgYi9DTWFrZUxpc3RzLnR4dApAQCAtOTMsNyArOTMsMTUgQEAgZWxzZWlmIChMT1dFUkNB U0VfQ01BS0VfU1lTVEVNX1BST0NFU1NPUiBNQVRDSEVTICJebWlwczY0IikKIGVsc2VpZiAoTE9X RVJDQVNFX0NNQUtFX1NZU1RFTV9QUk9DRVNTT1IgTUFUQ0hFUyAiXm1pcHMiKQogICAgIHNldChX VEZfQ1BVX01JUFMgMSkKIGVsc2VpZiAoTE9XRVJDQVNFX0NNQUtFX1NZU1RFTV9QUk9DRVNTT1Ig TUFUQ0hFUyAiKHg2NHx4ODZfNjR8YW1kNjQpIikKLSAgICBzZXQoV1RGX0NQVV9YODZfNjQgMSkK KyAgICAjIEZPUkNFXzMyQklUIGlzIHNldCBpbiB0aGUgYnVpbGQgc2NyaXB0IHdoZW4gLS0zMi1i aXQgaXMgcGFzc2VkCisgICAgIyBvbiBhIExpbnV4L2ludGVsIDY0Yml0IGhvc3QuIFRoaXMgYWxs b3dzIHVzIHRvIHByb2R1Y2UgMzJiaXQKKyAgICAjIGJpbmFyaWVzIHdpdGhvdXQgc2V0dGluZyB0 aGUgYnVpbGQgdXAgYXMgYSBjcm9zc2NvbXBpbGF0aW9uLAorICAgICMgd2hpY2ggaXMgdGhlIG9u bHkgd2F5IHRvIG1vZGlmeSBDTUFLRV9TWVNURU1fUFJPQ0VTU09SLgorICAgIGlmIChGT1JDRV8z MkJJVCkKKyAgICAgICAgc2V0KFdURl9DUFUgWDg2IDEpCisgICAgZWxzZSAoKQorICAgICAgICBz ZXQoV1RGX0NQVV9YODZfNjQgMSkKKyAgICBlbmRpZiAoKQogZWxzZWlmIChMT1dFUkNBU0VfQ01B S0VfU1lTVEVNX1BST0NFU1NPUiBNQVRDSEVTICIoaVszLTZdODZ8eDg2KSIpCiAgICAgc2V0KFdU Rl9DUFVfWDg2IDEpCiBlbHNlaWYgKExPV0VSQ0FTRV9DTUFLRV9TWVNURU1fUFJPQ0VTU09SIE1B VENIRVMgInBwYyIpCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggMGY3 ZGZkNGJiYTcuLjRlNmUzZGQxOWQ4IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTktMDItMDEgIFhhbiBMb3BleiAgPHhhbkBpZ2FsaWEu Y29tPgorCisgICAgICAgIFtDTWFrZV0gQnVpbGQgMzJiaXQgYmluYXJpZXMgb24gTGludXgvNjRi aXQgd2hlbiB0aGUgLS0zMi1iaXQgaXMgcGFzc2VkIHRvIGJ1aWxkLWpzYworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0MTQ3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBDTWFrZUxpc3RzLnR4dDogc2V0 IFdURl9DUFUgcHJvcGVybHkgaWYgRk9SQ0VfMzJCSVQgaXMgc2V0IGluCisgICAgICAgIGJ1aWxk LWpzYy4KKwogMjAxOS0wMy0wNyAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5v cmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI0MjM1NC4KZGlmZiAtLWdp dCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2N2NhZDlmYzRkOS4u YmY2NjlmZThiODEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxOS0wMi0wMSAgWGFuIExvcGV6ICA8eGFuQGlnYWxp YS5jb20+CisKKyAgICAgICAgW0NNYWtlXSBCdWlsZCAzMmJpdCBiaW5hcmllcyBvbiBMaW51eC82 NGJpdCB3aGVuIHRoZSAtLTMyLWJpdCBpcyBwYXNzZWQgdG8gYnVpbGQtanNjCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQxNDcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUbyBtYWtlIC0tMzItYml0IHdv cmsgY29ycmVjdGx5IG9uIExpbnV4LzY0Yml0IHdlIG5lZWQgdG86CisKKyAgICAgICAgLSBTZXQg Rk9SQ0VfMzJCSVQgb24sIHdoaWNoIHdpbGwgYmUgcmVhZCBieSBDTWFrZSB0byBzZXQgV1RGX0NQ VQorICAgICAgICBjb3JyZWN0bHkuIElkZWFsbHkgd2UnZCBqdXN0IHJlZGVmaW5lIENNQUtFX1NZ U1RFTV9QUk9DRVNTT1IsIGJ1dAorICAgICAgICB1bmZvcnR1bmF0ZWx5IENNYWtlIG9ubHkgYWxs b3dzIHVzIHRvIGRvIHRoaXMgZHVyaW5nCisgICAgICAgIGNyb3NzY29tcGlsYXRpb24sIHdoaWNo IGlzIG92ZXJraWxsIGhlcmUuCisgICAgICAgIC0gU2V0IENNQUtFX1BSRUZJWF9QQVRIIGFuZCBD TUFLRV9MSUJSQVJZX0FSQ0hJVEVDVFVSRSBzbyB0aGF0IHRoZQorICAgICAgICBwa2ctY29uZmln IGRldGVjdGlvbiBtb2R1bGUgdXNlcyB0aGUgeDg2IC5wYyBmaWxlcyBpbnN0ZWFkIG9mIHRoZQor ICAgICAgICB4ODZfNjQgb25lcy4KKyAgICAgICAgLSBTZXQgdGhlIC1tMzIgZmxhZ3MgZm9yIHRo ZSBjb21waWxlci4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAg KGdlbmVyYXRlQnVpbGRTeXN0ZW1Gcm9tQ01ha2VQcm9qZWN0KToKKwogMjAxOS0wMi0yMCAgWGFu IExvcGV6ICA8eGFuQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0pTQ11beDg2XSBEcm9wIHN1cHBv cnQgZm9yIHg4NyBmbG9hdGluZyBwb2ludApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IDVmMDI1NGRjYmJj Li5iYWY4NDRkOTMzYiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMjI2Miw2ICsyMjYyLDE1IEBAIHN1 YiBnZW5lcmF0ZUJ1aWxkU3lzdGVtRnJvbUNNYWtlUHJvamVjdAogICAgICMgU29tZSBwb3J0cyBo YXZlIHByb2R1Y3Rpb24gbW9kZSwgYnV0IGJ1aWxkLXdlYmtpdCBzaG91bGQgYWx3YXlzIHVzZSBk ZXZlbG9wZXIgbW9kZS4KICAgICBwdXNoIEBhcmdzLCAiLURERVZFTE9QRVJfTU9ERT1PTiIgaWYg aXNHdGsoKSB8fCBpc0pTQ09ubHkoKSB8fCBpc1dQRSgpIHx8IGlzV2luQ2Fpcm8oKTsKIAorICAg IGlmICgkYXJjaGl0ZWN0dXJlIGVxICJ4ODZfNjQiICYmIHNob3VsZEJ1aWxkMzJCaXQoKSkgewor ICAgICAgICAjIENNQUtFX0xJQlJBUllfQVJDSElURUNUVVJFIGlzIG5lZWRlZCB0byBnZXQgdGhl IHJpZ2h0IC5wYworICAgICAgICAjIGZpbGVzIGluIERlYmlhbi1iYXNlZCBzeXN0ZW1zLCBmb3Ig dGhlIG90aGVycworICAgICAgICAjIENNQUtFX1BSRUZJWF9QQVRIIHdpbGwgZ2V0IHVzIC91c3Iv bGliLCB3aGljaCBzaG91bGQgYmUgdGhlCisgICAgICAgICMgcmlnaHQgcGF0aCBmb3IgMzJiaXQu IFNlZSBGaW5kUGtnQ29uZmlnLmNtYWtlLgorICAgICAgICBwdXNoIEBjbWFrZUFyZ3MsICctREZP UkNFXzMyQklUPU9OIC1EQ01BS0VfUFJFRklYX1BBVEg9Ii91c3IiIC1EQ01BS0VfTElCUkFSWV9B UkNISVRFQ1RVUkU9eDg2JzsKKyAgICAgICAgJEVOVnsiQ0ZMQUdTIn0gPSAgIi1tMzIiIC4gKCRF TlZ7IkNGTEFHUyJ9IHx8ICIiKTsKKyAgICAgICAgJEVOVnsiQ1hYRkxBR1MifSA9ICItbTMyIiAu ICgkRU5WeyJDWFhGTEFHUyJ9IHx8ICIiKTsKKyAgICB9CiAgICAgcHVzaCBAYXJncywgQGNtYWtl QXJncyBpZiBAY21ha2VBcmdzOwogCiAgICAgbXkgJGNtYWtlU291cmNlRGlyID0gaXNDeWd3aW4o KSA/IHdpbmRvd3NTb3VyY2VEaXIoKSA6IHNvdXJjZURpcigpOwotLSAKMi4yMC4xCgo=