30863 2009-10-28 09:08:06 -0700 [Qt] Fix linking on Linux 32-bit. 2009-11-12 04:45:14 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED Qt P1 Normal --- 1 jturcotte webkit-unassigned agl commit-queue eric kenneth laszlo.gombos thiago.macieira oldest_to_newest 158577 0 jturcotte 2009-10-28 09:08:06 -0700 It was missing the ".text" directive at the top of the file, indicating that code would follow. Without it, the assembler created "NOTYPE" symbols, which would result in linker errors. * jit/JITStubs.cpp: 158578 1 42032 jturcotte 2009-10-28 09:09:41 -0700 Created attachment 42032 Patch 158703 2 42032 mrowe 2009-10-28 14:36:23 -0700 Comment on attachment 42032 Patch > diff --git a/JavaScriptCore/jit/JITStubs.cpp b/JavaScriptCore/jit/JITStubs.cpp > index c999618..9fa898a 100644 > --- a/JavaScriptCore/jit/JITStubs.cpp > +++ b/JavaScriptCore/jit/JITStubs.cpp > @@ -75,7 +75,7 @@ namespace JSC { > #define THUMB_FUNC_PARAM(name) > #endif > > -#if PLATFORM(LINUX) && PLATFORM(X86_64) > +#if PLATFORM(LINUX) && (PLATFORM(X86_64) || PLATFORM(X86)) > #define SYMBOL_STRING_RELOCATION(name) #name "@plt" > #else > #define SYMBOL_STRING_RELOCATION(name) SYMBOL_STRING(name) It’s not clear why it’s necessary given that this code is well-tested on 32-bit Linux already. There’s nothing in the ChangeLog to explain it either. 162017 3 42032 kenneth 2009-11-10 04:39:02 -0800 Comment on attachment 42032 Patch Changing to r- due to the above comments 162019 4 thiago.macieira 2009-11-10 05:02:11 -0800 That change (PLT) is unrelated, but makes sense. Feel free to remove it. But in any case, the convention didn't change between 32- and 64-bit. So if one architecture requires it, both should. 162550 5 42976 jturcotte 2009-11-11 10:33:51 -0800 Created attachment 42976 Patch v2 Updated patch that just keep the +".text\n" line. 162568 6 42976 kenneth 2009-11-11 11:05:40 -0800 Comment on attachment 42976 Patch v2 ChangeLog entry should be at the top of the file. 162577 7 42976 eric 2009-11-11 11:15:02 -0800 Comment on attachment 42976 Patch v2 @kenneth: Actually I think svn-apply should handle this patch correctly regardless. svn-apply has code to move ChangeLog entries to the top automatically. 162579 8 eric 2009-11-11 11:16:15 -0800 @kenneth: Nope. you were right. svn-apply did not move this entry, so your r- was correct. I used: curl "https://bug-30863-attachments.webkit.org/attachment.cgi?id=42976" | svn-apply to test my theory. 162580 9 mrowe 2009-11-11 11:17:05 -0800 svn-apply will only do it if the entry in the patch was at the top of the file to begin with. In this case it’s 1000+ lines down in the file. 162839 10 43044 jturcotte 2009-11-12 01:28:44 -0800 Created attachment 43044 Patch v3 Changelog entry moved to the top. 162867 11 43044 commit-queue 2009-11-12 04:45:08 -0800 Comment on attachment 43044 Patch v3 Clearing flags on attachment: 43044 Committed r50874: <http://trac.webkit.org/changeset/50874> 162868 12 commit-queue 2009-11-12 04:45:14 -0800 All reviewed patches have been landed. Closing bug. 42032 2009-10-28 09:09:41 -0700 2009-11-11 10:33:51 -0800 Patch thiago1.patch text/plain 1544 jturcotte ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCBmYjg0MDkxLi5lZmFiMTM0IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMDktMTAtMjcgIFRoaWFnbyBNYWNpZWlyYSA8dGhpYWdvLm1hY2llaXJhQG5va2lhLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRd IEZpeCBsaW5raW5nIG9uIExpbnV4IDMyLWJpdC4KKworICAgICAgICBJdCB3YXMgbWlzc2luZyB0 aGUgIi50ZXh0IiBkaXJlY3RpdmUgYXQgdGhlIHRvcCBvZiB0aGUgZmlsZSwKKyAgICAgICAgaW5k aWNhdGluZyB0aGF0IGNvZGUgd291bGQgZm9sbG93LiBXaXRob3V0IGl0LCB0aGUgYXNzZW1ibGVy IGNyZWF0ZWQKKyAgICAgICAgIk5PVFlQRSIgc3ltYm9scywgd2hpY2ggd291bGQgcmVzdWx0IGlu IGxpbmtlciBlcnJvcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0zMDg2MworCisgICAgICAgICogaml0L0pJVFN0dWJzLmNwcDoKKwogMjAwOS0xMC0y NyAgUGV0ZXIgVmFyZ2EgIDxwdmFyZ2FAaW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFJ1YmJl ci1zdGFtcGVkIGJ5IFRvciBBcm5lIFZlc3Riw7guCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklUU3R1YnMuY3BwIGIvSmF2YVNjcmlwdENvcmUvaml0L0pJVFN0dWJzLmNwcAppbmRl eCBjOTk5NjE4Li45ZmE4OThhIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1 YnMuY3BwCisrKyBiL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVicy5jcHAKQEAgLTc1LDcgKzc1 LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAjZGVmaW5lIFRIVU1CX0ZVTkNfUEFSQU0obmFtZSkKICNl bmRpZgogCi0jaWYgUExBVEZPUk0oTElOVVgpICYmIFBMQVRGT1JNKFg4Nl82NCkKKyNpZiBQTEFU Rk9STShMSU5VWCkgJiYgKFBMQVRGT1JNKFg4Nl82NCkgfHwgUExBVEZPUk0oWDg2KSkKICNkZWZp bmUgU1lNQk9MX1NUUklOR19SRUxPQ0FUSU9OKG5hbWUpICNuYW1lICJAcGx0IgogI2Vsc2UKICNk ZWZpbmUgU1lNQk9MX1NUUklOR19SRUxPQ0FUSU9OKG5hbWUpIFNZTUJPTF9TVFJJTkcobmFtZSkK QEAgLTkzLDYgKzkzLDcgQEAgQ09NUElMRV9BU1NFUlQob2Zmc2V0b2Yoc3RydWN0IEpJVFN0YWNr RnJhbWUsIGNhbGxGcmFtZSkgPT0gMHg1OCwgSklUU3RhY2tGcmFtZV8KIENPTVBJTEVfQVNTRVJU KG9mZnNldG9mKHN0cnVjdCBKSVRTdGFja0ZyYW1lLCBjb2RlKSA9PSAweDUwLCBKSVRTdGFja0Zy YW1lX2NvZGVfb2Zmc2V0X21hdGNoZXNfY3RpVHJhbXBvbGluZSk7CiAKIGFzbSB2b2xhdGlsZSAo CisiLnRleHRcbiIKICIuZ2xvYmwgIiBTWU1CT0xfU1RSSU5HKGN0aVRyYW1wb2xpbmUpICJcbiIK IFNZTUJPTF9TVFJJTkcoY3RpVHJhbXBvbGluZSkgIjoiICJcbiIKICAgICAicHVzaGwgJWVicCIg IlxuIgo= 42976 2009-11-11 10:33:51 -0800 2009-11-12 01:28:44 -0800 Patch v2 thiago12.patch text/plain 1337 jturcotte ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCA5OGVkOTcwLi4wM2FhZDM1IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xMDk1LDYgKzEw OTUsMTkgQEAKICAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS5neXAvSmF2YVNjcmlwdENvcmUuZ3lw OgogICAgICAgICAqIHd0Zi9DdXJyZW50VGltZS5jcHA6CiAKKzIwMDktMTAtMjcgIFRoaWFnbyBN YWNpZWlyYSA8dGhpYWdvLm1hY2llaXJhQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEZpeCBsaW5raW5nIG9uIExpbnV4IDMy LWJpdC4KKworICAgICAgICBJdCB3YXMgbWlzc2luZyB0aGUgIi50ZXh0IiBkaXJlY3RpdmUgYXQg dGhlIHRvcCBvZiB0aGUgZmlsZSwKKyAgICAgICAgaW5kaWNhdGluZyB0aGF0IGNvZGUgd291bGQg Zm9sbG93LiBXaXRob3V0IGl0LCB0aGUgYXNzZW1ibGVyIGNyZWF0ZWQKKyAgICAgICAgIk5PVFlQ RSIgc3ltYm9scywgd2hpY2ggd291bGQgcmVzdWx0IGluIGxpbmtlciBlcnJvcnMuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDg2MworCisgICAgICAg ICogaml0L0pJVFN0dWJzLmNwcDoKKwogMjAwOS0xMC0yNyAgUGV0ZXIgVmFyZ2EgIDxwdmFyZ2FA aW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFJ1YmJlci1zdGFtcGVkIGJ5IFRvciBBcm5lIFZl c3Riw7guCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnMuY3BwIGIvSmF2 YVNjcmlwdENvcmUvaml0L0pJVFN0dWJzLmNwcAppbmRleCBiMzMzMTlkLi5mZDk0NjRiIDEwMDY0 NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnMuY3BwCisrKyBiL0phdmFTY3JpcHRD b3JlL2ppdC9KSVRTdHVicy5jcHAKQEAgLTkzLDYgKzkzLDcgQEAgQ09NUElMRV9BU1NFUlQob2Zm c2V0b2Yoc3RydWN0IEpJVFN0YWNrRnJhbWUsIGNhbGxGcmFtZSkgPT0gMHg1OCwgSklUU3RhY2tG cmFtZV8KIENPTVBJTEVfQVNTRVJUKG9mZnNldG9mKHN0cnVjdCBKSVRTdGFja0ZyYW1lLCBjb2Rl KSA9PSAweDUwLCBKSVRTdGFja0ZyYW1lX2NvZGVfb2Zmc2V0X21hdGNoZXNfY3RpVHJhbXBvbGlu ZSk7CiAKIGFzbSB2b2xhdGlsZSAoCisiLnRleHRcbiIKICIuZ2xvYmwgIiBTWU1CT0xfU1RSSU5H KGN0aVRyYW1wb2xpbmUpICJcbiIKIFNZTUJPTF9TVFJJTkcoY3RpVHJhbXBvbGluZSkgIjoiICJc biIKICAgICAicHVzaGwgJWVicCIgIlxuIgo= 43044 2009-11-12 01:28:44 -0800 2009-11-12 04:45:07 -0800 Patch v3 thiago12.patch text/plain 1257 jturcotte ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCA5OGVkOTcwLi4wM2ZhMjljIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMDktMTEtMTIgIFRoaWFnbyBNYWNpZWlyYSA8dGhpYWdvLm1hY2llaXJhQG5va2lhLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRd IEZpeCBsaW5raW5nIG9uIExpbnV4IDMyLWJpdC4KKworICAgICAgICBJdCB3YXMgbWlzc2luZyB0 aGUgIi50ZXh0IiBkaXJlY3RpdmUgYXQgdGhlIHRvcCBvZiB0aGUgZmlsZSwKKyAgICAgICAgaW5k aWNhdGluZyB0aGF0IGNvZGUgd291bGQgZm9sbG93LiBXaXRob3V0IGl0LCB0aGUgYXNzZW1ibGVy IGNyZWF0ZWQKKyAgICAgICAgIk5PVFlQRSIgc3ltYm9scywgd2hpY2ggd291bGQgcmVzdWx0IGlu IGxpbmtlciBlcnJvcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0zMDg2MworCisgICAgICAgICogaml0L0pJVFN0dWJzLmNwcDoKKwogMjAwOS0xMS0x MCAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgogCiAgICAgICAgIExpbnV4IGJ1 aWxkIGZpeDogQWRkZWQgYW4gI2luY2x1ZGUgZm9yIFVJTlRfTUFYLgpkaWZmIC0tZ2l0IGEvSmF2 YVNjcmlwdENvcmUvaml0L0pJVFN0dWJzLmNwcCBiL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVi cy5jcHAKaW5kZXggYjMzMzE5ZC4uZmQ5NDY0YiAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUv aml0L0pJVFN0dWJzLmNwcAorKysgYi9KYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnMuY3BwCkBA IC05Myw2ICs5Myw3IEBAIENPTVBJTEVfQVNTRVJUKG9mZnNldG9mKHN0cnVjdCBKSVRTdGFja0Zy YW1lLCBjYWxsRnJhbWUpID09IDB4NTgsIEpJVFN0YWNrRnJhbWVfCiBDT01QSUxFX0FTU0VSVChv ZmZzZXRvZihzdHJ1Y3QgSklUU3RhY2tGcmFtZSwgY29kZSkgPT0gMHg1MCwgSklUU3RhY2tGcmFt ZV9jb2RlX29mZnNldF9tYXRjaGVzX2N0aVRyYW1wb2xpbmUpOwogCiBhc20gdm9sYXRpbGUgKAor Ii50ZXh0XG4iCiAiLmdsb2JsICIgU1lNQk9MX1NUUklORyhjdGlUcmFtcG9saW5lKSAiXG4iCiBT WU1CT0xfU1RSSU5HKGN0aVRyYW1wb2xpbmUpICI6IiAiXG4iCiAgICAgInB1c2hsICVlYnAiICJc biIK