Changeset 49224 in webkit
- Timestamp:
- Oct 6, 2009 10:44:47 PM (14 years ago)
- Location:
- trunk/JavaScriptCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/ChangeLog
r49220 r49224 1 2009-10-06 Priit Laes <plaes@plaes.org> 2 3 Reviewed by Gavin Barraclough. 4 5 Linking fails with "relocation R_X86_64_PC32 against symbol 6 `cti_vm_throw'" 7 https://bugs.webkit.org/show_bug.cgi?id=28422 8 9 * jit/JITStubs.cpp: 10 Mark cti_vm_throw symbol as PLT-indirect symbol, so it doesn't end up 11 in text segment causing relocation errors on amd64 architecture. 12 Introduced new define SYMBOL_STRING_RELOCATION for such symbols. 13 1 14 2009-10-06 Oliver Hunt <oliver@apple.com> 2 15 -
trunk/JavaScriptCore/jit/JITStubs.cpp
r49065 r49224 76 76 #endif 77 77 78 #if PLATFORM(LINUX) && PLATFORM(X86_64) 79 #define SYMBOL_STRING_RELOCATION(name) #name "@plt" 80 #else 81 #define SYMBOL_STRING_RELOCATION(name) SYMBOL_STRING(name) 82 #endif 83 78 84 #if USE(JSVALUE32_64) 79 85 … … 113 119 "movl %esp, %ecx" "\n" 114 120 #endif 115 "call " SYMBOL_STRING (cti_vm_throw) "\n"121 "call " SYMBOL_STRING_RELOCATION(cti_vm_throw) "\n" 116 122 "addl $0x3c, %esp" "\n" 117 123 "popl %ebx" "\n" … … 176 182 SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" 177 183 "movq %rsp, %rdi" "\n" 178 "call " SYMBOL_STRING (cti_vm_throw) "\n"184 "call " SYMBOL_STRING_RELOCATION(cti_vm_throw) "\n" 179 185 "addq $0x48, %rsp" "\n" 180 186 "popq %rbx" "\n" … … 240 246 SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" 241 247 "cpy r0, sp" "\n" 242 "bl " SYMBOL_STRING (cti_vm_throw) "\n"248 "bl " SYMBOL_STRING_RELOCATION(cti_vm_throw) "\n" 243 249 "ldr r6, [sp, #0x2c]" "\n" 244 250 "ldr r5, [sp, #0x28]" "\n" … … 366 372 "movl %esp, %ecx" "\n" 367 373 #endif 368 "call " SYMBOL_STRING (cti_vm_throw) "\n"374 "call " SYMBOL_STRING_RELOCATION(cti_vm_throw) "\n" 369 375 "addl $0x1c, %esp" "\n" 370 376 "popl %ebx" "\n" … … 435 441 SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" 436 442 "movq %rsp, %rdi" "\n" 437 "call " SYMBOL_STRING (cti_vm_throw) "\n"443 "call " SYMBOL_STRING_RELOCATION(cti_vm_throw) "\n" 438 444 "addq $0x78, %rsp" "\n" 439 445 "popq %rbx" "\n" … … 499 505 SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" 500 506 "cpy r0, sp" "\n" 501 "bl " SYMBOL_STRING (cti_vm_throw) "\n"507 "bl " SYMBOL_STRING_RELOCATION(cti_vm_throw) "\n" 502 508 "ldr r6, [sp, #0x2c]" "\n" 503 509 "ldr r5, [sp, #0x28]" "\n" … … 555 561 "add r8, pc, #4" "\n" 556 562 "str r8, [sp, #-4]!" "\n" 557 "b " SYMBOL_STRING (cti_vm_throw) "\n"563 "b " SYMBOL_STRING_RELOCATION(cti_vm_throw) "\n" 558 564 559 565 // Both has the same return sequence
Note: See TracChangeset
for help on using the changeset viewer.