135848 2014-08-12 12:43:39 -0700 [iOS] Make JavaScriptCore and bmalloc build with the public SDK 2014-08-13 12:43:47 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) iPhone / iPad Unspecified RESOLVED FIXED P2 Normal --- 135843 1 dbates dbates aestes commit-queue ddkilzer dfarler ggaren joepeck oldest_to_newest 1028564 0 dbates 2014-08-12 12:43:39 -0700 Towards getting iOS WebKit built using the iOS public SDK, get the WTF, JavaScriptCore, and bmalloc projects building with the iOS public SDK. 1028568 1 236459 dbates 2014-08-12 12:48:56 -0700 Created attachment 236459 Patch 1028571 2 commit-queue 2014-08-12 12:51:36 -0700 Attachment 236459 did not pass style-queue: ERROR: Source/bmalloc/bmalloc/PerThread.h:36: __PTK_FRAMEWORK_JAVASCRIPTCORE_KEY0 is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1028578 3 236459 joepeck 2014-08-12 13:05:18 -0700 Comment on attachment 236459 Patch Remote Inspector changes look fine to me. 1028595 4 236459 ggaren 2014-08-12 13:57:26 -0700 Comment on attachment 236459 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236459&action=review r=me > Source/bmalloc/bmalloc/PerThread.h:39 > +#elif BPLATFORM(IOS_SIMULATOR) > +const pthread_key_t __PTK_FRAMEWORK_JAVASCRIPTCORE_KEY0 = 90; > +INLINE int _pthread_setspecific_direct(pthread_key_t key, const void* value) { return pthread_setspecific(key, value); } > +INLINE void* _pthread_getspecific_direct(pthread_key_t key) { return pthread_getspecific(key); } > +extern "C" int pthread_key_init_np(int, void (*destructor)(void*)); Does the __thread code patch not work in the iOS simulator? If it does work, I think it would be slightly better, so we wouldn't have the brittleness of defining this constant for ourselves. 1028694 5 mrowe 2014-08-12 18:52:58 -0700 It's not necessary to check defined(__has_include) in Mac-only files. 1028866 6 dbates 2014-08-13 12:31:49 -0700 (In reply to comment #4) > (From update of attachment 236459 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=236459&action=review > > r=me > > > Source/bmalloc/bmalloc/PerThread.h:39 > > +#elif BPLATFORM(IOS_SIMULATOR) > > +const pthread_key_t __PTK_FRAMEWORK_JAVASCRIPTCORE_KEY0 = 90; > > +INLINE int _pthread_setspecific_direct(pthread_key_t key, const void* value) { return pthread_setspecific(key, value); } > > +INLINE void* _pthread_getspecific_direct(pthread_key_t key) { return pthread_getspecific(key); } > > +extern "C" int pthread_key_init_np(int, void (*destructor)(void*)); > > Does the __thread code patch not work in the iOS simulator? If it does work, I think it would be slightly better, so we wouldn't have the brittleness of defining this constant for ourselves. No, __thread isn't available when building for iOS Simulator. Filed bug #135895 to consider adding logic for toolchains that don't support C++ thread local storage. I'll add a FIXME comment that references bug #135895 for now. 1028867 7 dbates 2014-08-13 12:32:27 -0700 (In reply to comment #5) > It's not necessary to check defined(__has_include) in Mac-only files. Will remove the check for "defined(__has_include) " from the Mac-only files in this patch before landing. 1028869 8 dbates 2014-08-13 12:43:47 -0700 Committed r172532: <http://trac.webkit.org/changeset/172532> 236459 2014-08-12 12:48:56 -0700 2014-08-12 13:57:25 -0700 Patch bug-135848-20140812124846.patch text/plain 9932 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyNDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm MzNmMmJmY2QwZTQ3ZDI1ZTY2ZTljMzUwZDY4NjQyNGMyYWNjYTE2Li44YTZiODkwOWE4OTM5ZmVk MmIyMjlkMWUwMzJiYmYxZmU4MzM3MjNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxNC0wOC0xMiAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+ CisKKyAgICAgICAgW2lPU10gTWFrZSBXVEYsIEphdmFTY3JpcHRDb3JlLCBhbmQgYm1hbGxvYyBi dWlsZCB3aXRoIHRoZSBwdWJsaWMgU0RLCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzU4NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIEFQSS9KU0Jhc2UuaDogRGVjbGFyZSBOU01hcCBmdW5jdGlvbnMg d2l0aCBleHRlcm5hbCBsaW5rYWdlIHdoZW4gYnVpbGRpbmcgZm9yIGlPUyB3aXRob3V0IHRoZQor ICAgICAgICBoZWFkZXIgPEZvdW5kYXRpb24vTlNNYXBUYWJsZVByaXYuaD4uCisgICAgICAgICog aW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IubW06IERlZmluZSBYUEMgZnVuY3Rpb25z IHdpdGggZXh0ZXJuYWwgbGlua2FnZSB3aGVuIGJ1aWxkaW5nCisgICAgICAgIHdpdGhvdXQgdGhl IHN5c3RlbSBoZWFkZXIgPHhwYy94cGMuaD4uCisgICAgICAgICogaW5zcGVjdG9yL3JlbW90ZS9S ZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uLmg6IERlZmluZSB4cGNfY29ubmVjdGlvbl90IGFu ZCB4cGNfb2JqZWN0X3Qgd2hlbiBidWlsZGluZworICAgICAgICB3aXRob3V0IHRoZSBzeXN0ZW0g aGVhZGVyIDx4cGMveHBjLmg+LgorICAgICAgICAqIGluc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5z cGVjdG9yWFBDQ29ubmVjdGlvbi5tbTogRGVjbGFyZSBYUEMgZnVuY3Rpb25zIHdpdGggZXh0ZXJu YWwgbGlua2FnZSB3aGVuCisgICAgICAgIGJ1aWxkaW5nIHdpdGhvdXQgd2l0aG91dCB0aGUgc3lz dGVtIGhlYWRlciA8eHBjL3hwYy5oPi4KKyAgICAgICAgKEluc3BlY3Rvcjo6UmVtb3RlSW5zcGVj dG9yWFBDQ29ubmVjdGlvbjo6Y2xvc2VPblF1ZXVlKTogRml4IGNvZGUgc3R5bGU7IHVzZSBudWxs cHRyIGluc3RlYWQgb2YgTlVMTC4KKyAgICAgICAgKEluc3BlY3Rvcjo6UmVtb3RlSW5zcGVjdG9y WFBDQ29ubmVjdGlvbjo6c2VuZE1lc3NhZ2UpOiBEaXR0by4KKwogMjAxNC0wOC0xMSAgTWljaGFl bCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4KIAogICAgICAgICBFbGltaW5hdGUge3B1c2gs cG9wfUNhbGxlZVNhdmVzIGluIGZhdm9yIG9mIGluZGl2aWR1YWwgcHVzaGVzICYgcG9wcwpkaWZm IC0tZ2l0IGEvU291cmNlL2JtYWxsb2MvQ2hhbmdlTG9nIGIvU291cmNlL2JtYWxsb2MvQ2hhbmdl TG9nCmluZGV4IGNiNTA0MGE3NzYxOTA3MDI5MWIxYTdlM2RjNGRhZWExN2EzN2U5MTcuLjA4ODc0 NjU0MTg2ZDNkZjY4MjgzNTJiOWEyMGViY2U1YTIwZDQ2MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9i bWFsbG9jL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvYm1hbGxvYy9DaGFuZ2VMb2cKQEAgLTEsNSAr MSwyMSBAQAogMjAxNC0wOC0xMiAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAK KyAgICAgICAgW2lPU10gTWFrZSBXVEYsIEphdmFTY3JpcHRDb3JlLCBhbmQgYm1hbGxvYyBidWls ZCB3aXRoIHRoZSBwdWJsaWMgU0RLCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzU4NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGJtYWxsb2MvQlBsYXRmb3JtLmg6IEFkZGVkIG1hY3JvIEJQTEFURk9S TV9JT1NfU0lNVUxBVE9SLCB3aGljaCBldmFsdWF0ZXMgdG8gdHJ1ZQorICAgICAgICB3aGVuIGJ1 aWxkaW5nIGZvciB0aGUgaU9TIFNpbXVsYXRvci4KKyAgICAgICAgKiBibWFsbG9jL1BlclRocmVh ZC5oOiBVc2UgcHRocmVhZF9tYWNoZGVwLmggY29kZSBwYXRoIHdoZW4gYnVpbGRpbmcgZm9yIGlP UyBTaW11bGF0b3IKKyAgICAgICAgdXNpbmcgdGhlIHB1YmxpYyBTREsuCisgICAgICAgIChfcHRo cmVhZF9zZXRzcGVjaWZpY19kaXJlY3QpOiBBZGRlZDsgb25seSBkZWZpbmVkIHdoZW4gYnVpbGRp bmcgZm9yIHRoZSBpT1MgU2ltdWxhdG9yCisgICAgICAgIHVzaW5nIHRoZSBwdWJsaWMgU0RLLgor ICAgICAgICAoX3B0aHJlYWRfZ2V0c3BlY2lmaWNfZGlyZWN0KTogQWRkZWQ7IG9ubHkgZGVmaW5l ZCB3aGVuIGJ1aWxkaW5nIGZvciB0aGUgaU9TIFNpbXVsYXRvcgorICAgICAgICB1c2luZyB0aGUg cHVibGljIFNESy4KKworMjAxNC0wOC0xMiAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5j b20+CisKICAgICAgICAgQlBMQVRGT1JNKElPUykgYWx3YXlzIGV2YWx1YXRlcyB0byBmYWxzZQog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1ODQzCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNCYXNlLmggYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvQVBJL0pTQmFzZS5oCmluZGV4IDdkMGVhM2E1M2Q0M2MyMWQ4OWQzYThi MDM4MzFjYmExZDQ4N2VmNTMuLjg5MzUyYjAyZWQ4NzFjN2U2M2U2ZjIzNTU3MDZiNWZjZmM0Yjk2 NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNCYXNlLmgKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0Jhc2UuaApAQCAtMzIsNyArMzIsMTkgQEAKIAog I2lmZGVmIF9fT0JKQ19fCiAjaW1wb3J0IDxGb3VuZGF0aW9uL0ZvdW5kYXRpb24uaD4KKworI2lm IGRlZmluZWQoVEFSR0VUX09TX0lQSE9ORSkgJiYgVEFSR0VUX09TX0lQSE9ORQorI2lmIGRlZmlu ZWQoX19oYXNfaW5jbHVkZSkgJiYgX19oYXNfaW5jbHVkZSg8Rm91bmRhdGlvbi9OU01hcFRhYmxl UHJpdi5oPikKKyNpbXBvcnQgPEZvdW5kYXRpb24vTlNNYXBUYWJsZVByaXYuaD4KKyNlbHNlCitl eHRlcm4gIkMiIHsKKyAgICB2b2lkICpOU01hcEdldChOU01hcFRhYmxlICosIGNvbnN0IHZvaWQg KmtleSk7CisgICAgdm9pZCBOU01hcEluc2VydChOU01hcFRhYmxlICosIGNvbnN0IHZvaWQgKmtl eSwgY29uc3Qgdm9pZCAqdmFsdWUpOworICAgIHZvaWQgTlNNYXBSZW1vdmUoTlNNYXBUYWJsZSAq LCBjb25zdCB2b2lkICprZXkpOworfQogI2VuZGlmCisjZW5kaWYgLy8gZGVmaW5lZChUQVJHRVRf T1NfSVBIT05FKSAmJiBUQVJHRVRfT1NfSVBIT05FCisjZW5kaWYgLy8gX19PQkpDX18KIAogLyog SmF2YVNjcmlwdCBlbmdpbmUgaW50ZXJmYWNlICovCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5tbSBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5tbQppbmRleCA5 ZTA1ODAxMmRkMzkxYWNkNGIzMmRkODJiZmJiYzYyMTc0MzJiNzZiLi4zNGJjYzc5MmNhZjUwZDkx NGVlMGZiN2UxNTlhMGI3ZWFkNGRjZTM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IubW0KKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLm1tCkBAIC0zNyw3ICsz NywxNSBAQAogI2ltcG9ydCA8d3RmL0Fzc2VydGlvbnMuaD4KICNpbXBvcnQgPHd0Zi9OZXZlckRl c3Ryb3llZC5oPgogI2ltcG9ydCA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CisKKyNpZiBkZWZpbmVk KF9faGFzX2luY2x1ZGUpICYmIF9faGFzX2luY2x1ZGUoPHhwYy94cGMuaD4pCiAjaW1wb3J0IDx4 cGMveHBjLmg+CisjZWxzZQorZXh0ZXJuICJDIiB7CisgICAgeHBjX2Nvbm5lY3Rpb25fdCB4cGNf Y29ubmVjdGlvbl9jcmVhdGVfbWFjaF9zZXJ2aWNlKGNvbnN0IGNoYXIqIG5hbWUsIGRpc3BhdGNo X3F1ZXVlX3QsIHVpbnQ2NF90IGZsYWdzKTsKKyAgICB2b2lkIHhwY19yZWxlYXNlKHhwY19vYmpl Y3RfdCk7Cit9CisjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPUykKICNpbXBvcnQgPHd0Zi9pb3Mv V2ViQ29yZVRocmVhZC5oPgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3Bl Y3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5oIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5o CmluZGV4IGYxZmU4MTljZTcwNzYzNWJmZTUwNGE1Zjg4MDA4OGQ2MzEyMzBmYjYuLmExYjVjZDE4 Y2ZmMDE4MmFjYmQ5ODcxMmI1MGI2NzFmYmEyMzE0NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24u aAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNw ZWN0b3JYUENDb25uZWN0aW9uLmgKQEAgLTMxLDcgKzMxLDEzIEBACiAjaW1wb3J0IDxkaXNwYXRj aC9kaXNwYXRjaC5oPgogI2ltcG9ydCA8bXV0ZXg+CiAjaW1wb3J0IDx3dGYvVGhyZWFkU2FmZVJl ZkNvdW50ZWQuaD4KKworI2lmIGRlZmluZWQoX19oYXNfaW5jbHVkZSkgJiYgX19oYXNfaW5jbHVk ZSg8eHBjL3hwYy5oPikKICNpbXBvcnQgPHhwYy94cGMuaD4KKyNlbHNlCit0eXBlZGVmIHZvaWQq IHhwY19jb25uZWN0aW9uX3Q7Cit0eXBlZGVmIHZvaWQqIHhwY19vYmplY3RfdDsKKyNlbmRpZgog CiBPQkpDX0NMQVNTIE5TRGljdGlvbmFyeTsKIE9CSkNfQ0xBU1MgTlNTdHJpbmc7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0 b3JYUENDb25uZWN0aW9uLm1tIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1v dGUvUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5tbQppbmRleCBhZjFjY2M1MWMzZjg2MTE0 Mzg1OWI4ZGY5NDNiMjg3YzllY2QwMzg1Li43ZjMyMDFiMmRlMTgwYmJkOGU0MmRlODZjYWFmOTBh OWQzY2M1ZGU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Jl bW90ZS9SZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uLm1tCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24ubW0K QEAgLTMyLDExICszMiwzOCBAQAogI2ltcG9ydCA8d3RmL0Fzc2VydGlvbnMuaD4KICNpbXBvcnQg PHd0Zi9SZWYuaD4KIAotI2lmIF9faGFzX2luY2x1ZGUoPENvcmVGb3VuZGF0aW9uL0NGWFBDQnJp ZGdlLmg+KQorI2lmICFkZWZpbmVkKF9faGFzX2luY2x1ZGUpIHx8ICFfX2hhc19pbmNsdWRlKDx4 cGMveHBjLmg+KQorZXh0ZXJuICJDIiB7CisgICAgdHlwZWRlZiB2b2lkICheeHBjX2hhbmRsZXJf dCkoeHBjX29iamVjdF90KTsKKyAgICB2b2lkIHhwY19jb25uZWN0aW9uX2NhbmNlbCh4cGNfY29u bmVjdGlvbl90KTsKKyAgICB2b2lkIHhwY19jb25uZWN0aW9uX3Jlc3VtZSh4cGNfY29ubmVjdGlv bl90KTsKKyAgICB2b2lkIHhwY19jb25uZWN0aW9uX3NlbmRfbWVzc2FnZSh4cGNfY29ubmVjdGlv bl90LCB4cGNfb2JqZWN0X3QgbWVzc2FnZSk7CisgICAgdm9pZCB4cGNfY29ubmVjdGlvbl9zZXRf ZXZlbnRfaGFuZGxlcih4cGNfY29ubmVjdGlvbl90LCB4cGNfaGFuZGxlcl90KTsKKyAgICB2b2lk IHhwY19jb25uZWN0aW9uX3NldF90YXJnZXRfcXVldWUoeHBjX2Nvbm5lY3Rpb25fdCwgZGlzcGF0 Y2hfcXVldWVfdCk7CisKKyAgICB4cGNfb2JqZWN0X3QgeHBjX3JldGFpbih4cGNfb2JqZWN0X3Qp OworICAgIHZvaWQgeHBjX3JlbGVhc2UoeHBjX29iamVjdF90KTsKKworICAgIHR5cGVkZWYgdm9p ZCogeHBjX3R5cGVfdDsKKyAgICB4cGNfdHlwZV90IHhwY19nZXRfdHlwZSh4cGNfb2JqZWN0X3Qp OworCisgICAgdm9pZCogWFBDX0VSUk9SX0NPTk5FQ1RJT05fSU5WQUxJRDsKKyAgICB2b2lkKiBY UENfVFlQRV9ESUNUSU9OQVJZOworICAgIHZvaWQqIFhQQ19UWVBFX0VSUk9SOworCisgICAgeHBj X29iamVjdF90IHhwY19kaWN0aW9uYXJ5X2NyZWF0ZShjb25zdCBjaGFyKiBjb25zdCoga2V5cywg Y29uc3QgeHBjX29iamVjdF90KiB2YWx1ZXMsIHNpemVfdCBjb3VudCk7CisgICAgeHBjX29iamVj dF90IHhwY19kaWN0aW9uYXJ5X2dldF92YWx1ZSh4cGNfb2JqZWN0X3QsIGNvbnN0IGNoYXIqIGtl eSk7CisgICAgdm9pZCB4cGNfZGljdGlvbmFyeV9zZXRfdmFsdWUoeHBjX29iamVjdF90LCBjb25z dCBjaGFyKiBrZXksIHhwY19vYmplY3RfdCB2YWx1ZSk7Cit9CisjZW5kaWYKKworI2lmIGRlZmlu ZWQoX19oYXNfaW5jbHVkZSkgJiYgX19oYXNfaW5jbHVkZSg8Q29yZUZvdW5kYXRpb24vQ0ZYUENC cmlkZ2UuaD4pCiAjaW1wb3J0IDxDb3JlRm91bmRhdGlvbi9DRlhQQ0JyaWRnZS5oPgogI2Vsc2UK LWV4dGVybiAiQyIgeHBjX29iamVjdF90IF9DRlhQQ0NyZWF0ZVhQQ01lc3NhZ2VXaXRoQ0ZPYmpl Y3QoQ0ZUeXBlUmVmKTsKLWV4dGVybiAiQyIgQ0ZUeXBlUmVmIF9DRlhQQ0NyZWF0ZUNGT2JqZWN0 RnJvbVhQQ01lc3NhZ2UoeHBjX29iamVjdF90KTsKK2V4dGVybiAiQyIgeworICAgIHhwY19vYmpl Y3RfdCBfQ0ZYUENDcmVhdGVYUENNZXNzYWdlV2l0aENGT2JqZWN0KENGVHlwZVJlZik7CisgICAg Q0ZUeXBlUmVmIF9DRlhQQ0NyZWF0ZUNGT2JqZWN0RnJvbVhQQ01lc3NhZ2UoeHBjX29iamVjdF90 KTsKK30KICNlbmRpZgogCiBuYW1lc3BhY2UgSW5zcGVjdG9yIHsKQEAgLTk2LDEyICsxMjMsMTIg QEAgdm9pZCBSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uOjpjbG9zZU9uUXVldWUoKQogICAg IGlmIChtX2Nvbm5lY3Rpb24pIHsKICAgICAgICAgeHBjX2Nvbm5lY3Rpb25fY2FuY2VsKG1fY29u bmVjdGlvbik7CiAgICAgICAgIHhwY19yZWxlYXNlKG1fY29ubmVjdGlvbik7Ci0gICAgICAgIG1f Y29ubmVjdGlvbiA9IE5VTEw7CisgICAgICAgIG1fY29ubmVjdGlvbiA9IG51bGxwdHI7CiAgICAg fQogCiAgICAgaWYgKG1fcXVldWUpIHsKICAgICAgICAgZGlzcGF0Y2hfcmVsZWFzZShtX3F1ZXVl KTsKLSAgICAgICAgbV9xdWV1ZSA9IE5VTEw7CisgICAgICAgIG1fcXVldWUgPSBudWxscHRyOwog ICAgIH0KIH0KIApAQCAtMTcwLDcgKzE5Nyw3IEBAIHZvaWQgUmVtb3RlSW5zcGVjdG9yWFBDQ29u bmVjdGlvbjo6c2VuZE1lc3NhZ2UoTlNTdHJpbmcgKm1lc3NhZ2VOYW1lLCBOU0RpY3Rpb25hCiAg ICAgaWYgKCF4cGNEaWN0aW9uYXJ5KQogICAgICAgICByZXR1cm47CiAKLSAgICB4cGNfb2JqZWN0 X3QgbXNnID0geHBjX2RpY3Rpb25hcnlfY3JlYXRlKE5VTEwsIE5VTEwsIDApOworICAgIHhwY19v YmplY3RfdCBtc2cgPSB4cGNfZGljdGlvbmFyeV9jcmVhdGUobnVsbHB0ciwgbnVsbHB0ciwgMCk7 CiAgICAgeHBjX2RpY3Rpb25hcnlfc2V0X3ZhbHVlKG1zZywgUmVtb3RlSW5zcGVjdG9yWFBDQ29u bmVjdGlvblNlcmlhbGl6ZWRNZXNzYWdlS2V5LCB4cGNEaWN0aW9uYXJ5KTsKICAgICB4cGNfcmVs ZWFzZSh4cGNEaWN0aW9uYXJ5KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL2JtYWxsb2MvYm1hbGxv Yy9CUGxhdGZvcm0uaCBiL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvQlBsYXRmb3JtLmgKaW5kZXgg ZjNhYWU4YmExMDZhMzM4MDcwMWVjNzdhMWI0NGVkOGFkYjJhZTEyZi4uNzQ2YWE2MTFmMzc4NThh YWMwZTM2YTdjNjc3Njg3NjdmNjVjM2MyNiAxMDA2NDQKLS0tIGEvU291cmNlL2JtYWxsb2MvYm1h bGxvYy9CUGxhdGZvcm0uaAorKysgYi9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0JQbGF0Zm9ybS5o CkBAIC0zOCw0ICszOCw4IEBACiAjZGVmaW5lIEJQTEFURk9STV9JT1MgMQogI2VuZGlmCiAKKyNp ZiBkZWZpbmVkKFRBUkdFVF9JUEhPTkVfU0lNVUxBVE9SKSAmJiBUQVJHRVRfSVBIT05FX1NJTVVM QVRPUgorI2RlZmluZSBCUExBVEZPUk1fSU9TX1NJTVVMQVRPUiAxCisjZW5kaWYKKwogI2VuZGlm IC8vIEJQbGF0Zm9ybV9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL1BlclRo cmVhZC5oIGIvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9QZXJUaHJlYWQuaAppbmRleCBmMjAzMzIw NmQ4NWZjMTY2ODIyNjkxZmU5YmI3MzlmMDA0NDA5YmJhLi42NDVhMTBlMjdiZTVkZDZiZDQzYzBj ZjNlODkzZjM5NjI0NjY0YjM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL1Bl clRocmVhZC5oCisrKyBiL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvUGVyVGhyZWFkLmgKQEAgLTI2 LDExICsyNiwxNyBAQAogI2lmbmRlZiBQZXJUaHJlYWRfaAogI2RlZmluZSBQZXJUaHJlYWRfaAog CisjaW5jbHVkZSAiQlBsYXRmb3JtLmgiCiAjaW5jbHVkZSAiSW5saW5lLmgiCiAjaW5jbHVkZSA8 bXV0ZXg+CiAjaW5jbHVkZSA8cHRocmVhZC5oPgogI2lmIGRlZmluZWQoX19oYXNfaW5jbHVkZSkg JiYgX19oYXNfaW5jbHVkZSg8U3lzdGVtL3B0aHJlYWRfbWFjaGRlcC5oPikKICNpbmNsdWRlIDxT eXN0ZW0vcHRocmVhZF9tYWNoZGVwLmg+CisjZWxpZiBCUExBVEZPUk0oSU9TX1NJTVVMQVRPUikK K2NvbnN0IHB0aHJlYWRfa2V5X3QgX19QVEtfRlJBTUVXT1JLX0pBVkFTQ1JJUFRDT1JFX0tFWTAg PSA5MDsKK0lOTElORSBpbnQgX3B0aHJlYWRfc2V0c3BlY2lmaWNfZGlyZWN0KHB0aHJlYWRfa2V5 X3Qga2V5LCBjb25zdCB2b2lkKiB2YWx1ZSkgeyByZXR1cm4gcHRocmVhZF9zZXRzcGVjaWZpYyhr ZXksIHZhbHVlKTsgfQorSU5MSU5FIHZvaWQqIF9wdGhyZWFkX2dldHNwZWNpZmljX2RpcmVjdChw dGhyZWFkX2tleV90IGtleSkgeyByZXR1cm4gcHRocmVhZF9nZXRzcGVjaWZpYyhrZXkpOyB9Citl eHRlcm4gIkMiIGludCBwdGhyZWFkX2tleV9pbml0X25wKGludCwgdm9pZCAoKmRlc3RydWN0b3Ip KHZvaWQqKSk7CiAjZW5kaWYKIAogbmFtZXNwYWNlIGJtYWxsb2MgewpAQCAtNTMsOCArNTksNyBA QCBjbGFzcyBDYWNoZTsKIAogdGVtcGxhdGU8dHlwZW5hbWUgVD4gc3RydWN0IFBlclRocmVhZFN0 b3JhZ2U7CiAKLSNpZiBkZWZpbmVkKF9faGFzX2luY2x1ZGUpICYmIF9faGFzX2luY2x1ZGUoPFN5 c3RlbS9wdGhyZWFkX21hY2hkZXAuaD4pCi0KKyNpZiAoZGVmaW5lZChfX2hhc19pbmNsdWRlKSAm JiBfX2hhc19pbmNsdWRlKDxTeXN0ZW0vcHRocmVhZF9tYWNoZGVwLmg+KSkgfHwgQlBMQVRGT1JN KElPU19TSU1VTEFUT1IpCiAvLyBGb3Igbm93LCB3ZSBvbmx5IHN1cHBvcnQgUGVyVGhyZWFkPENh Y2hlPi4gV2UgY2FuIGV4cGFuZCB0byBvdGhlciB0eXBlcyBieQogLy8gdXNpbmcgbW9yZSBrZXlz LgogCkBAIC05MCw3ICs5NSw3IEBAIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IF9fdGhyZWFkIHZvaWQq IFBlclRocmVhZFN0b3JhZ2U8VD46Om9iamVjdDsKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHB0aHJl YWRfa2V5X3QgUGVyVGhyZWFkU3RvcmFnZTxUPjo6a2V5OwogdGVtcGxhdGU8dHlwZW5hbWUgVD4g c3RkOjpvbmNlX2ZsYWcgUGVyVGhyZWFkU3RvcmFnZTxUPjo6b25jZUZsYWc7CiAKLSNlbmRpZiAv LyBkZWZpbmVkKF9faGFzX2luY2x1ZGUpICYmIF9faGFzX2luY2x1ZGUoPFN5c3RlbS9wdGhyZWFk X21hY2hkZXAuaD4pCisjZW5kaWYgLy8gKGRlZmluZWQoX19oYXNfaW5jbHVkZSkgJiYgX19oYXNf aW5jbHVkZSg8U3lzdGVtL3B0aHJlYWRfbWFjaGRlcC5oPikpIHx8IEJQTEFURk9STShJT1NfU0lN VUxBVE9SKQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgogSU5MSU5FIFQqIFBlclRocmVhZDxUPjo6 Z2V0RmFzdENhc2UoKQo=