150030 2015-10-12 09:28:46 -0700 [GStreamer][Mac] Fix WebAudio build 2015-10-31 10:49:40 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 144560 126492 1 pnormand pnormand bugs-noreply cgarcia commit-queue mcatanzaro mrobinson philip.chimento oldest_to_newest 1132321 0 pnormand 2015-10-12 09:28:46 -0700 For now (at least) we should disable Accelerate.framework when building WebAudio for the GTK port on Mac. Unless we can somehow link against a .framework? 1132339 1 262895 pnormand 2015-10-12 10:11:24 -0700 Created attachment 262895 Patch 1132344 2 262895 mrobinson 2015-10-12 10:21:33 -0700 Comment on attachment 262895 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262895&action=review Looks pretty good, but I'm going to suggest a few tweaks. > Source/WebCore/platform/audio/Biquad.cpp:40 > -#if OS(DARWIN) > +#if USING_ACCELERATE Why USING instead of USE_, which is more common in WebKit and would allow the use of the USE(...) macro? > Source/WebCore/platform/audio/Biquad.h:40 > +#if OS(DARWIN) && !PLATFORM(GTK) > +#define USING_ACCELERATE 1 > +#else > +#define USING_ACCELERATE 0 > +#endif I think it might be worth calling this USE_ACCELERATE_FRAMEWORK since ACCELERATE is such a general term. > Source/WebCore/platform/audio/DirectConvolver.cpp:77 > -#if OS(DARWIN) > +#if OS(DARWIN) && !PLATFORM(GTK) > #if defined(__ppc__) || defined(__i386__) Why don't these apply to GTK+? The ChangeLog does not specify. Would USE(ACCELERATE_FRAMEWORK) make sense here as well? > Source/WebCore/platform/audio/FFTFrame.h:41 > +#elif OS(DARWIN) > +#include <Accelerate/Accelerate.h> > #endif // USE(WEBAUDIO_GSTREAMER) I think it might make sense to pull this out into its own block, simply because it's a little confusing to mix it with the GStreamer ones. 1135227 3 262895 pnormand 2015-10-21 09:20:22 -0700 Comment on attachment 262895 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262895&action=review >> Source/WebCore/platform/audio/DirectConvolver.cpp:77 >> #if defined(__ppc__) || defined(__i386__) > > Why don't these apply to GTK+? The ChangeLog does not specify. Would USE(ACCELERATE_FRAMEWORK) make sense here as well? The vDSP_conv function is part of the Accelerate.framework AFAICS. So yeah I'll update the ifdef accordingly :) 1135230 4 263684 pnormand 2015-10-21 09:31:01 -0700 Created attachment 263684 Patch 1135326 5 263684 darin 2015-10-21 12:20:28 -0700 Comment on attachment 263684 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=263684&action=review > Source/WTF/wtf/Platform.h:1136 > +/* Disable the Accelerate.framework on Darwin (and Linux obviously) flavors of the GTK and EFL ports. */ > +#if (OS(DARWIN) || OS(LINUX)) && (PLATFORM(GTK) || PLATFORM(EFL)) > +#define USE_ACCELERATE_FRAMEWORK 0 > +#else > +#define USE_ACCELERATE_FRAMEWORK 1 > +#endif This conditional seems wrong. I wouldn’t want USE_ACCELERATE_FRAMEWORK to be 1 on Windows, for example. I think we want: #if OS(DARWIN) && !(PLATFORM(GTK) || PLATFORM(EFL)) #define USE_ACCELERATE_FRAMEWORK 1 #else #define USE_ACCELERATE_FRAMEWORK 0 #endif But maybe that’s not quite right either. > Source/WebCore/platform/audio/DirectConvolver.cpp:355 > +#endif // OS(DARWIN) && !PLATFORM(GTK) Not right. Please fix. > Source/WebCore/platform/audio/FFTFrame.h:43 > +#if USE(ACCELERATE_FRAMEWORK) > +#include <Accelerate/Accelerate.h> > +#endif // USE(ACCELERATE_FRAMEWORK) The comment on the #endif here doesn’t seem helpful. I think we should not do these when they are so close to the #if. Just makes things messier and less clear. Probably should mention this in coding style guidelines. 1135568 6 263684 philip.chimento 2015-10-21 21:40:29 -0700 Comment on attachment 263684 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=263684&action=review > Source/WTF/wtf/Platform.h:1131 > +/* Disable the Accelerate.framework on Darwin (and Linux obviously) flavors of the GTK and EFL ports. */ Note, I have something similar on #144560 at https://bugs.webkit.org/attachment.cgi?id=255295&action=diff#a/Source/WTF/wtf/Platform.h_sec1 You might not have to add USE_ACCELERATE_FRAMEWORK, it looks like USE_ACCELERATE already exists. 1135698 7 263830 pnormand 2015-10-22 08:43:56 -0700 Created attachment 263830 Patch 1138170 8 263830 commit-queue 2015-10-31 10:49:37 -0700 Comment on attachment 263830 Patch Clearing flags on attachment: 263830 Committed r191844: <http://trac.webkit.org/changeset/191844> 1138171 9 commit-queue 2015-10-31 10:49:40 -0700 All reviewed patches have been landed. Closing bug. 262895 2015-10-12 10:11:24 -0700 2015-10-21 09:30:55 -0700 Patch bug-150030-20151012191047.patch text/plain 6881 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMTkwNzgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTY5M2VjOTBmMDMxOGU2 MzFiNTI5Nzc1MDM0ZGNjNmIzYWZjMTE0ZS4uNzczZjRhZWM3MjFkYzZkOTcwOGUwYTg5NDg0MjAx YmZkMzMxNTA2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE1LTEwLTEyICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XVtNYWNdIEZpeCBXZWJBdWRpbyBidWlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTUwMDMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRGlzYWJsZSBBY2NlbGVyYXRlLmZyYW1ld29yayBzdXBwb3J0IG9u IE1hYyB3aGVuIGJ1aWxkaW5nIHRoZSBHVEsgcG9ydC4KKworICAgICAgICAqIHBsYXRmb3JtL2F1 ZGlvL0JpcXVhZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpCaXF1YWQ6OkJpcXVhZCk6CisgICAg ICAgIChXZWJDb3JlOjpCaXF1YWQ6OnByb2Nlc3MpOgorICAgICAgICAoV2ViQ29yZTo6QmlxdWFk OjpyZXNldCk6CisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vQmlxdWFkLmg6CisgICAgICAgICog cGxhdGZvcm0vYXVkaW8vRGlyZWN0Q29udm9sdmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRp cmVjdENvbnZvbHZlcjo6cHJvY2Vzcyk6CisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vRkZURnJh bWUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZGVEZyYW1lOjpkc3BTcGxpdENvbXBsZXgpOiBEZWxl dGVkLgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL1ZlY3Rvck1hdGguY3BwOgorICAgICAgICAo V2ViQ29yZTo6VmVjdG9yTWF0aDo6dmNsaXApOiBEZWxldGVkLgorCiAyMDE1LTA2LTE5ICBQaGls aXAgQ2hpbWVudG8gIDxwaGlsaXAuY2hpbWVudG9AZ21haWwuY29tPgogCiAgICAgICAgIFtHVEtd IEZpeCBjb21iaW5hdGlvbnMgb2YgUExBVEZPUk0oR1RLKSBhbmQgT1MoREFSV0lOKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQmlxdWFkLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL0JpcXVhZC5jcHAKaW5kZXggNTAzOWI4NTkxNDAxNWVjMzM0 YWUwYjQ0NGFkMWY2YjU1MGIwMGM1OS4uODUwOGJhOGZmMjNjMzg1MDczOWUyOWVhZGMyOGMyZmJk MDhlMDMyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQmlxdWFk LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9CaXF1YWQuY3BwCkBAIC0z Nyw3ICszNyw3IEBACiAjaW5jbHVkZSA8c3RkaW8uaD4KICNpbmNsdWRlIDx3dGYvTWF0aEV4dHJh cy5oPgogCi0jaWYgT1MoREFSV0lOKQorI2lmIFVTSU5HX0FDQ0VMRVJBVEUKIC8vIFdvcmsgYXJv dW5kIGEgYnVnIHdoZXJlIFZGb3JjZS5oIGZvcndhcmQgZGVjbGFyZXMgc3RkOjpjb21wbGV4IGlu IGEgd2F5IHRoYXQncyBpbmNvbXBhdGlibGUgd2l0aCBsaWJjKysgY29tcGxleC4KICNkZWZpbmUg X19WRk9SQ0VfSAogI2luY2x1ZGUgPEFjY2VsZXJhdGUvQWNjZWxlcmF0ZS5oPgpAQCAtNDUsMTMg KzQ1LDEzIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotI2lmIE9TKERBUldJTikKKyNpZiBV U0lOR19BQ0NFTEVSQVRFCiBjb25zdCBpbnQga0J1ZmZlclNpemUgPSAxMDI0OwogI2VuZGlmCiAK IEJpcXVhZDo6QmlxdWFkKCkKIHsKLSNpZiBPUyhEQVJXSU4pCisjaWYgVVNJTkdfQUNDRUxFUkFU RQogICAgIC8vIEFsbG9jYXRlIHR3byBzYW1wbGVzIG1vcmUgZm9yIGZpbHRlciBoaXN0b3J5CiAg ICAgbV9pbnB1dEJ1ZmZlci5hbGxvY2F0ZShrQnVmZmVyU2l6ZSArIDIpOwogICAgIG1fb3V0cHV0 QnVmZmVyLmFsbG9jYXRlKGtCdWZmZXJTaXplICsgMik7CkBAIC02OSw3ICs2OSw3IEBAIEJpcXVh ZDo6fkJpcXVhZCgpCiAKIHZvaWQgQmlxdWFkOjpwcm9jZXNzKGNvbnN0IGZsb2F0KiBzb3VyY2VQ LCBmbG9hdCogZGVzdFAsIHNpemVfdCBmcmFtZXNUb1Byb2Nlc3MpCiB7Ci0jaWYgT1MoREFSV0lO KQorI2lmIFVTSU5HX0FDQ0VMRVJBVEUKICAgICAvLyBVc2UgdmVjTGliIGlmIGF2YWlsYWJsZQog ICAgIHByb2Nlc3NGYXN0KHNvdXJjZVAsIGRlc3RQLCBmcmFtZXNUb1Byb2Nlc3MpOwogCkBAIC0x MTgsNyArMTE4LDcgQEAgdm9pZCBCaXF1YWQ6OnByb2Nlc3MoY29uc3QgZmxvYXQqIHNvdXJjZVAs IGZsb2F0KiBkZXN0UCwgc2l6ZV90IGZyYW1lc1RvUHJvY2VzcykKICNlbmRpZgogfQogCi0jaWYg T1MoREFSV0lOKQorI2lmIFVTSU5HX0FDQ0VMRVJBVEUKIAogLy8gSGVyZSB3ZSBoYXZlIG9wdGlt aXplZCB2ZXJzaW9uIHVzaW5nIEFjY2VsZXJhdGUuZnJhbWV3b3JrCiAKQEAgLTE3MiwxMiArMTcy LDEyIEBAIHZvaWQgQmlxdWFkOjpwcm9jZXNzU2xpY2VGYXN0KGRvdWJsZSogc291cmNlUCwgZG91 YmxlKiBkZXN0UCwgZG91YmxlKiBjb2VmZmljaWVuCiAgICAgZGVzdFBbMV0gPSBkZXN0UFtmcmFt ZXNUb1Byb2Nlc3MgLSAxICsgMl07CiB9CiAKLSNlbmRpZiAvLyBPUyhEQVJXSU4pCisjZW5kaWYg Ly8gVVNJTkdfQUNDRUxFUkFURQogCiAKIHZvaWQgQmlxdWFkOjpyZXNldCgpCiB7Ci0jaWYgT1Mo REFSV0lOKQorI2lmIFVTSU5HX0FDQ0VMRVJBVEUKICAgICAvLyBUd28gZXh0cmEgc2FtcGxlcyBm b3IgZmlsdGVyIGhpc3RvcnkKICAgICBkb3VibGUqIGlucHV0UCA9IG1faW5wdXRCdWZmZXIuZGF0 YSgpOwogICAgIGlucHV0UFswXSA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9hdWRpby9CaXF1YWQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL0JpcXVh ZC5oCmluZGV4IGVmNGEzMDA4MjUyMjllMTkxMzYwZjNmMGFhZWYxMWM1OGU4NmIzNjguLjE3MzZm NWI0NWVmNWUxMmQ0M2VkY2MwNjkxMDRhZGZmYmY0NWRmNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL0JpcXVhZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2F1ZGlvL0JpcXVhZC5oCkBAIC0zMyw2ICszMywxMiBAQAogI2luY2x1ZGUgPGNvbXBsZXg+ CiAjaW5jbHVkZSA8c3lzL3R5cGVzLmg+CiAKKyNpZiBPUyhEQVJXSU4pICYmICFQTEFURk9STShH VEspCisjZGVmaW5lIFVTSU5HX0FDQ0VMRVJBVEUgMQorI2Vsc2UKKyNkZWZpbmUgVVNJTkdfQUND RUxFUkFURSAwCisjZW5kaWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiAvLyBBIGJhc2ljIGJp cXVhZCAodHdvLXplcm8gLyB0d28tcG9sZSBkaWdpdGFsIGZpbHRlcikKQEAgLTg4LDcgKzk0LDcg QEAgcHJpdmF0ZToKICAgICBkb3VibGUgbV9hMTsKICAgICBkb3VibGUgbV9hMjsKIAotI2lmIE9T KERBUldJTikKKyNpZiBVU0lOR19BQ0NFTEVSQVRFCiAgICAgdm9pZCBwcm9jZXNzRmFzdChjb25z dCBmbG9hdCogc291cmNlUCwgZmxvYXQqIGRlc3RQLCBzaXplX3QgZnJhbWVzVG9Qcm9jZXNzKTsK ICAgICB2b2lkIHByb2Nlc3NTbGljZUZhc3QoZG91YmxlKiBzb3VyY2VQLCBkb3VibGUqIGRlc3RQ LCBkb3VibGUqIGNvZWZmaWNpZW50c1AsIHNpemVfdCBmcmFtZXNUb1Byb2Nlc3MpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9EaXJlY3RDb252b2x2ZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vRGlyZWN0Q29udm9sdmVyLmNwcAppbmRl eCBkMWU1ZDFhZmYzNjBiMDc5NDkxOGVlZTg3OWQzMTE1MzViMjIwOGJmLi43NDUyM2Q2OTcwZDRk NDBlMjMxODEyOTYwMWJlOTI3MmZlMTM4NmFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9hdWRpby9EaXJlY3RDb252b2x2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2F1ZGlvL0RpcmVjdENvbnZvbHZlci5jcHAKQEAgLTczLDcgKzczLDcgQEAgdm9pZCBE aXJlY3RDb252b2x2ZXI6OnByb2Nlc3MoQXVkaW9GbG9hdEFycmF5KiBjb252b2x1dGlvbktlcm5l bCwgY29uc3QgZmxvYXQqIHMKICAgICAvLyBDb3B5IHNhbXBsZXMgdG8gMm5kIGhhbGYgb2YgaW5w dXQgYnVmZmVyLgogICAgIG1lbWNweShpbnB1dFAsIHNvdXJjZVAsIHNpemVvZihmbG9hdCkgKiBm cmFtZXNUb1Byb2Nlc3MpOwogCi0jaWYgT1MoREFSV0lOKQorI2lmIE9TKERBUldJTikgJiYgIVBM QVRGT1JNKEdUSykKICNpZiBkZWZpbmVkKF9fcHBjX18pIHx8IGRlZmluZWQoX19pMzg2X18pCiAj cHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcHVzaAogI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIGln bm9yZWQgIi1XZGVwcmVjYXRlZC1kZWNsYXJhdGlvbnMiCkBAIC0zNTIsNyArMzUyLDcgQEAgdm9p ZCBEaXJlY3RDb252b2x2ZXI6OnByb2Nlc3MoQXVkaW9GbG9hdEFycmF5KiBjb252b2x1dGlvbktl cm5lbCwgY29uc3QgZmxvYXQqIHMKICAgICAgICAgfQogICAgICAgICBkZXN0UFtpKytdID0gc3Vt OwogICAgIH0KLSNlbmRpZiAvLyBPUyhEQVJXSU4pCisjZW5kaWYgLy8gT1MoREFSV0lOKSAmJiAh UExBVEZPUk0oR1RLKQogCiAgICAgLy8gQ29weSAybmQgaGFsZiBvZiBpbnB1dCBidWZmZXIgdG8g MXN0IGhhbGYuCiAgICAgbWVtY3B5KG1fYnVmZmVyLmRhdGEoKSwgaW5wdXRQLCBzaXplb2YoZmxv YXQpICogZnJhbWVzVG9Qcm9jZXNzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2F1ZGlvL0ZGVEZyYW1lLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9GRlRG cmFtZS5oCmluZGV4IDdhM2ExNDVhZmZjODUzOGJkMWJkYTRjNDU0ZjZlZDYyMTk2YjE1Y2EuLmU1 ODhmNGFjYmFkNGI4ZDM2OWRjZmVmNjY4ZjkyN2EyZDY4YjMyZTYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL0ZGVEZyYW1lLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vYXVkaW8vRkZURnJhbWUuaApAQCAtMzEsMTUgKzMxLDEzIEBACiAKICNpbmNsdWRl ICJBdWRpb0FycmF5LmgiCiAKLSNpZiBPUyhEQVJXSU4pCi0jaW5jbHVkZSA8QWNjZWxlcmF0ZS9B Y2NlbGVyYXRlLmg+Ci0jZW5kaWYKLQogI2lmIFVTRShXRUJBVURJT19HU1RSRUFNRVIpCiAjaW5j bHVkZSA8Z2xpYi5oPgogR19CRUdJTl9ERUNMUwogI2luY2x1ZGUgPGdzdC9mZnQvZ3N0ZmZ0ZjMy Lmg+CiBHX0VORF9ERUNMUworI2VsaWYgT1MoREFSV0lOKQorI2luY2x1ZGUgPEFjY2VsZXJhdGUv QWNjZWxlcmF0ZS5oPgogI2VuZGlmIC8vIFVTRShXRUJBVURJT19HU1RSRUFNRVIpCiAKICNpbmNs dWRlIDxtZW1vcnk+CkBAIC05MCw3ICs4OCw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGludGVy cG9sYXRlRnJlcXVlbmN5Q29tcG9uZW50cyhjb25zdCBGRlRGcmFtZSYgZnJhbWUxLCBjb25zdCBG RlRGcmFtZSYgZnJhbWUyLCBkb3VibGUgeCk7CiAKLSNpZiBPUyhEQVJXSU4pCisjaWYgT1MoREFS V0lOKSAmJiAhVVNFKFdFQkFVRElPX0dTVFJFQU1FUikKICAgICBEU1BTcGxpdENvbXBsZXgmIGRz cFNwbGl0Q29tcGxleCgpIHsgcmV0dXJuIG1fZnJhbWU7IH0KICAgICBEU1BTcGxpdENvbXBsZXgg ZHNwU3BsaXRDb21wbGV4KCkgY29uc3QgeyByZXR1cm4gbV9mcmFtZTsgfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9WZWN0b3JNYXRoLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1ZlY3Rvck1hdGguY3BwCmluZGV4IDQ4YTY3ZDQ3MGZkNzYz NjgyNGU2Mzk3MzUzYzMyNmE1MzJiZDhmOTguLjgwMmU4ODRjYzU4NWI1NTU1MGYxM2NjYzJhNjJl ZmY4YjE0ODlhYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1Zl Y3Rvck1hdGguY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1ZlY3Rvck1h dGguY3BwCkBAIC0yOCw4ICsyOCwxMSBAQAogCiAjaW5jbHVkZSAiVmVjdG9yTWF0aC5oIgogCi0j aWYgT1MoREFSV0lOKQorI2lmIE9TKERBUldJTikgJiYgIVBMQVRGT1JNKEdUSykKKyNkZWZpbmUg VVNJTkdfQUNDRUxFUkFURSAxCiAjaW5jbHVkZSA8QWNjZWxlcmF0ZS9BY2NlbGVyYXRlLmg+Cisj ZWxzZQorI2RlZmluZSBVU0lOR19BQ0NFTEVSQVRFIDAKICNlbmRpZgogCiAjaWZkZWYgX19TU0Uy X18KQEAgLTQ3LDcgKzUwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBuYW1lc3BhY2UgVmVj dG9yTWF0aCB7CiAKLSNpZiBPUyhEQVJXSU4pCisjaWYgVVNJTkdfQUNDRUxFUkFURQogLy8gT24g dGhlIE1hYyB3ZSB1c2UgdGhlIGhpZ2hseSBvcHRpbWl6ZWQgdmVyc2lvbnMgaW4gQWNjZWxlcmF0 ZS5mcmFtZXdvcmsKIC8vIEluIDMyLWJpdCBtb2RlIChfX3BwY19fIG9yIF9faTM4Nl9fKSA8QWNj ZWxlcmF0ZS9BY2NlbGVyYXRlLmg+IGluY2x1ZGVzIDx2ZWNMaWIvdkRTUF90cmFuc2xhdGUuaD4g d2hpY2ggZGVmaW5lcyBtYWNyb3Mgb2YgdGhlIHNhbWUgbmFtZSBhcwogLy8gb3VyIG5hbWVzcGFj ZWQgZnVuY3Rpb24gbmFtZXMsIHNvIHdlIG11c3QgaGFuZGxlIHRoaXMgY2FzZSBkaWZmZXJlbnRs eS4gT3RoZXIgYXJjaGl0ZWN0dXJlcyAoNjRiaXQsIEFSTSwgZXRjLikgZG8gbm90IGluY2x1ZGUg dGhpcyBoZWFkZXIgZmlsZS4KQEAgLTY5MCw3ICs2OTMsNyBAQCB2b2lkIHZjbGlwKGNvbnN0IGZs b2F0KiBzb3VyY2VQLCBpbnQgc291cmNlU3RyaWRlLCBjb25zdCBmbG9hdCogbG93VGhyZXNob2xk UCwgYwogICAgIH0KIH0KIAotI2VuZGlmIC8vIE9TKERBUldJTikKKyNlbmRpZiAvLyBVU0lOR19B Q0NFTEVSQVRFCiAKIH0gLy8gbmFtZXNwYWNlIFZlY3Rvck1hdGgKIAo= 263684 2015-10-21 09:31:01 -0700 2015-10-22 08:43:50 -0700 Patch bug-150030-20151021183017.patch text/plain 7932 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMTkwNzgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDM1OTE2ZWYwNzRjY2U5Yzk3MDRiYzEz MWY0Njg4NzY3YmViMTZiNTQuLmJhOTg0ODQ3YTBhYjU3ZWMyNDJiMDBkY2ZiYzJhMjkwNjRjNGJh ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTUtMTAtMjEgIFBoaWxpcHBlIE5vcm1hbmQgIDxw bm9ybWFuZEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHU3RyZWFtZXJdW01hY10gRml4IFdlYkF1 ZGlvIGJ1aWxkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNTAwMzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHd0Zi9QbGF0Zm9ybS5oOiBBZGQgVVNFKEFDQ0VMRVJBVEVfRlJBTUVXT1JLKS4gRm9yIG5v dyBpZiB0aGUKKyAgICAgICAgR1RLIChvciBFRkwpIHBvcnQgaXMgYnVpbHQgb24gRGFyd2luIHdl IGNhbid0IHVzZQorICAgICAgICBBY2NlbGVyYXRlLmZyYW1ld29yayAoeWV0PykuCisKIDIwMTUt MDYtMTkgIFBoaWxpcCBDaGltZW50byAgPHBoaWxpcC5jaGltZW50b0BnbWFpbC5jb20+CiAKICAg ICAgICAgW0dUS10gRml4IGNvbWJpbmF0aW9ucyBvZiBQTEFURk9STShHVEspIGFuZCBPUyhEQVJX SU4pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKaW5kZXggZTY5M2VjOTBmMDMxOGU2MzFiNTI5Nzc1MDM0ZGNjNmIzYWZjMTE0 ZS4uOGUyNDE5OTQ1MjZiYTI5OTNhYjAzYjk1MjY5NjkyNjA3OTYyZmU0MyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDIyIEBACisyMDE1LTEwLTIxICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXVtNYWNdIEZpeCBXZWJBdWRpbyBidWls ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwMDMw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV3JhcCBB Y2NlbGVyYXRlLmZyYW1ld29yayBBUEkgY2FsbHMgYXJvdW5kIFVTRShBQ0NFTEVSQVRFX0ZSQU1F V09SSykgaWZkZWZzLgorCisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vQmlxdWFkLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkJpcXVhZDo6QmlxdWFkKToKKyAgICAgICAgKFdlYkNvcmU6OkJpcXVh ZDo6cHJvY2Vzcyk6CisgICAgICAgIChXZWJDb3JlOjpCaXF1YWQ6OnJlc2V0KToKKyAgICAgICAg KiBwbGF0Zm9ybS9hdWRpby9CaXF1YWQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9EaXJl Y3RDb252b2x2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGlyZWN0Q29udm9sdmVyOjpwcm9j ZXNzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9GRlRGcmFtZS5oOgorICAgICAgICAqIHBs YXRmb3JtL2F1ZGlvL1ZlY3Rvck1hdGguY3BwOgorCiAyMDE1LTA2LTE5ICBQaGlsaXAgQ2hpbWVu dG8gIDxwaGlsaXAuY2hpbWVudG9AZ21haWwuY29tPgogCiAgICAgICAgIFtHVEtdIEZpeCBjb21i aW5hdGlvbnMgb2YgUExBVEZPUk0oR1RLKSBhbmQgT1MoREFSV0lOKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dURi93dGYvUGxhdGZvcm0uaCBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgKaW5kZXgg MTNjMThhMDlhMzUxYTliZWY2MWUyYTU0ZDMwMzI5NTBiNjYwNmM3ZC4uYjc1YjkzZDc2Y2I0ZTAy OWY0YmI1MWI1YTAwZTBiMmUxZDUyNmIzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvUGxh dGZvcm0uaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCkBAIC0xMTI4LDQgKzExMjgs MTEgQEAKICNkZWZpbmUgSEFWRV9DT1JFQU5JTUFUSU9OX0ZFTkNFUyAxCiAjZW5kaWYKIAorLyog RGlzYWJsZSB0aGUgQWNjZWxlcmF0ZS5mcmFtZXdvcmsgb24gRGFyd2luIChhbmQgTGludXggb2J2 aW91c2x5KSBmbGF2b3JzIG9mIHRoZSBHVEsgYW5kIEVGTCBwb3J0cy4gKi8KKyNpZiAoT1MoREFS V0lOKSB8fCBPUyhMSU5VWCkpICYmIChQTEFURk9STShHVEspIHx8IFBMQVRGT1JNKEVGTCkpCisj ZGVmaW5lIFVTRV9BQ0NFTEVSQVRFX0ZSQU1FV09SSyAwCisjZWxzZQorI2RlZmluZSBVU0VfQUND RUxFUkFURV9GUkFNRVdPUksgMQorI2VuZGlmCisKICNlbmRpZiAvKiBXVEZfUGxhdGZvcm1faCAq LwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQmlxdWFkLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL0JpcXVhZC5jcHAKaW5kZXggNTAzOWI4NTkx NDAxNWVjMzM0YWUwYjQ0NGFkMWY2YjU1MGIwMGM1OS4uNzE5NGIyZjU3NzMwMWNhYTJlZWJkZDkx OWZhZjYyMDYyNzRjMTM3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVk aW8vQmlxdWFkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9CaXF1YWQu Y3BwCkBAIC0zNyw3ICszNyw3IEBACiAjaW5jbHVkZSA8c3RkaW8uaD4KICNpbmNsdWRlIDx3dGYv TWF0aEV4dHJhcy5oPgogCi0jaWYgT1MoREFSV0lOKQorI2lmIFVTRShBQ0NFTEVSQVRFX0ZSQU1F V09SSykKIC8vIFdvcmsgYXJvdW5kIGEgYnVnIHdoZXJlIFZGb3JjZS5oIGZvcndhcmQgZGVjbGFy ZXMgc3RkOjpjb21wbGV4IGluIGEgd2F5IHRoYXQncyBpbmNvbXBhdGlibGUgd2l0aCBsaWJjKysg Y29tcGxleC4KICNkZWZpbmUgX19WRk9SQ0VfSAogI2luY2x1ZGUgPEFjY2VsZXJhdGUvQWNjZWxl cmF0ZS5oPgpAQCAtNDUsMTMgKzQ1LDEzIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotI2lm IE9TKERBUldJTikKKyNpZiBVU0UoQUNDRUxFUkFURV9GUkFNRVdPUkspCiBjb25zdCBpbnQga0J1 ZmZlclNpemUgPSAxMDI0OwogI2VuZGlmCiAKIEJpcXVhZDo6QmlxdWFkKCkKIHsKLSNpZiBPUyhE QVJXSU4pCisjaWYgVVNFKEFDQ0VMRVJBVEVfRlJBTUVXT1JLKQogICAgIC8vIEFsbG9jYXRlIHR3 byBzYW1wbGVzIG1vcmUgZm9yIGZpbHRlciBoaXN0b3J5CiAgICAgbV9pbnB1dEJ1ZmZlci5hbGxv Y2F0ZShrQnVmZmVyU2l6ZSArIDIpOwogICAgIG1fb3V0cHV0QnVmZmVyLmFsbG9jYXRlKGtCdWZm ZXJTaXplICsgMik7CkBAIC02OSw3ICs2OSw3IEBAIEJpcXVhZDo6fkJpcXVhZCgpCiAKIHZvaWQg QmlxdWFkOjpwcm9jZXNzKGNvbnN0IGZsb2F0KiBzb3VyY2VQLCBmbG9hdCogZGVzdFAsIHNpemVf dCBmcmFtZXNUb1Byb2Nlc3MpCiB7Ci0jaWYgT1MoREFSV0lOKQorI2lmIFVTRShBQ0NFTEVSQVRF X0ZSQU1FV09SSykKICAgICAvLyBVc2UgdmVjTGliIGlmIGF2YWlsYWJsZQogICAgIHByb2Nlc3NG YXN0KHNvdXJjZVAsIGRlc3RQLCBmcmFtZXNUb1Byb2Nlc3MpOwogCkBAIC0xMTgsNyArMTE4LDcg QEAgdm9pZCBCaXF1YWQ6OnByb2Nlc3MoY29uc3QgZmxvYXQqIHNvdXJjZVAsIGZsb2F0KiBkZXN0 UCwgc2l6ZV90IGZyYW1lc1RvUHJvY2VzcykKICNlbmRpZgogfQogCi0jaWYgT1MoREFSV0lOKQor I2lmIFVTRShBQ0NFTEVSQVRFX0ZSQU1FV09SSykKIAogLy8gSGVyZSB3ZSBoYXZlIG9wdGltaXpl ZCB2ZXJzaW9uIHVzaW5nIEFjY2VsZXJhdGUuZnJhbWV3b3JrCiAKQEAgLTE3MiwxMiArMTcyLDEy IEBAIHZvaWQgQmlxdWFkOjpwcm9jZXNzU2xpY2VGYXN0KGRvdWJsZSogc291cmNlUCwgZG91Ymxl KiBkZXN0UCwgZG91YmxlKiBjb2VmZmljaWVuCiAgICAgZGVzdFBbMV0gPSBkZXN0UFtmcmFtZXNU b1Byb2Nlc3MgLSAxICsgMl07CiB9CiAKLSNlbmRpZiAvLyBPUyhEQVJXSU4pCisjZW5kaWYgLy8g VVNFKEFDQ0VMRVJBVEVfRlJBTUVXT1JLKQogCiAKIHZvaWQgQmlxdWFkOjpyZXNldCgpCiB7Ci0j aWYgT1MoREFSV0lOKQorI2lmIFVTRShBQ0NFTEVSQVRFX0ZSQU1FV09SSykKICAgICAvLyBUd28g ZXh0cmEgc2FtcGxlcyBmb3IgZmlsdGVyIGhpc3RvcnkKICAgICBkb3VibGUqIGlucHV0UCA9IG1f aW5wdXRCdWZmZXIuZGF0YSgpOwogICAgIGlucHV0UFswXSA9IDA7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9CaXF1YWQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2F1ZGlvL0JpcXVhZC5oCmluZGV4IGVmNGEzMDA4MjUyMjllMTkxMzYwZjNmMGFhZWYxMWM1 OGU4NmIzNjguLjE1ZmEyMDM0ZWYxMjJkYTZhZjNlNjFjNWNmNzBiNTg2ODM0Y2U4NjMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL0JpcXVhZC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL0JpcXVhZC5oCkBAIC04OCw3ICs4OCw3IEBAIHByaXZh dGU6CiAgICAgZG91YmxlIG1fYTE7CiAgICAgZG91YmxlIG1fYTI7CiAKLSNpZiBPUyhEQVJXSU4p CisjaWYgVVNFKEFDQ0VMRVJBVEVfRlJBTUVXT1JLKQogICAgIHZvaWQgcHJvY2Vzc0Zhc3QoY29u c3QgZmxvYXQqIHNvdXJjZVAsIGZsb2F0KiBkZXN0UCwgc2l6ZV90IGZyYW1lc1RvUHJvY2Vzcyk7 CiAgICAgdm9pZCBwcm9jZXNzU2xpY2VGYXN0KGRvdWJsZSogc291cmNlUCwgZG91YmxlKiBkZXN0 UCwgZG91YmxlKiBjb2VmZmljaWVudHNQLCBzaXplX3QgZnJhbWVzVG9Qcm9jZXNzKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vRGlyZWN0Q29udm9sdmVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL0RpcmVjdENvbnZvbHZlci5jcHAKaW5k ZXggZDFlNWQxYWZmMzYwYjA3OTQ5MThlZWU4NzlkMzExNTM1YjIyMDhiZi4uMmM0NWQwYTE2ZmQ3 ZGIwMjdjZWRmNWIxM2M2MmQyN2EzOThhM2YwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vYXVkaW8vRGlyZWN0Q29udm9sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9hdWRpby9EaXJlY3RDb252b2x2ZXIuY3BwCkBAIC03Myw3ICs3Myw3IEBAIHZvaWQg RGlyZWN0Q29udm9sdmVyOjpwcm9jZXNzKEF1ZGlvRmxvYXRBcnJheSogY29udm9sdXRpb25LZXJu ZWwsIGNvbnN0IGZsb2F0KiBzCiAgICAgLy8gQ29weSBzYW1wbGVzIHRvIDJuZCBoYWxmIG9mIGlu cHV0IGJ1ZmZlci4KICAgICBtZW1jcHkoaW5wdXRQLCBzb3VyY2VQLCBzaXplb2YoZmxvYXQpICog ZnJhbWVzVG9Qcm9jZXNzKTsKIAotI2lmIE9TKERBUldJTikKKyNpZiBVU0UoQUNDRUxFUkFURV9G UkFNRVdPUkspCiAjaWYgZGVmaW5lZChfX3BwY19fKSB8fCBkZWZpbmVkKF9faTM4Nl9fKQogI3By YWdtYSBjbGFuZyBkaWFnbm9zdGljIHB1c2gKICNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBpZ25v cmVkICItV2RlcHJlY2F0ZWQtZGVjbGFyYXRpb25zIgpAQCAtMzUyLDcgKzM1Miw3IEBAIHZvaWQg RGlyZWN0Q29udm9sdmVyOjpwcm9jZXNzKEF1ZGlvRmxvYXRBcnJheSogY29udm9sdXRpb25LZXJu ZWwsIGNvbnN0IGZsb2F0KiBzCiAgICAgICAgIH0KICAgICAgICAgZGVzdFBbaSsrXSA9IHN1bTsK ICAgICB9Ci0jZW5kaWYgLy8gT1MoREFSV0lOKQorI2VuZGlmIC8vIE9TKERBUldJTikgJiYgIVBM QVRGT1JNKEdUSykKIAogICAgIC8vIENvcHkgMm5kIGhhbGYgb2YgaW5wdXQgYnVmZmVyIHRvIDFz dCBoYWxmLgogICAgIG1lbWNweShtX2J1ZmZlci5kYXRhKCksIGlucHV0UCwgc2l6ZW9mKGZsb2F0 KSAqIGZyYW1lc1RvUHJvY2Vzcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9hdWRpby9GRlRGcmFtZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vRkZURnJh bWUuaAppbmRleCA3YTNhMTQ1YWZmYzg1MzhiZDFiZGE0YzQ1NGY2ZWQ2MjE5NmIxNWNhLi4wOTE5 NTU3YTJmZWNlNGE3YWQ2YTNkZmU2MTI1OGZjNjgwMWZmMTdiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9GRlRGcmFtZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2F1ZGlvL0ZGVEZyYW1lLmgKQEAgLTMxLDEwICszMSw2IEBACiAKICNpbmNsdWRlICJB dWRpb0FycmF5LmgiCiAKLSNpZiBPUyhEQVJXSU4pCi0jaW5jbHVkZSA8QWNjZWxlcmF0ZS9BY2Nl bGVyYXRlLmg+Ci0jZW5kaWYKLQogI2lmIFVTRShXRUJBVURJT19HU1RSRUFNRVIpCiAjaW5jbHVk ZSA8Z2xpYi5oPgogR19CRUdJTl9ERUNMUwpAQCAtNDIsNiArMzgsMTAgQEAgR19CRUdJTl9ERUNM UwogR19FTkRfREVDTFMKICNlbmRpZiAvLyBVU0UoV0VCQVVESU9fR1NUUkVBTUVSKQogCisjaWYg VVNFKEFDQ0VMRVJBVEVfRlJBTUVXT1JLKQorI2luY2x1ZGUgPEFjY2VsZXJhdGUvQWNjZWxlcmF0 ZS5oPgorI2VuZGlmIC8vIFVTRShBQ0NFTEVSQVRFX0ZSQU1FV09SSykKKwogI2luY2x1ZGUgPG1l bW9yeT4KICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogI2luY2x1ZGUgPHd0Zi9UaHJlYWRpbmcu aD4KQEAgLTkwLDcgKzkwLDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgaW50ZXJwb2xhdGVGcmVx dWVuY3lDb21wb25lbnRzKGNvbnN0IEZGVEZyYW1lJiBmcmFtZTEsIGNvbnN0IEZGVEZyYW1lJiBm cmFtZTIsIGRvdWJsZSB4KTsKIAotI2lmIE9TKERBUldJTikKKyNpZiBVU0UoQUNDRUxFUkFURV9G UkFNRVdPUkspCiAgICAgRFNQU3BsaXRDb21wbGV4JiBkc3BTcGxpdENvbXBsZXgoKSB7IHJldHVy biBtX2ZyYW1lOyB9CiAgICAgRFNQU3BsaXRDb21wbGV4IGRzcFNwbGl0Q29tcGxleCgpIGNvbnN0 IHsgcmV0dXJuIG1fZnJhbWU7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vYXVkaW8vVmVjdG9yTWF0aC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9W ZWN0b3JNYXRoLmNwcAppbmRleCA0OGE2N2Q0NzBmZDc2MzY4MjRlNjM5NzM1M2MzMjZhNTMyYmQ4 Zjk4Li44M2Y4NzEyZjc2YTE1ZDZlMjc5ZDAzY2E4OGRjYzNjZWQxNzA2ZjEzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9WZWN0b3JNYXRoLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9WZWN0b3JNYXRoLmNwcApAQCAtMjgsNyArMjgsNyBA QAogCiAjaW5jbHVkZSAiVmVjdG9yTWF0aC5oIgogCi0jaWYgT1MoREFSV0lOKQorI2lmIFVTRShB Q0NFTEVSQVRFX0ZSQU1FV09SSykKICNpbmNsdWRlIDxBY2NlbGVyYXRlL0FjY2VsZXJhdGUuaD4K ICNlbmRpZgogCkBAIC00Nyw3ICs0Nyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogbmFtZXNw YWNlIFZlY3Rvck1hdGggewogCi0jaWYgT1MoREFSV0lOKQorI2lmIFVTRShBQ0NFTEVSQVRFX0ZS QU1FV09SSykKIC8vIE9uIHRoZSBNYWMgd2UgdXNlIHRoZSBoaWdobHkgb3B0aW1pemVkIHZlcnNp b25zIGluIEFjY2VsZXJhdGUuZnJhbWV3b3JrCiAvLyBJbiAzMi1iaXQgbW9kZSAoX19wcGNfXyBv ciBfX2kzODZfXykgPEFjY2VsZXJhdGUvQWNjZWxlcmF0ZS5oPiBpbmNsdWRlcyA8dmVjTGliL3ZE U1BfdHJhbnNsYXRlLmg+IHdoaWNoIGRlZmluZXMgbWFjcm9zIG9mIHRoZSBzYW1lIG5hbWUgYXMK IC8vIG91ciBuYW1lc3BhY2VkIGZ1bmN0aW9uIG5hbWVzLCBzbyB3ZSBtdXN0IGhhbmRsZSB0aGlz IGNhc2UgZGlmZmVyZW50bHkuIE90aGVyIGFyY2hpdGVjdHVyZXMgKDY0Yml0LCBBUk0sIGV0Yy4p IGRvIG5vdCBpbmNsdWRlIHRoaXMgaGVhZGVyIGZpbGUuCkBAIC02OTAsNyArNjkwLDcgQEAgdm9p ZCB2Y2xpcChjb25zdCBmbG9hdCogc291cmNlUCwgaW50IHNvdXJjZVN0cmlkZSwgY29uc3QgZmxv YXQqIGxvd1RocmVzaG9sZFAsIGMKICAgICB9CiB9CiAKLSNlbmRpZiAvLyBPUyhEQVJXSU4pCisj ZW5kaWYgLy8gVVNFKEFDQ0VMRVJBVEVfRlJBTUVXT1JLKQogCiB9IC8vIG5hbWVzcGFjZSBWZWN0 b3JNYXRoCiAK 263830 2015-10-22 08:43:56 -0700 2015-10-31 10:49:37 -0700 Patch bug-150030-20151022174311.patch text/plain 6435 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxNDUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGMyODQ2MzVlNTY2N2Y0 MWIzOWNiMWIzNjUyYThlY2ZhNmEzMjQzNy4uNzJmMjgxYzUwNzgzZDZmMjlmMzA0YTc5ZDY0ZmQy YWViNDI2YzgwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1LTEwLTIyICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XVtNYWNdIEZpeCBXZWJBdWRpbyBidWlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTUwMDMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgV3JhcCBBY2NlbGVyYXRlLmZyYW1ld29yayBBUEkgY2FsbHMgYXJv dW5kIFVTRShBQ0NFTEVSQVRFKSBpZmRlZnMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9C aXF1YWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QmlxdWFkOjpCaXF1YWQpOgorICAgICAgICAo V2ViQ29yZTo6QmlxdWFkOjpwcm9jZXNzKToKKyAgICAgICAgKFdlYkNvcmU6OkJpcXVhZDo6cmVz ZXQpOgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL0JpcXVhZC5oOgorICAgICAgICAqIHBsYXRm b3JtL2F1ZGlvL0RpcmVjdENvbnZvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEaXJlY3RD b252b2x2ZXI6OnByb2Nlc3MpOgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL0ZGVEZyYW1lLmg6 CisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vVmVjdG9yTWF0aC5jcHA6CisKIDIwMTUtMDYtMTkg IFBoaWxpcCBDaGltZW50byAgPHBoaWxpcC5jaGltZW50b0BnbWFpbC5jb20+CiAKICAgICAgICAg W0dUS10gRml4IGNvbWJpbmF0aW9ucyBvZiBQTEFURk9STShHVEspIGFuZCBPUyhEQVJXSU4pCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9CaXF1YWQuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQmlxdWFkLmNwcAppbmRleCA1MDM5Yjg1OTE0MDE1 ZWMzMzRhZTBiNDQ0YWQxZjZiNTUwYjAwYzU5Li43NjUzODY4OTYxYWI4OTU4NTk5MzgwMmY2ODJk MjdmODNiODQ5NjMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9C aXF1YWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL0JpcXVhZC5jcHAK QEAgLTM3LDcgKzM3LDcgQEAKICNpbmNsdWRlIDxzdGRpby5oPgogI2luY2x1ZGUgPHd0Zi9NYXRo RXh0cmFzLmg+CiAKLSNpZiBPUyhEQVJXSU4pCisjaWYgVVNFKEFDQ0VMRVJBVEUpCiAvLyBXb3Jr IGFyb3VuZCBhIGJ1ZyB3aGVyZSBWRm9yY2UuaCBmb3J3YXJkIGRlY2xhcmVzIHN0ZDo6Y29tcGxl eCBpbiBhIHdheSB0aGF0J3MgaW5jb21wYXRpYmxlIHdpdGggbGliYysrIGNvbXBsZXguCiAjZGVm aW5lIF9fVkZPUkNFX0gKICNpbmNsdWRlIDxBY2NlbGVyYXRlL0FjY2VsZXJhdGUuaD4KQEAgLTQ1 LDEzICs0NSwxMyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLSNpZiBPUyhEQVJXSU4pCisj aWYgVVNFKEFDQ0VMRVJBVEUpCiBjb25zdCBpbnQga0J1ZmZlclNpemUgPSAxMDI0OwogI2VuZGlm CiAKIEJpcXVhZDo6QmlxdWFkKCkKIHsKLSNpZiBPUyhEQVJXSU4pCisjaWYgVVNFKEFDQ0VMRVJB VEUpCiAgICAgLy8gQWxsb2NhdGUgdHdvIHNhbXBsZXMgbW9yZSBmb3IgZmlsdGVyIGhpc3RvcnkK ICAgICBtX2lucHV0QnVmZmVyLmFsbG9jYXRlKGtCdWZmZXJTaXplICsgMik7CiAgICAgbV9vdXRw dXRCdWZmZXIuYWxsb2NhdGUoa0J1ZmZlclNpemUgKyAyKTsKQEAgLTY5LDcgKzY5LDcgQEAgQmlx dWFkOjp+QmlxdWFkKCkKIAogdm9pZCBCaXF1YWQ6OnByb2Nlc3MoY29uc3QgZmxvYXQqIHNvdXJj ZVAsIGZsb2F0KiBkZXN0UCwgc2l6ZV90IGZyYW1lc1RvUHJvY2VzcykKIHsKLSNpZiBPUyhEQVJX SU4pCisjaWYgVVNFKEFDQ0VMRVJBVEUpCiAgICAgLy8gVXNlIHZlY0xpYiBpZiBhdmFpbGFibGUK ICAgICBwcm9jZXNzRmFzdChzb3VyY2VQLCBkZXN0UCwgZnJhbWVzVG9Qcm9jZXNzKTsKIApAQCAt MTE4LDcgKzExOCw3IEBAIHZvaWQgQmlxdWFkOjpwcm9jZXNzKGNvbnN0IGZsb2F0KiBzb3VyY2VQ LCBmbG9hdCogZGVzdFAsIHNpemVfdCBmcmFtZXNUb1Byb2Nlc3MpCiAjZW5kaWYKIH0KIAotI2lm IE9TKERBUldJTikKKyNpZiBVU0UoQUNDRUxFUkFURSkKIAogLy8gSGVyZSB3ZSBoYXZlIG9wdGlt aXplZCB2ZXJzaW9uIHVzaW5nIEFjY2VsZXJhdGUuZnJhbWV3b3JrCiAKQEAgLTE3MiwxMiArMTcy LDEyIEBAIHZvaWQgQmlxdWFkOjpwcm9jZXNzU2xpY2VGYXN0KGRvdWJsZSogc291cmNlUCwgZG91 YmxlKiBkZXN0UCwgZG91YmxlKiBjb2VmZmljaWVuCiAgICAgZGVzdFBbMV0gPSBkZXN0UFtmcmFt ZXNUb1Byb2Nlc3MgLSAxICsgMl07CiB9CiAKLSNlbmRpZiAvLyBPUyhEQVJXSU4pCisjZW5kaWYg Ly8gVVNFKEFDQ0VMRVJBVEUpCiAKIAogdm9pZCBCaXF1YWQ6OnJlc2V0KCkKIHsKLSNpZiBPUyhE QVJXSU4pCisjaWYgVVNFKEFDQ0VMRVJBVEUpCiAgICAgLy8gVHdvIGV4dHJhIHNhbXBsZXMgZm9y IGZpbHRlciBoaXN0b3J5CiAgICAgZG91YmxlKiBpbnB1dFAgPSBtX2lucHV0QnVmZmVyLmRhdGEo KTsKICAgICBpbnB1dFBbMF0gPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vYXVkaW8vQmlxdWFkLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9CaXF1YWQu aAppbmRleCBlZjRhMzAwODI1MjI5ZTE5MTM2MGYzZjBhYWVmMTFjNThlODZiMzY4Li5iYjcyMWEy M2E3ZmNjNzc0YjYwOTNlNGVhOTA4YzYwZTg5MDgxMDdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9hdWRpby9CaXF1YWQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9hdWRpby9CaXF1YWQuaApAQCAtODgsNyArODgsNyBAQCBwcml2YXRlOgogICAgIGRvdWJsZSBt X2ExOwogICAgIGRvdWJsZSBtX2EyOwogCi0jaWYgT1MoREFSV0lOKQorI2lmIFVTRShBQ0NFTEVS QVRFKQogICAgIHZvaWQgcHJvY2Vzc0Zhc3QoY29uc3QgZmxvYXQqIHNvdXJjZVAsIGZsb2F0KiBk ZXN0UCwgc2l6ZV90IGZyYW1lc1RvUHJvY2Vzcyk7CiAgICAgdm9pZCBwcm9jZXNzU2xpY2VGYXN0 KGRvdWJsZSogc291cmNlUCwgZG91YmxlKiBkZXN0UCwgZG91YmxlKiBjb2VmZmljaWVudHNQLCBz aXplX3QgZnJhbWVzVG9Qcm9jZXNzKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vYXVkaW8vRGlyZWN0Q29udm9sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2F1ZGlvL0RpcmVjdENvbnZvbHZlci5jcHAKaW5kZXggZDFlNWQxYWZmMzYwYjA3OTQ5MThlZWU4 NzlkMzExNTM1YjIyMDhiZi4uMmM2MzhlMjdmZGUwZjU0ODVmYTA5MGYxMGI1ZjEyNDU2OGQyODM1 YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vRGlyZWN0Q29udm9s dmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9EaXJlY3RDb252b2x2 ZXIuY3BwCkBAIC03Myw3ICs3Myw3IEBAIHZvaWQgRGlyZWN0Q29udm9sdmVyOjpwcm9jZXNzKEF1 ZGlvRmxvYXRBcnJheSogY29udm9sdXRpb25LZXJuZWwsIGNvbnN0IGZsb2F0KiBzCiAgICAgLy8g Q29weSBzYW1wbGVzIHRvIDJuZCBoYWxmIG9mIGlucHV0IGJ1ZmZlci4KICAgICBtZW1jcHkoaW5w dXRQLCBzb3VyY2VQLCBzaXplb2YoZmxvYXQpICogZnJhbWVzVG9Qcm9jZXNzKTsKIAotI2lmIE9T KERBUldJTikKKyNpZiBVU0UoQUNDRUxFUkFURSkKICNpZiBkZWZpbmVkKF9fcHBjX18pIHx8IGRl ZmluZWQoX19pMzg2X18pCiAjcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcHVzaAogI3ByYWdtYSBj bGFuZyBkaWFnbm9zdGljIGlnbm9yZWQgIi1XZGVwcmVjYXRlZC1kZWNsYXJhdGlvbnMiCkBAIC0z NTIsNyArMzUyLDcgQEAgdm9pZCBEaXJlY3RDb252b2x2ZXI6OnByb2Nlc3MoQXVkaW9GbG9hdEFy cmF5KiBjb252b2x1dGlvbktlcm5lbCwgY29uc3QgZmxvYXQqIHMKICAgICAgICAgfQogICAgICAg ICBkZXN0UFtpKytdID0gc3VtOwogICAgIH0KLSNlbmRpZiAvLyBPUyhEQVJXSU4pCisjZW5kaWYg Ly8gVVNFKEFDQ0VMRVJBVEUpCiAKICAgICAvLyBDb3B5IDJuZCBoYWxmIG9mIGlucHV0IGJ1ZmZl ciB0byAxc3QgaGFsZi4KICAgICBtZW1jcHkobV9idWZmZXIuZGF0YSgpLCBpbnB1dFAsIHNpemVv ZihmbG9hdCkgKiBmcmFtZXNUb1Byb2Nlc3MpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vYXVkaW8vRkZURnJhbWUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlv L0ZGVEZyYW1lLmgKaW5kZXggN2EzYTE0NWFmZmM4NTM4YmQxYmRhNGM0NTRmNmVkNjIxOTZiMTVj YS4uODA0ZDU1MmZhODU1YWY3OGY4MDgxMDg1MzAxYzMwNjMyYmJiYWI0NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vRkZURnJhbWUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9hdWRpby9GRlRGcmFtZS5oCkBAIC0zMSwxMCArMzEsNiBAQAogCiAjaW5j bHVkZSAiQXVkaW9BcnJheS5oIgogCi0jaWYgT1MoREFSV0lOKQotI2luY2x1ZGUgPEFjY2VsZXJh dGUvQWNjZWxlcmF0ZS5oPgotI2VuZGlmCi0KICNpZiBVU0UoV0VCQVVESU9fR1NUUkVBTUVSKQog I2luY2x1ZGUgPGdsaWIuaD4KIEdfQkVHSU5fREVDTFMKQEAgLTQyLDYgKzM4LDEwIEBAIEdfQkVH SU5fREVDTFMKIEdfRU5EX0RFQ0xTCiAjZW5kaWYgLy8gVVNFKFdFQkFVRElPX0dTVFJFQU1FUikK IAorI2lmIFVTRShBQ0NFTEVSQVRFKQorI2luY2x1ZGUgPEFjY2VsZXJhdGUvQWNjZWxlcmF0ZS5o PgorI2VuZGlmCisKICNpbmNsdWRlIDxtZW1vcnk+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4K ICNpbmNsdWRlIDx3dGYvVGhyZWFkaW5nLmg+CkBAIC05MCw3ICs5MCw3IEBAIHByaXZhdGU6CiAK ICAgICB2b2lkIGludGVycG9sYXRlRnJlcXVlbmN5Q29tcG9uZW50cyhjb25zdCBGRlRGcmFtZSYg ZnJhbWUxLCBjb25zdCBGRlRGcmFtZSYgZnJhbWUyLCBkb3VibGUgeCk7CiAKLSNpZiBPUyhEQVJX SU4pCisjaWYgVVNFKEFDQ0VMRVJBVEUpCiAgICAgRFNQU3BsaXRDb21wbGV4JiBkc3BTcGxpdENv bXBsZXgoKSB7IHJldHVybiBtX2ZyYW1lOyB9CiAgICAgRFNQU3BsaXRDb21wbGV4IGRzcFNwbGl0 Q29tcGxleCgpIGNvbnN0IHsgcmV0dXJuIG1fZnJhbWU7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vVmVjdG9yTWF0aC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9hdWRpby9WZWN0b3JNYXRoLmNwcAppbmRleCA0OGE2N2Q0NzBmZDc2MzY4MjRlNjM5 NzM1M2MzMjZhNTMyYmQ4Zjk4Li5mMzA4ZTAzMTIwYzc3MmY5ZjMwYWViMTVhNWI2MzlmOTQ4YWY0 NWQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9WZWN0b3JNYXRo LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9WZWN0b3JNYXRoLmNwcApA QCAtMjgsNyArMjgsNyBAQAogCiAjaW5jbHVkZSAiVmVjdG9yTWF0aC5oIgogCi0jaWYgT1MoREFS V0lOKQorI2lmIFVTRShBQ0NFTEVSQVRFKQogI2luY2x1ZGUgPEFjY2VsZXJhdGUvQWNjZWxlcmF0 ZS5oPgogI2VuZGlmCiAKQEAgLTQ3LDcgKzQ3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBu YW1lc3BhY2UgVmVjdG9yTWF0aCB7CiAKLSNpZiBPUyhEQVJXSU4pCisjaWYgVVNFKEFDQ0VMRVJB VEUpCiAvLyBPbiB0aGUgTWFjIHdlIHVzZSB0aGUgaGlnaGx5IG9wdGltaXplZCB2ZXJzaW9ucyBp biBBY2NlbGVyYXRlLmZyYW1ld29yawogLy8gSW4gMzItYml0IG1vZGUgKF9fcHBjX18gb3IgX19p Mzg2X18pIDxBY2NlbGVyYXRlL0FjY2VsZXJhdGUuaD4gaW5jbHVkZXMgPHZlY0xpYi92RFNQX3Ry YW5zbGF0ZS5oPiB3aGljaCBkZWZpbmVzIG1hY3JvcyBvZiB0aGUgc2FtZSBuYW1lIGFzCiAvLyBv dXIgbmFtZXNwYWNlZCBmdW5jdGlvbiBuYW1lcywgc28gd2UgbXVzdCBoYW5kbGUgdGhpcyBjYXNl IGRpZmZlcmVudGx5LiBPdGhlciBhcmNoaXRlY3R1cmVzICg2NGJpdCwgQVJNLCBldGMuKSBkbyBu b3QgaW5jbHVkZSB0aGlzIGhlYWRlciBmaWxlLgpAQCAtNjkwLDcgKzY5MCw3IEBAIHZvaWQgdmNs aXAoY29uc3QgZmxvYXQqIHNvdXJjZVAsIGludCBzb3VyY2VTdHJpZGUsIGNvbnN0IGZsb2F0KiBs b3dUaHJlc2hvbGRQLCBjCiAgICAgfQogfQogCi0jZW5kaWYgLy8gT1MoREFSV0lOKQorI2VuZGlm IC8vIFVTRShBQ0NFTEVSQVRFKQogCiB9IC8vIG5hbWVzcGFjZSBWZWN0b3JNYXRoCiAK