diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-26 09:56:57 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2009-11-04 18:21:47 (GMT) |
| commit | 16d98a3fa8e5cf5f41e35e257b8791ce030a4ce1 (patch) | |
| tree | 5332dfd6c477215a924636832cfafcdd6e779903 /src/3rdparty/webkit | |
| parent | 62ed4c43c8c2fe3457de6d7570c2ae4a09a5ecf0 (diff) | |
| download | Qt-16d98a3fa8e5cf5f41e35e257b8791ce030a4ce1.zip Qt-16d98a3fa8e5cf5f41e35e257b8791ce030a4ce1.tar.gz Qt-16d98a3fa8e5cf5f41e35e257b8791ce030a4ce1.tar.bz2 | |
Re-apply change cbb2efb13cdf05aabc245e2b0157883146cf069d by Thiago Macieira
Re-apply change 3f7a99565de7ed17d7ac4c0a25b02997b094b1a9 by Thiago Macieira
Fix linking of WebKit on Linux 32-bit.
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.
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp index c999618..9fa898a 100644 --- a/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp +++ b/src/3rdparty/webkit/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) @@ -93,6 +93,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_ COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x50, JITStackFrame_code_offset_matches_ctiTrampoline); asm volatile ( +".text\n" ".globl " SYMBOL_STRING(ctiTrampoline) "\n" SYMBOL_STRING(ctiTrampoline) ":" "\n" "pushl %ebp" "\n" |