211410 2020-05-04 16:24:29 -0700 [ANGLE] Correct Catalyst guards 2020-06-19 14:03:44 -0700 1 1 1 Unclassified WebKit ANGLE WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard achristensen dino ews-watchlist graouts jdarpinian jonlee kbr kondapallykalyan krollin saam webkit-bug-importer oldest_to_newest 1648810 0 jbedard 2020-05-04 16:24:29 -0700 In a few places, ANGLE declares classes that are explicitly not defined on certain platforms. Declarations and definitions should match so that failures are in ANGLE instead of the libraries that link it. 1648814 1 398431 jbedard 2020-05-04 16:30:26 -0700 Created attachment 398431 Patch 1648815 2 ews-watchlist 2020-05-04 16:31:04 -0700 Note that there are important steps to take when updating ANGLE. See http://trac.webkit.org/wiki/UpdatingANGLE 1648827 3 jbedard 2020-05-04 16:39:03 -0700 Discovered this when working on the watchOS build. We end up declaring classes that aren't defined, which can create headaches for projects which attempt to link against those classes. Under the philosophy that errors should happen as soon as possible in the build process, I think we should guard the class declarations with the same macros that the class definitions are guarded with. 1649223 4 kbr 2020-05-05 09:09:43 -0700 Thanks for finding and fixing these build issues - they look good to me. Have filed https://bugs.chromium.org/p/angleproject/issues/detail?id=4613 about upstreaming these changes into the ANGLE project to make future rolls of ANGLE into WebKit easier. 1649237 5 jbedard 2020-05-05 09:31:36 -0700 (In reply to Kenneth Russell from comment #4) > Thanks for finding and fixing these build issues - they look good to me. > > Have filed https://bugs.chromium.org/p/angleproject/issues/detail?id=4613 > about upstreaming these changes into the ANGLE project to make future rolls > of ANGLE into WebKit easier. There is a decent chance there will be more changes like this in the next week or two. 1649240 6 ews-feeder 2020-05-05 09:39:02 -0700 Committed r261176: <https://trac.webkit.org/changeset/261176> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398431. 1649241 7 webkit-bug-importer 2020-05-05 09:40:14 -0700 <rdar://problem/62891185> 1649297 8 saam 2020-05-05 11:43:24 -0700 Reverted r261176 for reason: It broke the build Committed r261185: <https://trac.webkit.org/changeset/261185> 1664421 9 jbedard 2020-06-19 10:56:51 -0700 Trying this again, tested more builds this time. 1664424 10 402295 jbedard 2020-06-19 11:03:38 -0700 Created attachment 402295 Patch 1664506 11 ews-feeder 2020-06-19 14:03:42 -0700 Committed r263284: <https://trac.webkit.org/changeset/263284> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402295. 398431 2020-05-04 16:30:26 -0700 2020-06-19 11:03:36 -0700 Patch bug-211410-20200504163025.patch text/plain 5820 jbedard SW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2MTEyMSkKKysrIFNv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDIxIEBACisyMDIwLTA1LTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4K KworICAgICAgICBbQU5HTEVdIERlY2xhcmF0aW9ucyBzaG91bGQgbWF0Y2ggZGVmaW5pdGlvbnMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMTQxMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3JjL2xp YkFOR0xFL3JlbmRlcmVyL2dsL2VhZ2wvRGlzcGxheUVBR0wuaDogU2tpcCBkZWZpbml0aW9ucyBm b3IgcGxhdGZvcm1zCisgICAgICAgIHdoZXJlIGNsYXNzIGlzIHVuZGVmaW5lZC4KKyAgICAgICAg KiBzcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvZWFnbC9EaXNwbGF5RUFHTC5tbToKKyAgICAgICAg KHJ4OjpEaXNwbGF5RUFHTDo6Z2VuZXJhdGVDb25maWdzKTogRnVuY3Rpb24gaXMgbm90IGRlZmlu ZWQgZm9yIGZvciBNYWNDYXRhbHlzdC4KKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIv Z2wvZWFnbC9JT1N1cmZhY2VTdXJmYWNlRUFHTC5oOiBTa2lwIGRlZmluaXRpb25zIGZvciBwbGF0 Zm9ybXMKKyAgICAgICAgd2hlcmUgY2xhc3MgaXMgdW5kZWZpbmVkLgorICAgICAgICAqIHNyYy9s aWJBTkdMRS9yZW5kZXJlci9nbC9lYWdsL0lPU3VyZmFjZVN1cmZhY2VFQUdMLm1tOgorICAgICAg ICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9lYWdsL1dpbmRvd1N1cmZhY2VFQUdMLmg6IFNr aXAgZGVmaW5pdGlvbnMgZm9yIHBsYXRmb3JtcworICAgICAgICB3aGVyZSBjbGFzcyBpcyB1bmRl ZmluZWQuCisgICAgICAgICogc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL2VhZ2wvV2luZG93U3Vy ZmFjZUVBR0wubW06CisKIDIwMjAtMDQtMjggIENoYW5nU2VvayBPaCAgPGNoYW5nc2Vva0B3ZWJr aXQub3JnPgogCiAgICAgICAgIFtHVEtdIEZpeCBidWlsZCBmYWlsdXJlcyBmb3IgQU5HTEVfV0VC R0wgYWZ0ZXIgcjI1OTU4OQpJbmRleDogU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFO R0xFL3JlbmRlcmVyL2dsL2VhZ2wvRGlzcGxheUVBR0wuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv VGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvZWFnbC9EaXNwbGF5RUFH TC5oCShyZXZpc2lvbiAyNjEwODgpCisrKyBTb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGli QU5HTEUvcmVuZGVyZXIvZ2wvZWFnbC9EaXNwbGF5RUFHTC5oCSh3b3JraW5nIGNvcHkpCkBAIC05 LDYgKzksMTAgQEAKICNpZm5kZWYgTElCQU5HTEVfUkVOREVSRVJfR0xfRUFHTF9ESVNQTEFZRUFH TF9IXwogI2RlZmluZSBMSUJBTkdMRV9SRU5ERVJFUl9HTF9FQUdMX0RJU1BMQVlFQUdMX0hfCiAK KyNpbmNsdWRlICJjb21tb24vcGxhdGZvcm0uaCIKKworI2lmIGRlZmluZWQoQU5HTEVfUExBVEZP Uk1fSU9TKSAmJiAhZGVmaW5lZChBTkdMRV9QTEFURk9STV9NQUNDQVRBTFlTVCkKKwogI2luY2x1 ZGUgImxpYkFOR0xFL3JlbmRlcmVyL2dsL0Rpc3BsYXlHTC5oIgogCiAjaWZkZWYgX19PQkpDX18K QEAgLTkzLDQgKzk3LDYgQEAgY2xhc3MgRGlzcGxheUVBR0wgOiBwdWJsaWMgRGlzcGxheUdMCiAK IH0gIC8vIG5hbWVzcGFjZSByeAogCisjZW5kaWYgIC8vIGRlZmluZWQoQU5HTEVfUExBVEZPUk1f SU9TKSAmJiAhZGVmaW5lZChBTkdMRV9QTEFURk9STV9NQUNDQVRBTFlTVCkKKwogI2VuZGlmICAv LyBMSUJBTkdMRV9SRU5ERVJFUl9HTF9FQUdMX0RJU1BMQVlFQUdMX0hfCkluZGV4OiBTb3VyY2Uv VGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvZWFnbC9EaXNwbGF5RUFH TC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUv cmVuZGVyZXIvZ2wvZWFnbC9EaXNwbGF5RUFHTC5tbQkocmV2aXNpb24gMjYxMDg4KQorKysgU291 cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL2VhZ2wvRGlzcGxh eUVBR0wubW0JKHdvcmtpbmcgY29weSkKQEAgLTIwNSwxMSArMjA1LDcgQEAgZWdsOjpDb25maWdT ZXQgRGlzcGxheUVBR0w6OmdlbmVyYXRlQ29uZgogICAgIGNvbmZpZy5iaW5kVG9UZXh0dXJlUkdC ICA9IEVHTF9GQUxTRTsKICAgICBjb25maWcuYmluZFRvVGV4dHVyZVJHQkEgPSBFR0xfRkFMU0U7 CiAKLSMgICAgaWYgIUFOR0xFX1BMQVRGT1JNX01BQ0NBVEFMWVNUCiAgICAgY29uZmlnLmJpbmRU b1RleHR1cmVUYXJnZXQgPSBFR0xfVEVYVFVSRV8yRDsKLSMgICAgZWxzZQotICAgIGNvbmZpZy5i aW5kVG9UZXh0dXJlVGFyZ2V0ID0gRUdMX1RFWFRVUkVfUkVDVEFOR0xFX0FOR0xFOwotIyAgICBl bmRpZgogCiAgICAgY29uZmlnLnN1cmZhY2VUeXBlID0gRUdMX1dJTkRPV19CSVQgfCBFR0xfUEJV RkZFUl9CSVQ7CiAKQEAgLTM3OCw0ICszNzQsNCBAQCB2b2lkIERpc3BsYXlFQUdMOjpwb3B1bGF0 ZUZlYXR1cmVMaXN0KGFuCiB9CiB9CiAKLSNlbmRpZiAgLy8gZGVmaW5lZChBTkdMRV9QTEFURk9S TV9JT1MpCisjZW5kaWYgIC8vIGRlZmluZWQoQU5HTEVfUExBVEZPUk1fSU9TKSAmJiAhZGVmaW5l ZChBTkdMRV9QTEFURk9STV9NQUNDQVRBTFlTVCkKSW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9lYWdsL0lPU3VyZmFjZVN1cmZhY2VFQUdMLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRl cmVyL2dsL2VhZ2wvSU9TdXJmYWNlU3VyZmFjZUVBR0wuaAkocmV2aXNpb24gMjYxMDg4KQorKysg U291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL2VhZ2wvSU9T dXJmYWNlU3VyZmFjZUVBR0wuaAkod29ya2luZyBjb3B5KQpAQCAtNyw2ICs3LDEwIEBACiAjaWZu ZGVmIExJQkFOR0xFX1JFTkRFUkVSX0dMX0VBR0xfSU9TVVJGQUNFU1VSRkFDRUVBR0xfSF8KICNk ZWZpbmUgTElCQU5HTEVfUkVOREVSRVJfR0xfRUFHTF9JT1NVUkZBQ0VTVVJGQUNFRUFHTF9IXwog CisjaW5jbHVkZSAiY29tbW9uL3BsYXRmb3JtLmgiCisKKyNpZiBkZWZpbmVkKEFOR0xFX1BMQVRG T1JNX0lPUykgJiYgIWRlZmluZWQoQU5HTEVfUExBVEZPUk1fTUFDQ0FUQUxZU1QpCisKICNpbmNs dWRlICJsaWJBTkdMRS9yZW5kZXJlci9nbC9TdXJmYWNlR0wuaCIKICNpbmNsdWRlICJsaWJBTkdM RS9yZW5kZXJlci9nbC9lYWdsL0Rpc3BsYXlFQUdMLmgiCiAKQEAgLTg2LDQgKzkwLDYgQEAgY2xh c3MgSU9TdXJmYWNlU3VyZmFjZUVBR0wgOiBwdWJsaWMgU3VyZgogCiB9ICAvLyBuYW1lc3BhY2Ug cngKIAorI2VuZGlmICAvLyBkZWZpbmVkKEFOR0xFX1BMQVRGT1JNX0lPUykgJiYgIWRlZmluZWQo QU5HTEVfUExBVEZPUk1fTUFDQ0FUQUxZU1QpCisKICNlbmRpZiAgLy8gTElCQU5HTEVfUkVOREVS RVJfR0xfRUFHTF9JT1NVUkZBQ0VTVVJGQUNFRUFHTF9IXwpJbmRleDogU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL2VhZ2wvSU9TdXJmYWNlU3VyZmFjZUVB R0wubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xF L3JlbmRlcmVyL2dsL2VhZ2wvSU9TdXJmYWNlU3VyZmFjZUVBR0wubW0JKHJldmlzaW9uIDI2MTA4 OCkKKysrIFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9l YWdsL0lPU3VyZmFjZVN1cmZhY2VFQUdMLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00MTcsNCArNDE3 LDQgQEAgSU9TdXJmYWNlTG9ja09wdGlvbnMgSU9TdXJmYWNlU3VyZmFjZUVBRwogCiB9ICAvLyBu YW1lc3BhY2UgcngKIAotI2VuZGlmICAvLyBkZWZpbmVkKEFOR0xFX1BMQVRGT1JNX0lPUykKKyNl bmRpZiAgLy8gZGVmaW5lZChBTkdMRV9QTEFURk9STV9JT1MpICYmICFkZWZpbmVkKEFOR0xFX1BM QVRGT1JNX01BQ0NBVEFMWVNUKQpJbmRleDogU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xp YkFOR0xFL3JlbmRlcmVyL2dsL2VhZ2wvV2luZG93U3VyZmFjZUVBR0wuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvZWFnbC9X aW5kb3dTdXJmYWNlRUFHTC5oCShyZXZpc2lvbiAyNjEwODgpCisrKyBTb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvZWFnbC9XaW5kb3dTdXJmYWNlRUFHTC5o CSh3b3JraW5nIGNvcHkpCkBAIC05LDYgKzksMTAgQEAKICNpZm5kZWYgTElCQU5HTEVfUkVOREVS RVJfR0xfRUFHTF9XSU5ET1dTVVJGQUNFRUFHTF9IXwogI2RlZmluZSBMSUJBTkdMRV9SRU5ERVJF Ul9HTF9FQUdMX1dJTkRPV1NVUkZBQ0VFQUdMX0hfCiAKKyNpbXBvcnQgImNvbW1vbi9wbGF0Zm9y bS5oIgorCisjaWYgZGVmaW5lZChBTkdMRV9QTEFURk9STV9JT1MpICYmICFkZWZpbmVkKEFOR0xF X1BMQVRGT1JNX01BQ0NBVEFMWVNUKQorCiAjaW5jbHVkZSAibGliQU5HTEUvcmVuZGVyZXIvZ2wv U3VyZmFjZUdMLmgiCiAKICNpZmRlZiBfX09CSkNfXwpAQCAtMTA1LDQgKzEwOSw2IEBAIGNsYXNz IFdpbmRvd1N1cmZhY2VFQUdMIDogcHVibGljIFN1cmZhY2UKIAogfSAgLy8gbmFtZXNwYWNlIHJ4 CiAKKyNlbmRpZiAgLy8gZGVmaW5lZChBTkdMRV9QTEFURk9STV9JT1MpICYmICFkZWZpbmVkKEFO R0xFX1BMQVRGT1JNX01BQ0NBVEFMWVNUKQorCiAjZW5kaWYgIC8vIExJQkFOR0xFX1JFTkRFUkVS X0dMX0VBR0xfV0lORE9XU1VSRkFDRUVBR0xfSF8KSW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9lYWdsL1dpbmRvd1N1cmZhY2VFQUdMLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJl ci9nbC9lYWdsL1dpbmRvd1N1cmZhY2VFQUdMLm1tCShyZXZpc2lvbiAyNjEwODgpCisrKyBTb3Vy Y2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvZWFnbC9XaW5kb3dT dXJmYWNlRUFHTC5tbQkod29ya2luZyBjb3B5KQpAQCAtMzA1LDQgKzMwNSw0IEBAIEZyYW1lYnVm ZmVySW1wbCAqV2luZG93U3VyZmFjZUVBR0w6OmNyZWEKIAogfSAgLy8gbmFtZXNwYWNlIHJ4CiAK LSNlbmRpZiAgLy8gZGVmaW5lZChBTkdMRV9QTEFURk9STV9JT1MpCisjZW5kaWYgIC8vIGRlZmlu ZWQoQU5HTEVfUExBVEZPUk1fSU9TKSAmJiAhZGVmaW5lZChBTkdMRV9QTEFURk9STV9NQUNDQVRB TFlTVCkK 402295 2020-06-19 11:03:38 -0700 2020-06-19 14:03:44 -0700 Patch bug-211410-20200619110337.patch text/plain 3818 jbedard SW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2MzI3MSkKKysrIFNv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE2IEBACisyMDIwLTA2LTE5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4K KworICAgICAgICBbQU5HTEVdIENvcnJlY3QgQ2F0YWx5c3QgZ3VhcmRzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTE0MTAKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzYyODkxMTg1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL2VhZ2wvRGV2aWNlRUFHTC5j cHA6IERvIG5vdCBjb21waWxlIG9uIE1hYy4KKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVy ZXIvZ2wvZWFnbC9EZXZpY2VFQUdMLmg6ICBEZWZpbml0aW9ucyBzaG91bGQgbm90IGJlIGF2YWls YWJsZSBvbiBNYWMuCisgICAgICAgICogc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL2VhZ2wvRGlz cGxheUVBR0wuaDogRGVmaW5pdGlvbnMgc2hvdWxkIG5vdCBiZSBhdmFpbGFibGUgb24gTWFjLgor ICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9lYWdsL0Rpc3BsYXlFQUdMLm1tOiBE byBub3QgY29tcGlsZSBvbiBNYWMuCisKIDIwMjAtMDYtMTAgIERlYW4gSmFja3NvbiAgPGRpbm9A YXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBhIGR5bmFtaWMgbGlicmFyeSB0YXJnZXQgZm9yIEFO R0xFCkluZGV4OiBTb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIv Z2wvZWFnbC9EZXZpY2VFQUdMLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvVGhpcmRQYXJ0eS9B TkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvZWFnbC9EZXZpY2VFQUdMLmNwcAkocmV2aXNp b24gMjYzMjcxKQorKysgU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRl cmVyL2dsL2VhZ2wvRGV2aWNlRUFHTC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgsNyArOCw3IEBA CiAKICNpbXBvcnQgImNvbW1vbi9wbGF0Zm9ybS5oIgogCi0jaWYgZGVmaW5lZChBTkdMRV9QTEFU Rk9STV9JT1MpCisjaWYgZGVmaW5lZChBTkdMRV9QTEFURk9STV9JT1MpICYmICFkZWZpbmVkKEFO R0xFX1BMQVRGT1JNX01BQ0NBVEFMWVNUKQogCiAjICAgIGluY2x1ZGUgImxpYkFOR0xFL3JlbmRl cmVyL2dsL2VhZ2wvRGV2aWNlRUFHTC5oIgogCkBAIC01Niw0ICs1Niw0IEBAIHZvaWQgRGV2aWNl RUFHTDo6Z2VuZXJhdGVFeHRlbnNpb25zKGVnbDoKIAogfSAgLy8gbmFtZXNwYWNlIHJ4CiAKLSNl bmRpZiAgLy8gZGVmaW5lZChBTkdMRV9QTEFURk9STV9JT1MpCisjZW5kaWYgIC8vIGRlZmluZWQo QU5HTEVfUExBVEZPUk1fSU9TKSAmJiAhZGVmaW5lZChBTkdMRV9QTEFURk9STV9NQUNDQVRBTFlT VCkKSW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9n bC9lYWdsL0RldmljZUVBR0wuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvVGhpcmRQYXJ0eS9BTkdM RS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvZWFnbC9EZXZpY2VFQUdMLmgJKHJldmlzaW9uIDI2 MzI3MSkKKysrIFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9n bC9lYWdsL0RldmljZUVBR0wuaAkod29ya2luZyBjb3B5KQpAQCAtOSw2ICs5LDEwIEBACiAjaWZu ZGVmIExJQkFOR0xFX1JFTkRFUkVSX0dMX0VBR0xfREVWSUNFRUFHTF9IXwogI2RlZmluZSBMSUJB TkdMRV9SRU5ERVJFUl9HTF9FQUdMX0RFVklDRUVBR0xfSF8KIAorI2ltcG9ydCAiY29tbW9uL3Bs YXRmb3JtLmgiCisKKyNpZiBkZWZpbmVkKEFOR0xFX1BMQVRGT1JNX0lPUykgJiYgIWRlZmluZWQo QU5HTEVfUExBVEZPUk1fTUFDQ0FUQUxZU1QpCisKICNpbmNsdWRlICJsaWJBTkdMRS9EZXZpY2Uu aCIKICNpbmNsdWRlICJsaWJBTkdMRS9yZW5kZXJlci9EZXZpY2VJbXBsLmgiCiAKQEAgLTMwLDQg KzM0LDYgQEAgY2xhc3MgRGV2aWNlRUFHTCA6IHB1YmxpYyBEZXZpY2VJbXBsCiAKIH0gIC8vIG5h bWVzcGFjZSByeAogCisjZW5kaWYgIC8vIGRlZmluZWQoQU5HTEVfUExBVEZPUk1fSU9TKSAmJiAh ZGVmaW5lZChBTkdMRV9QTEFURk9STV9NQUNDQVRBTFlTVCkKKwogI2VuZGlmICAvLyBMSUJBTkdM RV9SRU5ERVJFUl9HTF9FQUdMX0RFVklDRUVBR0xfSF8KSW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9lYWdsL0Rpc3BsYXlFQUdMLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2ds L2VhZ2wvRGlzcGxheUVBR0wuaAkocmV2aXNpb24gMjYzMjcxKQorKysgU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL2VhZ2wvRGlzcGxheUVBR0wuaAkod29y a2luZyBjb3B5KQpAQCAtOSw2ICs5LDEwIEBACiAjaWZuZGVmIExJQkFOR0xFX1JFTkRFUkVSX0dM X0VBR0xfRElTUExBWUVBR0xfSF8KICNkZWZpbmUgTElCQU5HTEVfUkVOREVSRVJfR0xfRUFHTF9E SVNQTEFZRUFHTF9IXwogCisjaW1wb3J0ICJjb21tb24vcGxhdGZvcm0uaCIKKworI2lmIGRlZmlu ZWQoQU5HTEVfUExBVEZPUk1fSU9TKSAmJiAhZGVmaW5lZChBTkdMRV9QTEFURk9STV9NQUNDQVRB TFlTVCkKKwogI2luY2x1ZGUgImxpYkFOR0xFL3JlbmRlcmVyL2dsL0Rpc3BsYXlHTC5oIgogCiAj aWZkZWYgX19PQkpDX18KQEAgLTkzLDQgKzk3LDYgQEAgY2xhc3MgRGlzcGxheUVBR0wgOiBwdWJs aWMgRGlzcGxheUdMCiAKIH0gIC8vIG5hbWVzcGFjZSByeAogCisjZW5kaWYgLy8gZGVmaW5lZChB TkdMRV9QTEFURk9STV9JT1MpICYmICFkZWZpbmVkKEFOR0xFX1BMQVRGT1JNX01BQ0NBVEFMWVNU KQorCiAjZW5kaWYgIC8vIExJQkFOR0xFX1JFTkRFUkVSX0dMX0VBR0xfRElTUExBWUVBR0xfSF8K SW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9l YWdsL0Rpc3BsYXlFQUdMLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xF L3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9lYWdsL0Rpc3BsYXlFQUdMLm1tCShyZXZpc2lvbiAy NjMyNzEpCisrKyBTb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIv Z2wvZWFnbC9EaXNwbGF5RUFHTC5tbQkod29ya2luZyBjb3B5KQpAQCAtMzc4LDQgKzM3OCw0IEBA IHZvaWQgRGlzcGxheUVBR0w6OnBvcHVsYXRlRmVhdHVyZUxpc3QoYW4KIH0KIH0KIAotI2VuZGlm ICAvLyBkZWZpbmVkKEFOR0xFX1BMQVRGT1JNX0lPUykKKyNlbmRpZiAgLy8gZGVmaW5lZChBTkdM RV9QTEFURk9STV9JT1MpICYmICFkZWZpbmVkKEFOR0xFX1BMQVRGT1JNX01BQ0NBVEFMWVNUKQo=