153728 2016-01-31 13:17:26 -0800 [Cocoa] Remove __has_include guards around use of WebKitAdditions 2016-01-31 15:00:19 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz mitz aestes andersca cdumez commit-queue dbates esprehn+autocc japhet kangil.han sam simon.fraser thorton oldest_to_newest 1160667 0 mitz 2016-01-31 13:17:26 -0800 Switch to a more robust way of guarding WebKitAdditions includes. 1160668 1 270345 mitz 2016-01-31 13:19:55 -0800 Created attachment 270345 Use USE(APPLE_INTERNAL_SKD) instead 1160672 2 mitz 2016-01-31 15:00:19 -0800 Committed <http://trac.webkit.org/r195937>. 270345 2016-01-31 13:19:55 -0800 2016-01-31 13:51:34 -0800 Use USE(APPLE_INTERNAL_SKD) instead bug-153728-20160131131930.patch text/plain 15418 mitz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NTkzNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE2LTAxLTMxICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBSZW1vdmUgX19oYXNf aW5jbHVkZSBndWFyZHMgYXJvdW5kIHVzZSBvZiBXZWJLaXRBZGRpdGlvbnMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MzcyOAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEd1YXJkIFdlYktpdEFkZGl0aW9u cyBpbmNsdWRlcyB3aXRoICNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKSByYXRoZXIgdGhhbiB3 aXRoIF9faGFzX2luY2x1ZGUuCisKKyAgICAgICAgKiBkb20vRXZlbnROYW1lcy5oOgorICAgICAg ICAqIGxvYWRlci9FbXB0eUNsaWVudHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZmlsbFdpdGhF bXB0eUNsaWVudHMpOgorICAgICAgICAqIHBhZ2UvTWFpbkZyYW1lLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Ok1haW5GcmFtZTo6TWFpbkZyYW1lKToKKyAgICAgICAgKiBwYWdlL01haW5GcmFtZS5o OgorICAgICAgICAqIHBhZ2UvUGFnZUNvbmZpZ3VyYXRpb24uaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9jb2NvYS9XZWJLaXRBZGRpdGlvbnMubW06CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2EvY29jb2EvUGxhdGZvcm1DQUxheWVyQ29jb2EubW06CisgICAgICAgICogcGxhdGZvcm0vaW9z L0xlZ2FjeVRpbGVHcmlkVGlsZS5tbToKKwogMjAxNi0wMS0zMSAgRGFyaW4gQWRsZXIgIDxkYXJp bkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVwbGFjZSBDYXNlRm9sZGluZ0hhc2ggd2l0aCBBU0NJ SUNhc2VJbnNlbnNpdGl2ZUhhc2gKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9FdmVudE5hbWVz LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50TmFtZXMuaAkocmV2aXNp b24gMTk1OTM0KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50TmFtZXMuaAkod29ya2luZyBj b3B5KQpAQCAtMjcsNyArMjcsNyBAQAogI2luY2x1ZGUgPGZ1bmN0aW9uYWw+CiAjaW5jbHVkZSA8 d3RmL3RleHQvQXRvbWljU3RyaW5nLmg+CiAKLSNpZiBkZWZpbmVkKF9faGFzX2luY2x1ZGUpICYm IF9faGFzX2luY2x1ZGUoPFdlYktpdEFkZGl0aW9ucy9FdmVudE5hbWVzQWRkaXRpb25zLmg+KQor I2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCiAjaW1wb3J0IDxXZWJLaXRBZGRpdGlvbnMvRXZl bnROYW1lc0FkZGl0aW9ucy5oPgogI2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRl ci9FbXB0eUNsaWVudHMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9F bXB0eUNsaWVudHMuY3BwCShyZXZpc2lvbiAxOTU5MzQpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRW1wdHlDbGllbnRzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQsNyArNDQsNyBAQAogI2lu Y2x1ZGUgIlN0b3JhZ2VOYW1lc3BhY2VQcm92aWRlci5oIgogI2luY2x1ZGUgPHd0Zi9OZXZlckRl c3Ryb3llZC5oPgogCi0jaWYgZGVmaW5lZChfX2hhc19pbmNsdWRlKSAmJiBfX2hhc19pbmNsdWRl KDxXZWJLaXRBZGRpdGlvbnMvRW1wdHlDbGllbnRzSW5jbHVkZXMuaD4pCisjaWYgVVNFKEFQUExF X0lOVEVSTkFMX1NESykKICNpbmNsdWRlIDxXZWJLaXRBZGRpdGlvbnMvRW1wdHlDbGllbnRzSW5j bHVkZXMuaD4KICNlbmRpZgogCkBAIC0xMzgsNyArMTM4LDcgQEAgdm9pZCBmaWxsV2l0aEVtcHR5 Q2xpZW50cyhQYWdlQ29uZmlndXJhdAogICAgIHBhZ2VDb25maWd1cmF0aW9uLnN0b3JhZ2VOYW1l c3BhY2VQcm92aWRlciA9IGFkb3B0UmVmKG5ldyBFbXB0eVN0b3JhZ2VOYW1lc3BhY2VQcm92aWRl cik7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24udmlzaXRlZExpbmtTdG9yZSA9IGFkb3B0UmVmKG5l dyBFbXB0eVZpc2l0ZWRMaW5rU3RvcmUpOwogCi0jaWYgZGVmaW5lZChfX2hhc19pbmNsdWRlKSAm JiBfX2hhc19pbmNsdWRlKDxXZWJLaXRBZGRpdGlvbnMvRW1wdHlDbGllbnRzRmlsbC5jcHA+KQor I2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCiAjaW5jbHVkZSA8V2ViS2l0QWRkaXRpb25zL0Vt cHR5Q2xpZW50c0ZpbGwuY3BwPgogI2VuZGlmCiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdl L01haW5GcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9NYWluRnJh bWUuY3BwCShyZXZpc2lvbiAxOTU5MzQpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL01haW5GcmFt ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM5LDcgKzM5LDcgQEAKICNpbmNsdWRlICJTZXJ2aWNl c092ZXJsYXlDb250cm9sbGVyLmgiCiAjZW5kaWYgLyogUExBVEZPUk0oTUFDKSAqLwogCi0jaWYg ZGVmaW5lZChfX2hhc19pbmNsdWRlKSAmJiBfX2hhc19pbmNsdWRlKDxXZWJLaXRBZGRpdGlvbnMv TWFpbkZyYW1lSW5jbHVkZXMuaD4pCisjaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKICNpbmNs dWRlIDxXZWJLaXRBZGRpdGlvbnMvTWFpbkZyYW1lSW5jbHVkZXMuaD4KICNlbmRpZgogCkBAIC01 Nyw3ICs1Nyw3IEBAIGlubGluZSBNYWluRnJhbWU6Ok1haW5GcmFtZShQYWdlJiBwYWdlLCAKICAg ICAsIG1fcGFnZU92ZXJsYXlDb250cm9sbGVyKHN0ZDo6bWFrZV91bmlxdWU8UGFnZU92ZXJsYXlD b250cm9sbGVyPigqdGhpcykpCiAgICAgLCBtX2RpYWdub3N0aWNMb2dnaW5nQ2xpZW50KGNvbmZp Z3VyYXRpb24uZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQpCiB7Ci0jaWYgZGVmaW5lZChfX2hhc19p bmNsdWRlKSAmJiBfX2hhc19pbmNsdWRlKDxXZWJLaXRBZGRpdGlvbnMvTWFpbkZyYW1lSW5pdGlh bGl6YXRpb24uY3BwPikKKyNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQogI2luY2x1ZGUgPFdl YktpdEFkZGl0aW9ucy9NYWluRnJhbWVJbml0aWFsaXphdGlvbi5jcHA+CiAjZW5kaWYKIH0KSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvTWFpbkZyYW1lLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGFnZS9NYWluRnJhbWUuaAkocmV2aXNpb24gMTk1OTM0KQorKysgU291cmNlL1dl YkNvcmUvcGFnZS9NYWluRnJhbWUuaAkod29ya2luZyBjb3B5KQpAQCAtMjksNyArMjksNyBAQAog I2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCi0jaWYgZGVmaW5l ZChfX2hhc19pbmNsdWRlKSAmJiBfX2hhc19pbmNsdWRlKDxXZWJLaXRBZGRpdGlvbnMvTWFpbkZy YW1lSW5jbHVkZXMuaD4pCisjaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKICNpbmNsdWRlIDxX ZWJLaXRBZGRpdGlvbnMvTWFpbkZyYW1lSW5jbHVkZXMuaD4KICNlbmRpZgogCkBAIC02OCw3ICs2 OCw3IEBAIHB1YmxpYzoKIAogICAgIFdFQkNPUkVfRVhQT1JUIERpYWdub3N0aWNMb2dnaW5nQ2xp ZW50JiBkaWFnbm9zdGljTG9nZ2luZ0NsaWVudCgpIGNvbnN0OwogCi0jaWYgZGVmaW5lZChfX2hh c19pbmNsdWRlKSAmJiBfX2hhc19pbmNsdWRlKDxXZWJLaXRBZGRpdGlvbnMvTWFpbkZyYW1lTWVt YmVycy5oPikKKyNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQogI2luY2x1ZGUgPFdlYktpdEFk ZGl0aW9ucy9NYWluRnJhbWVNZW1iZXJzLmg+CiAjZW5kaWYKIApJbmRleDogU291cmNlL1dlYkNv cmUvcGFnZS9QYWdlQ29uZmlndXJhdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BhZ2UvUGFnZUNvbmZpZ3VyYXRpb24uaAkocmV2aXNpb24gMTk1OTM0KQorKysgU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlQ29uZmlndXJhdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3ICsy OSw3IEBACiAjaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0 ci5oPgogCi0jaWYgZGVmaW5lZChfX2hhc19pbmNsdWRlKSAmJiBfX2hhc19pbmNsdWRlKDxXZWJL aXRBZGRpdGlvbnMvUGFnZUNvbmZpZ3VyYXRpb25JbmNsdWRlcy5oPikKKyNpZiBVU0UoQVBQTEVf SU5URVJOQUxfU0RLKQogI2luY2x1ZGUgPFdlYktpdEFkZGl0aW9ucy9QYWdlQ29uZmlndXJhdGlv bkluY2x1ZGVzLmg+CiAjZW5kaWYKIApAQCAtNzcsNyArNzcsNyBAQCBwdWJsaWM6CiAgICAgRnJh bWVMb2FkZXJDbGllbnQqIGxvYWRlckNsaWVudEZvck1haW5GcmFtZSB7IG51bGxwdHIgfTsKICAg ICBEaWFnbm9zdGljTG9nZ2luZ0NsaWVudCogZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQgeyBudWxs cHRyIH07CiAKLSNpZiBkZWZpbmVkKF9faGFzX2luY2x1ZGUpICYmIF9faGFzX2luY2x1ZGUoPFdl YktpdEFkZGl0aW9ucy9QYWdlQ29uZmlndXJhdGlvbk1lbWJlcnMuaD4pCisjaWYgVVNFKEFQUExF X0lOVEVSTkFMX1NESykKICNpbmNsdWRlIDxXZWJLaXRBZGRpdGlvbnMvUGFnZUNvbmZpZ3VyYXRp b25NZW1iZXJzLmg+CiAjZW5kaWYKIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29j b2EvV2ViS2l0QWRkaXRpb25zLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2NvY29hL1dlYktpdEFkZGl0aW9ucy5tbQkocmV2aXNpb24gMTk1OTM0KQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvV2ViS2l0QWRkaXRpb25zLm1tCSh3b3JraW5nIGNvcHkp CkBAIC0yNSw3ICsyNSw3IEBACiAKICNpbmNsdWRlICJjb25maWcuaCIKIAotI2lmIGRlZmluZWQo X19oYXNfaW5jbHVkZSkgJiYgX19oYXNfaW5jbHVkZSg8V2ViS2l0QWRkaXRpb25zL1dlYkNvcmVB ZGRpdGlvbnMuY3BwPikKKyNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQogI2luY2x1ZGUgPFdl YktpdEFkZGl0aW9ucy9XZWJDb3JlQWRkaXRpb25zLmNwcD4KICNlbmRpZgogCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2Nv YS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9j b2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbQkocmV2aXNpb24gMTk1OTM0KQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvY29jb2EvUGxhdGZvcm1DQUxheWVyQ29jb2Eu bW0JKHdvcmtpbmcgY29weSkKQEAgLTY1LDcgKzY1LDcgQEAgQGludGVyZmFjZSBDQUJhY2tkcm9w TGF5ZXIgOiBDQUxheWVyCiBAZW5kCiAjZW5kaWYKIAotI2lmIF9faGFzX2luY2x1ZGUoPFdlYktp dEFkZGl0aW9ucy9MYXllckJhY2tpbmdTdG9yZUFkZGl0aW9ucy5tbT4pCisjaWYgVVNFKEFQUExF X0lOVEVSTkFMX1NESykKICNpbXBvcnQgPFdlYktpdEFkZGl0aW9ucy9MYXllckJhY2tpbmdTdG9y ZUFkZGl0aW9ucy5tbT4KICNlbHNlCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9pb3MvTGVnYWN5VGlsZUdyaWRUaWxlLm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9MZWdhY3lUaWxlR3JpZFRpbGUubW0JKHJldmlz aW9uIDE5NTkzNCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9MZWdhY3lUaWxlR3Jp ZFRpbGUubW0JKHdvcmtpbmcgY29weSkKQEAgLTM5LDcgKzM5LDcgQEAKICNpbmNsdWRlIDxmdW5j dGlvbmFsPgogI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogCi0jaWYgX19oYXNfaW5j bHVkZSg8V2ViS2l0QWRkaXRpb25zL0xheWVyQmFja2luZ1N0b3JlQWRkaXRpb25zLm1tPikKKyNp ZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQogI2ltcG9ydCA8V2ViS2l0QWRkaXRpb25zL0xheWVy QmFja2luZ1N0b3JlQWRkaXRpb25zLm1tPgogI2Vsc2UKIG5hbWVzcGFjZSBXZWJDb3JlIHsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NTkzNCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE2LTAxLTMxICBEYW4gQmVybnN0 ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBSZW1vdmUgX19oYXNfaW5j bHVkZSBndWFyZHMgYXJvdW5kIHVzZSBvZiBXZWJLaXRBZGRpdGlvbnMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MzcyOAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEd1YXJkIFdlYktpdEFkZGl0aW9ucyBp bmNsdWRlcyB3aXRoICNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKSByYXRoZXIgdGhhbiB3aXRo IF9faGFzX2luY2x1ZGUuCisKKyAgICAgICAgKiBTaGFyZWQvQ29jb2EvV2ViS2l0QWRkaXRpb25z Lm1tOgorICAgICAgICAqIFNoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaDoKKyAgICAgICAg KiBTaGFyZWQvbWFjL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlLm1tOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3MpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlc2V0U3RhdGUpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Om1fc2hvdWxkRGlzcGF0Y2hGYWtlTW91c2VNb3Zl RXZlbnRzKToKKwogMjAxNi0wMS0zMSAgVGltb3RoeSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBh cHBsZS5jb20+CiAKICAgICAgICAgSW5jbHVkZSB0aGUgcmlnaHQgV2ViS2l0QWRkaXRpb25zIGZp bGVzCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVy cy5oCShyZXZpc2lvbiAxOTU5MzQpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29yZUFy Z3VtZW50Q29kZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ2NSw3ICs0NjUsNyBAQCB0ZW1wbGF0 ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6CiAKIH0gLy8gbmFtZXNwYWNlIElQQwog Ci0jaWYgZGVmaW5lZChfX2hhc19pbmNsdWRlKSAmJiBfX2hhc19pbmNsdWRlKDxXZWJLaXRBZGRp dGlvbnMvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQWRkaXRpb25zLmg+KQorI2lmIFVTRShBUFBMRV9J TlRFUk5BTF9TREspCiAjaW5jbHVkZSA8V2ViS2l0QWRkaXRpb25zL1dlYkNvcmVBcmd1bWVudENv ZGVyc0FkZGl0aW9ucy5oPgogI2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9D b2NvYS9XZWJLaXRBZGRpdGlvbnMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hh cmVkL0NvY29hL1dlYktpdEFkZGl0aW9ucy5tbQkocmV2aXNpb24gMTk1OTM0KQorKysgU291cmNl L1dlYktpdDIvU2hhcmVkL0NvY29hL1dlYktpdEFkZGl0aW9ucy5tbQkod29ya2luZyBjb3B5KQpA QCAtMjUsNiArMjUsNiBAQAogCiAjaW1wb3J0ICJjb25maWcuaCIKIAotI2lmIGRlZmluZWQoX19o YXNfaW5jbHVkZSkgJiYgX19oYXNfaW5jbHVkZSg8V2ViS2l0QWRkaXRpb25zL1dlYktpdEFkZGl0 aW9ucy5tbT4pCisjaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKICNpbXBvcnQgPFdlYktpdEFk ZGl0aW9ucy9XZWJLaXRBZGRpdGlvbnMubW0+CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1NoYXJlZC9tYWMvUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllckJhY2tpbmdTdG9yZS5tbQkocmV2aXNp b24gMTk1OTM0KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllckJhY2tp bmdTdG9yZS5tbQkod29ya2luZyBjb3B5KQpAQCAtNDQsNyArNDQsNyBAQAogI2ltcG9ydCA8bWFj aC9tYWNoX3BvcnQuaD4KICNlbmRpZgogCi0jaWYgX19oYXNfaW5jbHVkZSg8V2ViS2l0QWRkaXRp b25zL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlQWRkaXRpb25zLm1tPikKKyNpZiBVU0UoQVBQTEVf SU5URVJOQUxfU0RLKQogI2ltcG9ydCA8V2ViS2l0QWRkaXRpb25zL1JlbW90ZUxheWVyQmFja2lu Z1N0b3JlQWRkaXRpb25zLm1tPgogI2Vsc2UKIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDE5NTkzNCkKKysrIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjUsNyArMTY1 LDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL01lZGlhU2Vzc2lvbk1ldGFkYXRhLmg+CiAjZW5kaWYK IAotI2lmIGRlZmluZWQoX19oYXNfaW5jbHVkZSkgJiYgX19oYXNfaW5jbHVkZSg8V2ViS2l0QWRk aXRpb25zL1dlYlBhZ2VQcm94eUluY2x1ZGVzLmg+KQorI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9T REspCiAjaW5jbHVkZSA8V2ViS2l0QWRkaXRpb25zL1dlYlBhZ2VQcm94eUluY2x1ZGVzLmg+CiAj ZW5kaWYKIApAQCAtNDc0LDcgKzQ3NCw3IEBAIFdlYlBhZ2VQcm94eTo6V2ViUGFnZVByb3h5KFBh Z2VDbGllbnQmIHAKICAgICBtX3ZpYnJhdGlvbiA9IFdlYlZpYnJhdGlvblByb3h5OjpjcmVhdGUo dGhpcyk7CiAjZW5kaWYKIAotI2lmIGRlZmluZWQoX19oYXNfaW5jbHVkZSkgJiYgX19oYXNfaW5j bHVkZSg8V2ViS2l0QWRkaXRpb25zL1dlYlBhZ2VQcm94eUluaXRpYWxpemF0aW9uLmNwcD4pCisj aWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKICNpbmNsdWRlIDxXZWJLaXRBZGRpdGlvbnMvV2Vi UGFnZVByb3h5SW5pdGlhbGl6YXRpb24uY3BwPgogI2VuZGlmCiAKQEAgLTcwNiw3ICs3MDYsNyBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3MoCiAgICAgbV92aWRlb0Z1 bGxzY3JlZW5NYW5hZ2VyID0gV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5OjpjcmVhdGUo KnRoaXMpOwogI2VuZGlmCiAKLSNpZiBkZWZpbmVkKF9faGFzX2luY2x1ZGUpICYmIF9faGFzX2lu Y2x1ZGUoPFdlYktpdEFkZGl0aW9ucy9XZWJQYWdlUHJveHlJbml0aWFsaXphdGlvbi5jcHA+KQor I2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCiAjaW5jbHVkZSA8V2ViS2l0QWRkaXRpb25zL1dl YlBhZ2VQcm94eUluaXRpYWxpemF0aW9uLmNwcD4KICNlbmRpZgogCkBAIC01MDQ1LDcgKzUwNDUs NyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVzZXRTdGF0ZShSZXNldFN0YXRlCiAgICAgbV9wYWdl Q2xpZW50Lm1lZGlhU2Vzc2lvbk1hbmFnZXIoKS5yZW1vdmVBbGxQbGF5YmFja1RhcmdldFBpY2tl ckNsaWVudHMoKnRoaXMpOwogI2VuZGlmCiAKLSNpZiBkZWZpbmVkKF9faGFzX2luY2x1ZGUpICYm IF9faGFzX2luY2x1ZGUoPFdlYktpdEFkZGl0aW9ucy9XZWJQYWdlUHJveHlJbnZhbGlkYXRpb24u Y3BwPikKKyNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQogI2luY2x1ZGUgPFdlYktpdEFkZGl0 aW9ucy9XZWJQYWdlUHJveHlJbnZhbGlkYXRpb24uY3BwPgogI2VuZGlmCiAKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDE5NTkzNCkKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAt MTIyLDcgKzEyMiw3IEBAIE9CSkNfQ0xBU1MgX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnk7CiAjaW5j bHVkZSA8V2ViQ29yZS9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyQ2xpZW50Lmg+CiAjZW5kaWYKIAot I2lmIGRlZmluZWQoX19oYXNfaW5jbHVkZSkgJiYgX19oYXNfaW5jbHVkZSg8V2ViS2l0QWRkaXRp b25zL1dlYlBhZ2VQcm94eUluY2x1ZGVzLmg+KQorI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREsp CiAjaW5jbHVkZSA8V2ViS2l0QWRkaXRpb25zL1dlYlBhZ2VQcm94eUluY2x1ZGVzLmg+CiAjZW5k aWYKIApAQCAtMTU1Nyw3ICsxNTU3LDcgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8V2ViVmlicmF0 aW9uUHJveHk+IG1fdmlicmF0aW9uOwogI2VuZGlmCiAKLSNpZiBkZWZpbmVkKF9faGFzX2luY2x1 ZGUpICYmIF9faGFzX2luY2x1ZGUoPFdlYktpdEFkZGl0aW9ucy9XZWJQYWdlUHJveHlNZW1iZXJz Lmg+KQorI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCiAjaW5jbHVkZSA8V2ViS2l0QWRkaXRp b25zL1dlYlBhZ2VQcm94eU1lbWJlcnMuaD4KICNlbmRpZgogCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQkocmV2aXNpb24gMTk1OTM0 KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHdv cmtpbmcgY29weSkKQEAgLTE0Miw3ICsxNDIsNyBAQCBlbnVtIGNsYXNzIER5bmFtaWNWaWV3cG9y dFVwZGF0ZU1vZGUgewogICAgIFJlc2l6aW5nV2l0aERvY3VtZW50SGlkZGVuLAogfTsKIAotI2lm IF9faGFzX2luY2x1ZGUoPFdlYktpdEFkZGl0aW9ucy9SZW1vdGVMYXllckJhY2tpbmdTdG9yZUFk ZGl0aW9ucy5tbT4pCisjaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKICNpbXBvcnQgPFdlYktp dEFkZGl0aW9ucy9SZW1vdGVMYXllckJhY2tpbmdTdG9yZUFkZGl0aW9ucy5tbT4KICNlbHNlCiAK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJ KHJldmlzaW9uIDE5NTkzNCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjMxLDcgKzIzMSw3IEBACiAjaW5jbHVkZSA8 V2ViQ29yZS9NZWRpYVBsYXllclJlcXVlc3RJbnN0YWxsTWlzc2luZ1BsdWdpbnNDYWxsYmFjay5o PgogI2VuZGlmCiAKLSNpZiBkZWZpbmVkKF9faGFzX2luY2x1ZGUpICYmIF9faGFzX2luY2x1ZGUo PFdlYktpdEFkZGl0aW9ucy9XZWJQYWdlSW5jbHVkZXMuaD4pCisjaWYgVVNFKEFQUExFX0lOVEVS TkFMX1NESykKICNpbmNsdWRlIDxXZWJLaXRBZGRpdGlvbnMvV2ViUGFnZUluY2x1ZGVzLmg+CiAj ZW5kaWYKIApAQCAtMzk4LDcgKzM5OCw3IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFn ZUlELCBjb25zdCAKICAgICBwYWdlQ29uZmlndXJhdGlvbi51c2VyQ29udGVudENvbnRyb2xsZXIg PSBtX3VzZXJDb250ZW50Q29udHJvbGxlciA/ICZtX3VzZXJDb250ZW50Q29udHJvbGxlci0+dXNl ckNvbnRlbnRDb250cm9sbGVyKCkgOiAmbV9wYWdlR3JvdXAtPnVzZXJDb250ZW50Q29udHJvbGxl cigpOwogICAgIHBhZ2VDb25maWd1cmF0aW9uLnZpc2l0ZWRMaW5rU3RvcmUgPSBWaXNpdGVkTGlu a1RhYmxlQ29udHJvbGxlcjo6Z2V0T3JDcmVhdGUocGFyYW1ldGVycy52aXNpdGVkTGlua1RhYmxl SUQpOwogCi0jaWYgZGVmaW5lZChfX2hhc19pbmNsdWRlKSAmJiBfX2hhc19pbmNsdWRlKDxXZWJL aXRBZGRpdGlvbnMvV2ViUGFnZUluaXRpYWxpemF0aW9uLmg+KQorI2lmIFVTRShBUFBMRV9JTlRF Uk5BTF9TREspCiAjaW5jbHVkZSA8V2ViS2l0QWRkaXRpb25zL1dlYlBhZ2VJbml0aWFsaXphdGlv bi5oPgogI2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NTkzNCkKKysr IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3 IEBACisyMDE2LTAxLTMxICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAg ICAgW0NvY29hXSBSZW1vdmUgX19oYXNfaW5jbHVkZSBndWFyZHMgYXJvdW5kIHVzZSBvZiBXZWJL aXRBZGRpdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1MzcyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEd1YXJkIFdlYktpdEFkZGl0aW9ucyBpbmNsdWRlcyB3aXRoICNpZiBVU0UoQVBQTEVfSU5U RVJOQUxfU0RLKSByYXRoZXIgdGhhbiB3aXRoIF9faGFzX2luY2x1ZGUuCisKKyAgICAgICAgKiBX ZWJLaXRBZGRpdGlvbnMubW06CisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAg ICAoLVtXZWJWaWV3IF9jb21tb25Jbml0aWFsaXphdGlvbldpdGhGcmFtZU5hbWU6Z3JvdXBOYW1l Ol0pOgorICAgICAgICAoLVtXZWJWaWV3IGluaXRTaW1wbGVIVE1MRG9jdW1lbnRXaXRoU3R5bGU6 ZnJhbWU6cHJlZmVyZW5jZXM6Z3JvdXBOYW1lOl0pOgorCiAyMDE2LTAxLTI5ICBBZGEgQ2hhbiAg PGFkYWNoYW5AYXBwbGUuY29tPgogCiAgICAgICAgIEVuYWJsZSBWSURFT19QUkVTRU5UQVRJT05f TU9ERSBvbmx5IGluIERlYnVnIGFuZCBSZWxlYXNlIGJ1aWxkcyBvbiBNYWMKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvbWFjL1dlYktpdEFkZGl0aW9ucy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L21hYy9XZWJLaXRBZGRpdGlvbnMubW0JKHJldmlzaW9uIDE5NTkzNCkKKysrIFNvdXJjZS9X ZWJLaXQvbWFjL1dlYktpdEFkZGl0aW9ucy5tbQkod29ya2luZyBjb3B5KQpAQCAtMjMsOCArMjMs NiBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLSNpZmRlZiBf X2hhc19pbmNsdWRlCi0jaWYgX19oYXNfaW5jbHVkZSg8V2ViS2l0QWRkaXRpb25zL1dlYktpdExl Z2FjeUFkZGl0aW9ucy5jcHA+KQorI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCiAjaW5jbHVk ZSA8V2ViS2l0QWRkaXRpb25zL1dlYktpdExlZ2FjeUFkZGl0aW9ucy5jcHA+CiAjZW5kaWYKLSNl bmRpZgpJbmRleDogU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQkocmV2aXNpb24gMTk1 OTM0KQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCSh3b3JraW5nIGNv cHkpCkBAIC0yOTUsNyArMjk1LDcgQEAKICNpbXBvcnQgPFdlYkNvcmUvV2ViTWVkaWFTZXNzaW9u TWFuYWdlck1hYy5oPgogI2VuZGlmCiAKLSNpZiBkZWZpbmVkKF9faGFzX2luY2x1ZGUpICYmIF9f aGFzX2luY2x1ZGUoPFdlYktpdEFkZGl0aW9ucy9XZWJWaWV3SW5jbHVkZXMuaD4pCisjaWYgVVNF KEFQUExFX0lOVEVSTkFMX1NESykKICNpbXBvcnQgPFdlYktpdEFkZGl0aW9ucy9XZWJWaWV3SW5j bHVkZXMuaD4KICNlbmRpZgogCkBAIC05NzMsNyArOTczLDcgQEAgLSAodm9pZClfY29tbW9uSW5p dGlhbGl6YXRpb25XaXRoRnJhbWVOYQogICAgIHBhZ2VDb25maWd1cmF0aW9uLmluc3BlY3RvckNs aWVudCA9IG5ldyBXZWJJbnNwZWN0b3JDbGllbnQoc2VsZik7CiAjZW5kaWYKIAotI2lmIGRlZmlu ZWQoX19oYXNfaW5jbHVkZSkgJiYgX19oYXNfaW5jbHVkZSg8V2ViS2l0QWRkaXRpb25zL1dlYlZp ZXdJbml0aWFsaXphdGlvbi5tbT4pCisjaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKICNpbXBv cnQgPFdlYktpdEFkZGl0aW9ucy9XZWJWaWV3SW5pdGlhbGl6YXRpb24ubW0+CiAjZW5kaWYKIApA QCAtMTIxNyw3ICsxMjE3LDcgQEAgLSAoaWQpaW5pdFNpbXBsZUhUTUxEb2N1bWVudFdpdGhTdHls ZTooTgogICAgIHBhZ2VDb25maWd1cmF0aW9uLmRyYWdDbGllbnQgPSBuZXcgV2ViRHJhZ0NsaWVu dChzZWxmKTsKICNlbmRpZgogCi0jaWYgZGVmaW5lZChfX2hhc19pbmNsdWRlKSAmJiBfX2hhc19p bmNsdWRlKDxXZWJLaXRBZGRpdGlvbnMvV2ViVmlld0luaXRpYWxpemF0aW9uLm1tPikKKyNpZiBV U0UoQVBQTEVfSU5URVJOQUxfU0RLKQogI2ltcG9ydCA8V2ViS2l0QWRkaXRpb25zL1dlYlZpZXdJ bml0aWFsaXphdGlvbi5tbT4KICNlbmRpZgogCg==