130260 2014-03-14 13:37:18 -0700 [GTK][CMake] Add support for building with Clang 2014-03-20 11:23:29 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan bunhere commit-queue gyuyoung.kim rakuco sergio oldest_to_newest 990646 0 zan 2014-03-14 13:37:18 -0700 [GTK][CMake] Add support for building with Clang 990649 1 226761 zan 2014-03-14 13:50:17 -0700 Created attachment 226761 Patch 990665 2 226761 mrobinson 2014-03-14 14:15:20 -0700 Comment on attachment 226761 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226761&action=review > Source/cmake/OptionsCommon.cmake:37 > + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Qunused-arguments") CMake + gcc issues warnings about unused arguments, so I don't think we want this to be different with clang. 990682 3 226761 zan 2014-03-14 14:37:24 -0700 Comment on attachment 226761 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226761&action=review >> Source/cmake/OptionsCommon.cmake:37 >> + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Qunused-arguments") > > CMake + gcc issues warnings about unused arguments, so I don't think we want this to be different with clang. I believe you're thinking of -Wunused-arguments. -Qunused-arguments suppresses any arguments that were unused by the Clang driver, not unused arguments in code. 990857 4 226761 rakuco 2014-03-15 07:29:08 -0700 Comment on attachment 226761 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226761&action=review > Source/cmake/OptionsCommon.cmake:37 > + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Qunused-arguments") Is there a particular reason for forcing libc++? 990871 5 zan 2014-03-15 10:04:28 -0700 (In reply to comment #4) > (From update of attachment 226761 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=226761&action=review > > > Source/cmake/OptionsCommon.cmake:37 > > + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Qunused-arguments") > > Is there a particular reason for forcing libc++? It's best optimized for Clang much like libstdc++ is best optimized for GCC. For instance, when benchmarking changes in bug #128995 Clang with libc++ gave better numbers than Clang with libstdc++. The current WebKit code also has a few tender places where build errors occur when using Clang and libstdc++ 4.7 or 4.8.0 (but not 4.8.1 which is C++11-complete). There are no macro-based mechanisms that are oriented towards differentiating the code for the specific standard library in use, unlike the ones that enable guarding compiler-specific code. 990965 6 rakuco 2014-03-16 07:01:50 -0700 (In reply to comment #5) > (In reply to comment #4) > > Is there a particular reason for forcing libc++? > > It's best optimized for Clang much like libstdc++ is best optimized for GCC. For instance, when benchmarking changes in bug #128995 Clang with libc++ gave better numbers than Clang with libstdc++. Still, forcing a certain standard library is a problem for downstreams: not all people who may want to try clang also have libc++ installed, and even if they do but libstdc++ is used by default there are going to be crashes if people then mix the WebKit library(ies) with the rest of their code (ie. they produce a binary that depends on both libstdc++ and libc++, which has been a source of many crashes on FreeBSD land, for example). I believe it would be more beneficial and less likely to cause headaches if users were just made aware of the performance differences caused by using different standard libraries with clang. > The current WebKit code also has a few tender places where build errors occur when using Clang and libstdc++ 4.7 or 4.8.0 (but not 4.8.1 which is C++11-complete). There are no macro-based mechanisms that are oriented towards differentiating the code for the specific standard library in use, unlike the ones that enable guarding compiler-specific code. The usual idiom (for checking for libc++ at least) is to include a harmless header (for example, ciso646) and check for _LIBCPP_VERSION. See http://trac.webkit.org/changeset/108174 or http://trac.webkit.org/changeset/108179, for example. 991262 7 zan 2014-03-17 09:47:27 -0700 OK, let's leave it up to Clang to decide what standard library it wants to use. Inspecting the 3.4 release it looks like libstdc++ is chosen before libc++ for most toolchains (including Linux), with at least FreeBSD and NetBSD being exceptions. libc++ will still be enforceable through CXXFLAGS, of course. (In reply to comment #6) > > The current WebKit code also has a few tender places where build errors occur when using Clang and libstdc++ 4.7 or 4.8.0 (but not 4.8.1 which is C++11-complete). There are no macro-based mechanisms that are oriented towards differentiating the code for the specific standard library in use, unlike the ones that enable guarding compiler-specific code. > > The usual idiom (for checking for libc++ at least) is to include a harmless header (for example, ciso646) and check for _LIBCPP_VERSION. See http://trac.webkit.org/changeset/108174 or http://trac.webkit.org/changeset/108179, for example. I'll try to introduce a configure-time check for the Clang and libstdc++ combo, similar to one used in Autotools. 991276 8 226933 zan 2014-03-17 10:09:22 -0700 Created attachment 226933 Patch 991640 9 226933 rakuco 2014-03-18 06:42:00 -0700 Comment on attachment 226933 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226933&action=review > Source/cmake/gtest/CMakeLists.txt:27 > +if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") Just a nitpick/suggestion: newer versions of gtest have proper support for libc++, so maybe it would be good to add a comment indicating this could be removed once gtest is updated? 991854 10 226933 zan 2014-03-18 13:43:47 -0700 Comment on attachment 226933 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226933&action=review >> Source/cmake/gtest/CMakeLists.txt:27 >> +if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") > > Just a nitpick/suggestion: newer versions of gtest have proper support for libc++, so maybe it would be good to add a comment indicating this could be removed once gtest is updated? Sure, I'll add it in the next iteration or before landing. 991859 11 226933 mrobinson 2014-03-18 13:46:11 -0700 Comment on attachment 226933 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226933&action=review > Source/cmake/OptionsCommon.cmake:40 > + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments") > + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments") > +endif () Small nit. There's an extra space after FLAGS in both of these. 992605 12 zan 2014-03-20 11:23:29 -0700 Committed r165975: <http://trac.webkit.org/changeset/165975> 226761 2014-03-14 13:50:17 -0700 2014-03-17 10:09:10 -0700 Patch bug-130260-20140314134951.patch text/plain 6964 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1NjI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm1H VEsuY21ha2UgYi9Tb3VyY2UvUGxhdGZvcm1HVEsuY21ha2UKaW5kZXggNWE1NWM2MjAyZWY5MWMw YjNiNWRlZmU4MjliMDRlNTgzNTk2MzM1ZC4uYWZlMjdmZDdjMjU1MTNkMDY5YThlMzM3NmIzODU0 ZThmMjU1YWI2MiAxMDA2NDQKLS0tIGEvU291cmNlL1BsYXRmb3JtR1RLLmNtYWtlCisrKyBiL1Nv dXJjZS9QbGF0Zm9ybUdUSy5jbWFrZQpAQCAtMzMsNyArMzMsNyBAQCBtYWNybyhBRERfR1RLRE9D X0dFTkVSQVRPUiBfc3RhbXBfbmFtZSBfZXh0cmFfYXJncykKICAgICBhZGRfY3VzdG9tX2NvbW1h bmQoCiAgICAgICAgIE9VVFBVVCAiJHtDTUFLRV9CSU5BUllfRElSfS8ke19zdGFtcF9uYW1lfSIK ICAgICAgICAgREVQRU5EUyAke0RvY3VtZW50YXRpb25EZXBlbmRlbmNpZXN9Ci0gICAgICAgIENP TU1BTkQgQ0M9IiR7Q01BS0VfQ19DT01QSUxFUn0iICR7Q01BS0VfU09VUkNFX0RJUn0vVG9vbHMv Z3RrL2dlbmVyYXRlLWd0a2RvYyAke19leHRyYV9hcmdzfQorICAgICAgICBDT01NQU5EIENDPSR7 Q01BS0VfQ19DT01QSUxFUn0gQ0ZMQUdTPSR7Q01BS0VfQ19GTEFHU30gJHtDTUFLRV9TT1VSQ0Vf RElSfS9Ub29scy9ndGsvZ2VuZXJhdGUtZ3RrZG9jICR7X2V4dHJhX2FyZ3N9CiAgICAgICAgIENP TU1BTkQgdG91Y2ggJHtfc3RhbXBfbmFtZX0KICAgICAgICAgV09SS0lOR19ESVJFQ1RPUlkgIiR7 Q01BS0VfQklOQVJZX0RJUn0iCiAgICAgKQpkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtlL09wdGlv bnNDb21tb24uY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0NvbW1vbi5jbWFrZQppbmRleCA1 ODI0OTJjOWI1NjEzODU2YTEwMzgxOTZkMTM4ZDRkOWEzODg1NzdjLi4yOTU3MTYwOWYzNDgwMmM2 ODQ5MDQzN2Y0MGU2ZDVkYmJlNmYxMzJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvT3B0aW9u c0NvbW1vbi5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0NvbW1vbi5jbWFrZQpAQCAt MzIsNiArMzIsMTEgQEAgaWYgKENNQUtFX0NPTVBJTEVSX0lTX0dOVUNYWCBPUiAiJHtDTUFLRV9D WFhfQ09NUElMRVJfSUR9IiBTVFJFUVVBTCAiQ2xhbmciKQogICAgIHNldChDTUFLRV9DWFhfRkxB R1MgIiR7Q01BS0VfQ1hYX0ZMQUdTfSAtc3RkPWdudSsrMHgiKQogZW5kaWYgKCkKIAoraWYgKCIk e0NNQUtFX0NYWF9DT01QSUxFUl9JRH0iIFNUUkVRVUFMICJDbGFuZyIpCisgICAgc2V0KENNQUtF X0NfRkxBR1MgICIke0NNQUtFX0NfRkxBR1N9IC1RdW51c2VkLWFyZ3VtZW50cyIpCisgICAgc2V0 KENNQUtFX0NYWF9GTEFHUyAgIiR7Q01BS0VfQ1hYX0ZMQUdTfSAtc3RkbGliPWxpYmMrKyAtUXVu dXNlZC1hcmd1bWVudHMiKQorZW5kaWYgKCkKKwogc3RyaW5nKFRPTE9XRVIgJHtDTUFLRV9IT1NU X1NZU1RFTV9QUk9DRVNTT1J9IExPV0VSQ0FTRV9DTUFLRV9IT1NUX1NZU1RFTV9QUk9DRVNTT1Ip CiBpZiAoIiR7Q01BS0VfQ1hYX0NPTVBJTEVSX0lEfSIgU1RSRVFVQUwgIkdOVSIgQU5EICIke0xP V0VSQ0FTRV9DTUFLRV9IT1NUX1NZU1RFTV9QUk9DRVNTT1J9IiBNQVRDSEVTICIoaVszLTZdODZ8 eDg2KSIpCiAgICAgIyBUbyBhdm9pZCBvdXQgb2YgbWVtb3J5IHdoZW4gYnVpbGRpbmcgd2l0aCBk ZWJ1ZyBvcHRpb24gaW4gMzJiaXQgc3lzdGVtLgpkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtlL09w dGlvbnNHVEsuY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQppbmRleCAzMjM5 M2NkODJmNjcxNWQ4OTUxYmNmNzZjNzc0MDdhNmE3ODA3ZTk4Li5kMjJhZGM1YmFkYjc1NTczZGNj MDYzMGI2NjUxYzY0ZGI5NDcxZDQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0dU Sy5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQpAQCAtMjc2LDkgKzI3 NiwxNSBAQCBzZXQoV2ViS2l0MldlYkV4dGVuc2lvbl9QS0dDT05GSUdfRklMRSAke0NNQUtFX0JJ TkFSWV9ESVJ9L1NvdXJjZS9XZWJLaXQyL3dlYmtpdAogc2V0KFNIT1VMRF9JTlNUQUxMX0pTX1NI RUxMIE9OKQogCiAjIFB1c2ggb2YgcmJwIGlzIG5lZWRlZCBhZnRlciBKU0MgSklUIHVzZXMgQ1N0 YWNrLiBTZWUgaHR0cDovL3drYnVnLmNvbS8xMjc3NzcuCi1pZiAoQ01BS0VfQ09NUElMRVJfSVNf R05VQ0MgQU5EIFVOSVggQU5EIE5PVCBBUFBMRSkKLSAgICBzZXQoQ01BS0VfQ19GTEFHU19SRUxF QVNFICItZm5vLW9taXQtZnJhbWUtcG9pbnRlciAtZm5vLXRyZWUtZGNlICR7Q01BS0VfQ19GTEFH U19SRUxFQVNFfSIpCi0gICAgc2V0KENNQUtFX0NYWF9GTEFHU19SRUxFQVNFICItZm5vLW9taXQt ZnJhbWUtcG9pbnRlciAtZm5vLXRyZWUtZGNlICR7Q01BS0VfQ1hYX0ZMQUdTX1JFTEVBU0V9IikK K2lmIChVTklYIEFORCBOT1QgQVBQTEUpCisgICAgaWYgKENNQUtFX0NPTVBJTEVSX0lTX0dOVUNY WCkKKyAgICAgICAgc2V0KENNQUtFX0NfRkxBR1NfUkVMRUFTRSAiLWZuby1vbWl0LWZyYW1lLXBv aW50ZXIgLWZuby10cmVlLWRjZSAke0NNQUtFX0NfRkxBR1NfUkVMRUFTRX0iKQorICAgICAgICBz ZXQoQ01BS0VfQ1hYX0ZMQUdTX1JFTEVBU0UgIi1mbm8tb21pdC1mcmFtZS1wb2ludGVyIC1mbm8t dHJlZS1kY2UgJHtDTUFLRV9DWFhfRkxBR1NfUkVMRUFTRX0iKQorICAgIGVuZGlmICgpCisgICAg aWYgKCR7Q01BS0VfQ1hYX0NPTVBJTEVSX0lEfSBTVFJFUVVBTCAiQ2xhbmciKQorICAgICAgICBz ZXQoQ01BS0VfQ19GTEFHU19SRUxFQVNFICItZm5vLW9taXQtZnJhbWUtcG9pbnRlciAke0NNQUtF X0NfRkxBR1NfUkVMRUFTRX0iKQorICAgICAgICBzZXQoQ01BS0VfQ1hYX0ZMQUdTX1JFTEVBU0Ug Ii1mbm8tb21pdC1mcmFtZS1wb2ludGVyICR7Q01BS0VfQ1hYX0ZMQUdTX1JFTEVBU0V9IikKKyAg ICBlbmRpZiAoKQogZW5kaWYgKCkKIAogIyBBZGQgYSB0eXBlbGliIGZpbGUgdG8gdGhlIGxpc3Qg b2YgYWxsIHR5cGVsaWIgZGVwZW5kZW5jaWVzLiBUaGlzIG1ha2VzIGl0IGVhc3kgdG8KZGlmZiAt LWdpdCBhL1NvdXJjZS9jbWFrZS9ndGVzdC9DTWFrZUxpc3RzLnR4dCBiL1NvdXJjZS9jbWFrZS9n dGVzdC9DTWFrZUxpc3RzLnR4dAppbmRleCA3ZjUyMWE4OThiODlkOGRlYjMwOWM2ZTBmYmEwOGEz M2Y2NWViNWQ1Li4xMmE2N2FmNDJhMzk3MzhhMDQwZjU3Mjg5YjhmMjk0ZTI3ZmQ0N2I5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvY21ha2UvZ3Rlc3QvQ01ha2VMaXN0cy50eHQKKysrIGIvU291cmNlL2Nt YWtlL2d0ZXN0L0NNYWtlTGlzdHMudHh0CkBAIC0yNCw2ICsyNCwxMSBAQCBhZGRfbGlicmFyeShn dGVzdCBTSEFSRUQKIAogYWRkX2RlZmluaXRpb25zKC1ER1RFU1RfQ1JFQVRFX1NIQVJFRF9MSUJS QVJZPTEpCiAKK2lmICgiJHtDTUFLRV9DWFhfQ09NUElMRVJfSUR9IiBTVFJFUVVBTCAiQ2xhbmci KQorICAgIGFkZF9kZWZpbml0aW9ucygtREdURVNUX0hBU19UUjFfVFVQTEU9MCkKK2VuZGlmICgp CisKKwogdGFyZ2V0X2xpbmtfbGlicmFyaWVzKGd0ZXN0CiAgICAgV1RGCiApCmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjA2OGJlNzIwYWM3YTQ4 MjIwMDg0NWNjMGMyNGIwNWI4YmE3ZWViNS4uNTI5NmM1MWNmYzBiYTk4NjNlNDI2ODI0Y2ExN2M0 M2UzZTY1OGNjZiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTAzLTE0ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJz ZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVtDTWFrZV0gQWRkIHN1cHBvcnQgZm9yIGJ1 aWxkaW5nIHdpdGggQ2xhbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzMDI2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogVGVzdFdlYktpdEFQSS9DTWFrZUxpc3RzLnR4dDogV2hlbiBidWlsZGluZyB3 aXRoIENsYW5nIFRlc3RXZWJLaXRBUEkgc2hvdWxkIGJlCisgICAgICAgIGJ1aWx0IHdpdGggR1RF U1RfSEFTX1RSMV9UVVBMRSBkZWZpbmVkIHRvIDAgdG8gYXZvaWQgYnVpbGQgZmFpbHVyZXMgb2Nj dXJpbmcgaW4gdGhlCisgICAgICAgIGluY2x1ZGVkIEdUZXN0IGZyYW1ld29yayBoZWFkZXJzLgor ICAgICAgICAqIGd0ay9nZW5lcmF0ZS1ndGtkb2M6CisgICAgICAgIChwcmVwYXJlX2Vudmlyb25t ZW50X2Zvcl9ndGtkb2NfZ2VuZXJhdGlvbik6IERvbid0IG1vZGlmeSB0aGUgQ0ZMQUdTIGVudiBh bnltb3JlCisgICAgICAgIGluIGNhc2Ugb2YgdXNpbmcgQ2xhbmcgc2luY2UgdGhhdCBpcyBub3cg c2V0IGJ5IHRoZSBDTWFrZSBydWxlLgorCiAyMDE0LTAzLTE0ICBKaW53b28gU29uZyAgPGppbndv bzcuc29uZ0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXVtNaW5pQnJvd3Nlcl0gUmV2aXNl IGhlbHAgbWVzc2FnZXMgb2YgY29tbWFuZCBsaW5lIHBhcmFtZXRlcnMKZGlmZiAtLWdpdCBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvQ01ha2VMaXN0cy50eHQgYi9Ub29scy9UZXN0V2ViS2l0QVBJL0NN YWtlTGlzdHMudHh0CmluZGV4IDllZDQ4ODQ1Y2UzNzg5OGVjMTZlMzRmZmJkMzNiZmM2ZDUwMGM3 OGMuLjIyOTNkNDlmY2ZkNDgwZmUwMGJlOGQzMzc2ODIzZjI2MjMyZWY1NDIgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvQ01ha2VMaXN0cy50eHQKKysrIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9DTWFrZUxpc3RzLnR4dApAQCAtOTEsNiArOTEsMTAgQEAgYWRkX2RlZmluaXRpb25zKC1E R1RFU1RfTElOS0VEX0FTX1NIQVJFRF9MSUJSQVJZPTEKICAgICAtRFRFU1RfSU5KRUNURURfQlVO RExFX1BBVEg9XCIke1Rlc3RXZWJLaXRBUElJbmplY3RlZEJ1bmRsZV9QQVRIfVwiCiApCiAKK2lm ICgiJHtDTUFLRV9DWFhfQ09NUElMRVJfSUR9IiBTVFJFUVVBTCAiQ2xhbmciKQorICAgIGFkZF9k ZWZpbml0aW9ucygtREdURVNUX0hBU19UUjFfVFVQTEU9MCkKK2VuZGlmICgpCisKIGFkZF9leGVj dXRhYmxlKFRlc3RXVEYKICAgICAke3Rlc3RfbWFpbl9TT1VSQ0VTfQogICAgICR7VEVTVFdFQktJ VEFQSV9ESVJ9L1Rlc3RzQ29udHJvbGxlci5jcHAKZGlmZiAtLWdpdCBhL1Rvb2xzL2d0ay9nZW5l cmF0ZS1ndGtkb2MgYi9Ub29scy9ndGsvZ2VuZXJhdGUtZ3RrZG9jCmluZGV4IDU4ZGRjNDIxZjE4 YzA0M2JlNzBiZTg3NzcwZjkyZDkyZThiMDZhYjAuLmY3MzBlYTQwMDlhMzJhNTIxNmY3YWM2ZTcy MWUwY2E1YmNhOGY2ZDAgMTAwNzU1Ci0tLSBhL1Rvb2xzL2d0ay9nZW5lcmF0ZS1ndGtkb2MKKysr IGIvVG9vbHMvZ3RrL2dlbmVyYXRlLWd0a2RvYwpAQCAtMTY5LDEwICsxNjksNiBAQCBkZWYgcHJl cGFyZV9lbnZpcm9ubWVudF9mb3JfZ3RrZG9jX2dlbmVyYXRpb24oKToKICAgICBjZmxhZ3MgKz0g JyAtREdMSUJfVkVSU0lPTl9NSU5fUkVRVUlSRUQ9R0xJQl9WRVJTSU9OXzJfMzInCiAgICAgb3Mu ZW52aXJvblsnQ0ZMQUdTJ10gPSBjZmxhZ3MKIAotICAgICMgQ2xhbmcgY2FuIGJlIG5vaXN5LCB0 aHJvd2luZyB1bm5lY2Vzc2FyeSB3YXJuaW5ncyBmb3IgdW51c2VkIGFyZ3VtZW50cy4KLSAgICBp ZiBvcy5lbnZpcm9uLmdldCgnQ0MnKSA9PSAiY2xhbmciOgotICAgICAgICBvcy5lbnZpcm9uWydD RkxBR1MnXSArPSAnIC1RdW51c2VkLWFyZ3VtZW50cycKLQogICAgICMgUGF0aHMgZnJvbSB0aGUg R05VbWFrZWZpbGUgZ2VuZXJhdGVkIGNvbmZpZ3VyYXRpb24gZmlsZXMgYXJlIHJlbGF0aXZlIHRv IHRoZSBidWlsZCBkaXJlY3RvcnkuCiAgICAgb3MuY2hkaXIoY29tbW9uLmJ1aWxkX3BhdGgoKSkK IApkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IDdkZTJjNjdlOWVkMmJl NGJhMTQ3NGYzM2E0NTI3MTRmZmNmNDEwMjUuLmE0MDBlNWQwNGQzZGZlYWU2N2E2MjdmYWVlYjli NjQ0NzhiMDg2OTkgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxNC0wMy0xNCAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5j b20+CisKKyAgICAgICAgW0dUS11bQ01ha2VdIEFkZCBzdXBwb3J0IGZvciBidWlsZGluZyB3aXRo IENsYW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzAyNjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFNvdXJjZS9QbGF0Zm9ybUdUSy5jbWFrZTogUnVuIHRoZSBnZW5lcmF0ZS1ndGtkb2Mgc2NyaXB0 IHdpdGggdGhlIENGTEFHUyBlbnYgc2V0CisgICAgICAgIHRvIHRoZSBsaXN0IEMgY29tcGlsZXIg ZmxhZ3MgYXMgY29uc3RydWN0ZWQgYnkgQ01ha2UuCisgICAgICAgICogU291cmNlL2NtYWtlL09w dGlvbnNDb21tb24uY21ha2U6IFdoZW4gYnVpbGRpbmcgd2l0aCBDbGFuZyB0aGUgLVF1bnVzZWQt YXJndW1lbnRzCisgICAgICAgIGNvbXBpbGVyIG9wdGlvbiBhbmQgbGliYysrIHNob3VsZCBiZSB1 c2VkLgorICAgICAgICAqIFNvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlOiBVc2UgLWZuby1v bWl0LWZyYW1lLXBvaW50ZXIgZm9yIGJvdGggR0NDIGFuZCBDbGFuZy4KKyAgICAgICAgLWZuby10 cmVlLWRjZSBzaG91bGQgYmUgdXNlZCBvbmx5IGZvciBHQ0MuCisgICAgICAgICogU291cmNlL2Nt YWtlL2d0ZXN0L0NNYWtlTGlzdHMudHh0OiBXaGVuIGJ1aWxkaW5nIHdpdGggQ2xhbmcgdGhlIEdU ZXN0IGZyYW1ld29yaworICAgICAgICBzaG91bGQgYmUgYnVpbHQgd2l0aCBHVEVTVF9IQVNfVFIx X1RVUExFIG1hY3JvIGRlZmluZWQgdG8gMCB0byBhdm9pZCBidWlsZCBmYWlsdXJlcy4KKwogMjAx NC0wMy0xMyAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1hcmlvLnByYWRhQHNhbXN1bmcuY29tPgog CiAgICAgICAgIFtDTWFrZV0gRmFpbHVyZSB0byBsaW5rIHdpdGggb2xkZXIgaW5zdGFsbGF0aW9u cyBvZiBXZWJQCg== 226933 2014-03-17 10:09:22 -0700 2014-03-18 13:46:11 -0700 Patch bug-130260-20140317100858.patch text/plain 6559 zan SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDE2NTcz OCkKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE0LTAz LTE3ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RL XVtDTWFrZV0gQWRkIHN1cHBvcnQgZm9yIGJ1aWxkaW5nIHdpdGggQ2xhbmcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDI2MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU291cmNlL1BsYXRmb3JtR1RL LmNtYWtlOiBSdW4gdGhlIGdlbmVyYXRlLWd0a2RvYyBzY3JpcHQgd2l0aCB0aGUgQ0ZMQUdTIGVu diBzZXQKKyAgICAgICAgdG8gdGhlIGxpc3QgQyBjb21waWxlciBmbGFncyBhcyBjb25zdHJ1Y3Rl ZCBieSBDTWFrZS4KKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0NvbW1vbi5jbWFrZTog V2hlbiBidWlsZGluZyB3aXRoIENsYW5nLCB1c2UgdGhlIC1RdW51c2VkLWFyZ3VtZW50cworICAg ICAgICBjb21waWxlciBvcHRpb24gdG8gc3VwcHJlc3MgdmVyYm9zZSB3YXJuaW5ncyBhYm91dCBh cmd1bWVudHMgdGhhdCB3ZW50IHVudXNlZCBieSB0aGUgZHJpdmVyLgorICAgICAgICAqIFNvdXJj ZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlOiBVc2UgLWZuby1vbWl0LWZyYW1lLXBvaW50ZXIgZm9y IGJvdGggR0NDIGFuZCBDbGFuZy4KKyAgICAgICAgLWZuby10cmVlLWRjZSBzaG91bGQgYmUgdXNl ZCBvbmx5IGZvciBHQ0MuCisgICAgICAgICogU291cmNlL2NtYWtlL2d0ZXN0L0NNYWtlTGlzdHMu dHh0OiBXaGVuIGJ1aWxkaW5nIHdpdGggQ2xhbmcgdGhlIEdUZXN0IGZyYW1ld29yaworICAgICAg ICBzaG91bGQgYmUgYnVpbHQgd2l0aCBHVEVTVF9IQVNfVFIxX1RVUExFIG1hY3JvIGRlZmluZWQg dG8gMCB0byBhdm9pZCBidWlsZCBmYWlsdXJlcy4KKwogMjAxNC0wMy0xNyAgTWFydGluIFJvYmlu c29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bQ01ha2VdIENyZWRl bnRpYWwgc3RvcmFnZSBpcyBub3QgZW5hYmxlZApJbmRleDogU291cmNlL1BsYXRmb3JtR1RLLmNt YWtlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9QbGF0Zm9ybUdUSy5jbWFrZQkocmV2aXNpb24gMTY1 NzM4KQorKysgU291cmNlL1BsYXRmb3JtR1RLLmNtYWtlCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw3 ICszMyw3IEBAIG1hY3JvKEFERF9HVEtET0NfR0VORVJBVE9SIF9zdGFtcF9uYW1lIF8KICAgICBh ZGRfY3VzdG9tX2NvbW1hbmQoCiAgICAgICAgIE9VVFBVVCAiJHtDTUFLRV9CSU5BUllfRElSfS8k e19zdGFtcF9uYW1lfSIKICAgICAgICAgREVQRU5EUyAke0RvY3VtZW50YXRpb25EZXBlbmRlbmNp ZXN9Ci0gICAgICAgIENPTU1BTkQgQ0M9IiR7Q01BS0VfQ19DT01QSUxFUn0iICR7Q01BS0VfU09V UkNFX0RJUn0vVG9vbHMvZ3RrL2dlbmVyYXRlLWd0a2RvYyAke19leHRyYV9hcmdzfQorICAgICAg ICBDT01NQU5EIENDPSR7Q01BS0VfQ19DT01QSUxFUn0gQ0ZMQUdTPSR7Q01BS0VfQ19GTEFHU30g JHtDTUFLRV9TT1VSQ0VfRElSfS9Ub29scy9ndGsvZ2VuZXJhdGUtZ3RrZG9jICR7X2V4dHJhX2Fy Z3N9CiAgICAgICAgIENPTU1BTkQgdG91Y2ggJHtfc3RhbXBfbmFtZX0KICAgICAgICAgV09SS0lO R19ESVJFQ1RPUlkgIiR7Q01BS0VfQklOQVJZX0RJUn0iCiAgICAgKQpJbmRleDogU291cmNlL2Nt YWtlL09wdGlvbnNDb21tb24uY21ha2UKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL2NtYWtlL09wdGlv bnNDb21tb24uY21ha2UJKHJldmlzaW9uIDE2NTczOCkKKysrIFNvdXJjZS9jbWFrZS9PcHRpb25z Q29tbW9uLmNtYWtlCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw2ICszNCwxMSBAQCBpZiAoQ01BS0Vf Q09NUElMRVJfSVNfR05VQ1hYIE9SICIke0NNQUtFCiAKIGVuZGlmICgpCiAKK2lmICgiJHtDTUFL RV9DWFhfQ09NUElMRVJfSUR9IiBTVFJFUVVBTCAiQ2xhbmciKQorICAgIHNldChDTUFLRV9DX0ZM QUdTICAiJHtDTUFLRV9DX0ZMQUdTfSAtUXVudXNlZC1hcmd1bWVudHMiKQorICAgIHNldChDTUFL RV9DWFhfRkxBR1MgICIke0NNQUtFX0NYWF9GTEFHU30gLVF1bnVzZWQtYXJndW1lbnRzIikKK2Vu ZGlmICgpCisKIHN0cmluZyhUT0xPV0VSICR7Q01BS0VfSE9TVF9TWVNURU1fUFJPQ0VTU09SfSBM T1dFUkNBU0VfQ01BS0VfSE9TVF9TWVNURU1fUFJPQ0VTU09SKQogaWYgKCIke0NNQUtFX0NYWF9D T01QSUxFUl9JRH0iIFNUUkVRVUFMICJHTlUiIEFORCAiJHtMT1dFUkNBU0VfQ01BS0VfSE9TVF9T WVNURU1fUFJPQ0VTU09SfSIgTUFUQ0hFUyAiKGlbMy02XTg2fHg4NikiKQogICAgICMgVG8gYXZv aWQgb3V0IG9mIG1lbW9yeSB3aGVuIGJ1aWxkaW5nIHdpdGggZGVidWcgb3B0aW9uIGluIDMyYml0 IHN5c3RlbS4KSW5kZXg6IFNvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCShyZXZpc2lvbiAxNjU3MzgpCisrKyBT b3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQkod29ya2luZyBjb3B5KQpAQCAtMjg3LDkgKzI4 NywxNSBAQCBzZXQoV2ViS2l0MldlYkV4dGVuc2lvbl9QS0dDT05GSUdfRklMRSAkCiBzZXQoU0hP VUxEX0lOU1RBTExfSlNfU0hFTEwgT04pCiAKICMgUHVzaCBvZiByYnAgaXMgbmVlZGVkIGFmdGVy IEpTQyBKSVQgdXNlcyBDU3RhY2suIFNlZSBodHRwOi8vd2tidWcuY29tLzEyNzc3Ny4KLWlmIChD TUFLRV9DT01QSUxFUl9JU19HTlVDQyBBTkQgVU5JWCBBTkQgTk9UIEFQUExFKQotICAgIHNldChD TUFLRV9DX0ZMQUdTX1JFTEVBU0UgIi1mbm8tb21pdC1mcmFtZS1wb2ludGVyIC1mbm8tdHJlZS1k Y2UgJHtDTUFLRV9DX0ZMQUdTX1JFTEVBU0V9IikKLSAgICBzZXQoQ01BS0VfQ1hYX0ZMQUdTX1JF TEVBU0UgIi1mbm8tb21pdC1mcmFtZS1wb2ludGVyIC1mbm8tdHJlZS1kY2UgJHtDTUFLRV9DWFhf RkxBR1NfUkVMRUFTRX0iKQoraWYgKFVOSVggQU5EIE5PVCBBUFBMRSkKKyAgICBpZiAoQ01BS0Vf Q09NUElMRVJfSVNfR05VQ1hYKQorICAgICAgICBzZXQoQ01BS0VfQ19GTEFHU19SRUxFQVNFICIt Zm5vLW9taXQtZnJhbWUtcG9pbnRlciAtZm5vLXRyZWUtZGNlICR7Q01BS0VfQ19GTEFHU19SRUxF QVNFfSIpCisgICAgICAgIHNldChDTUFLRV9DWFhfRkxBR1NfUkVMRUFTRSAiLWZuby1vbWl0LWZy YW1lLXBvaW50ZXIgLWZuby10cmVlLWRjZSAke0NNQUtFX0NYWF9GTEFHU19SRUxFQVNFfSIpCisg ICAgZW5kaWYgKCkKKyAgICBpZiAoJHtDTUFLRV9DWFhfQ09NUElMRVJfSUR9IFNUUkVRVUFMICJD bGFuZyIpCisgICAgICAgIHNldChDTUFLRV9DX0ZMQUdTX1JFTEVBU0UgIi1mbm8tb21pdC1mcmFt ZS1wb2ludGVyICR7Q01BS0VfQ19GTEFHU19SRUxFQVNFfSIpCisgICAgICAgIHNldChDTUFLRV9D WFhfRkxBR1NfUkVMRUFTRSAiLWZuby1vbWl0LWZyYW1lLXBvaW50ZXIgJHtDTUFLRV9DWFhfRkxB R1NfUkVMRUFTRX0iKQorICAgIGVuZGlmICgpCiBlbmRpZiAoKQogCiAjIEFkZCBhIHR5cGVsaWIg ZmlsZSB0byB0aGUgbGlzdCBvZiBhbGwgdHlwZWxpYiBkZXBlbmRlbmNpZXMuIFRoaXMgbWFrZXMg aXQgZWFzeSB0bwpJbmRleDogU291cmNlL2NtYWtlL2d0ZXN0L0NNYWtlTGlzdHMudHh0Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9jbWFrZS9ndGVzdC9DTWFrZUxpc3RzLnR4dAkocmV2aXNpb24gMTY1 NzM4KQorKysgU291cmNlL2NtYWtlL2d0ZXN0L0NNYWtlTGlzdHMudHh0CSh3b3JraW5nIGNvcHkp CkBAIC0yNCw2ICsyNCwxMSBAQCBhZGRfbGlicmFyeShndGVzdCBTSEFSRUQKIAogYWRkX2RlZmlu aXRpb25zKC1ER1RFU1RfQ1JFQVRFX1NIQVJFRF9MSUJSQVJZPTEgLURHVEVTVF9IQVNfUlRUST0w KQogCitpZiAoIiR7Q01BS0VfQ1hYX0NPTVBJTEVSX0lEfSIgU1RSRVFVQUwgIkNsYW5nIikKKyAg ICBhZGRfZGVmaW5pdGlvbnMoLURHVEVTVF9IQVNfVFIxX1RVUExFPTApCitlbmRpZiAoKQorCisK IHRhcmdldF9saW5rX2xpYnJhcmllcyhndGVzdAogICAgIFdURgogKQpJbmRleDogVG9vbHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTY1NzM4KQor KysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTQt MDMtMTcgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtH VEtdW0NNYWtlXSBBZGQgc3VwcG9ydCBmb3IgYnVpbGRpbmcgd2l0aCBDbGFuZworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwMjYwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL0NN YWtlTGlzdHMudHh0OiBXaGVuIGJ1aWxkaW5nIHdpdGggQ2xhbmcgVGVzdFdlYktpdEFQSSBzaG91 bGQgYmUKKyAgICAgICAgYnVpbHQgd2l0aCBHVEVTVF9IQVNfVFIxX1RVUExFIGRlZmluZWQgdG8g MCB0byBhdm9pZCBidWlsZCBmYWlsdXJlcyBvY2N1cmluZyBpbiB0aGUKKyAgICAgICAgaW5jbHVk ZWQgR1Rlc3QgZnJhbWV3b3JrIGhlYWRlcnMuCisgICAgICAgICogZ3RrL2dlbmVyYXRlLWd0a2Rv YzoKKyAgICAgICAgKHByZXBhcmVfZW52aXJvbm1lbnRfZm9yX2d0a2RvY19nZW5lcmF0aW9uKTog RG9uJ3QgbW9kaWZ5IHRoZSBDRkxBR1MgZW52IGFueW1vcmUKKyAgICAgICAgaW4gY2FzZSBvZiB1 c2luZyBDbGFuZyBzaW5jZSB0aGF0IGlzIG5vdyBzZXQgYnkgdGhlIENNYWtlIHJ1bGUuCisKIDIw MTQtMDMtMTcgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtHVEtdW0NNYWtlXSBFbnN1cmUgdGhhdCBIQVZFX0dUS19VTklYX1BSSU5USU5HIGlzIGRl ZmluZWQgd2hlbiBhcHByb3ByaWF0ZQpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9DTWFrZUxp c3RzLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL0NNYWtlTGlzdHMudHh0 CShyZXZpc2lvbiAxNjU3MzgpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL0NNYWtlTGlzdHMudHh0 CSh3b3JraW5nIGNvcHkpCkBAIC05MSw2ICs5MSwxMCBAQCBhZGRfZGVmaW5pdGlvbnMoLURHVEVT VF9MSU5LRURfQVNfU0hBUkVECiAgICAgLURURVNUX0lOSkVDVEVEX0JVTkRMRV9QQVRIPVwiJHtU ZXN0V2ViS2l0QVBJSW5qZWN0ZWRCdW5kbGVfUEFUSH1cIgogKQogCitpZiAoIiR7Q01BS0VfQ1hY X0NPTVBJTEVSX0lEfSIgU1RSRVFVQUwgIkNsYW5nIikKKyAgICBhZGRfZGVmaW5pdGlvbnMoLURH VEVTVF9IQVNfVFIxX1RVUExFPTApCitlbmRpZiAoKQorCiBhZGRfZXhlY3V0YWJsZShUZXN0V1RG CiAgICAgJHt0ZXN0X21haW5fU09VUkNFU30KICAgICAke1RFU1RXRUJLSVRBUElfRElSfS9UZXN0 c0NvbnRyb2xsZXIuY3BwCkluZGV4OiBUb29scy9ndGsvZ2VuZXJhdGUtZ3RrZG9jCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL2d0ay9nZW5lcmF0ZS1ndGtkb2MJKHJldmlzaW9uIDE2NTczOCkKKysrIFRv b2xzL2d0ay9nZW5lcmF0ZS1ndGtkb2MJKHdvcmtpbmcgY29weSkKQEAgLTE2OSwxMCArMTY5LDYg QEAgZGVmIHByZXBhcmVfZW52aXJvbm1lbnRfZm9yX2d0a2RvY19nZW5lcgogICAgIGNmbGFncyAr PSAnIC1ER0xJQl9WRVJTSU9OX01JTl9SRVFVSVJFRD1HTElCX1ZFUlNJT05fMl8zMicKICAgICBv cy5lbnZpcm9uWydDRkxBR1MnXSA9IGNmbGFncwogCi0gICAgIyBDbGFuZyBjYW4gYmUgbm9pc3ks IHRocm93aW5nIHVubmVjZXNzYXJ5IHdhcm5pbmdzIGZvciB1bnVzZWQgYXJndW1lbnRzLgotICAg IGlmIG9zLmVudmlyb24uZ2V0KCdDQycpID09ICJjbGFuZyI6Ci0gICAgICAgIG9zLmVudmlyb25b J0NGTEFHUyddICs9ICcgLVF1bnVzZWQtYXJndW1lbnRzJwotCiAgICAgIyBQYXRocyBmcm9tIHRo ZSBHTlVtYWtlZmlsZSBnZW5lcmF0ZWQgY29uZmlndXJhdGlvbiBmaWxlcyBhcmUgcmVsYXRpdmUg dG8gdGhlIGJ1aWxkIGRpcmVjdG9yeS4KICAgICBvcy5jaGRpcihjb21tb24uYnVpbGRfcGF0aCgp KQogCg==