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-12 10:37:11 (GMT) |
| commit | 448322c0473a8bbdf560cb7e52db4176f20913ed (patch) | |
| tree | 1e5b91d572f697bf18cd566db9ad60db383d2213 | |
| parent | b1ea8ceb309de537f5d9af951ce0e0c533490fb7 (diff) | |
| download | Qt-448322c0473a8bbdf560cb7e52db4176f20913ed.zip Qt-448322c0473a8bbdf560cb7e52db4176f20913ed.tar.gz Qt-448322c0473a8bbdf560cb7e52db4176f20913ed.tar.bz2 | |
Re-apply change d09f0e3949d4e705ef60516a9ccfacad736dff43 by Thiago Macieira
Re-apply change 16d98a3fa8e5cf5f41e35e257b8791ce030a4ce1 by Thiago Macieira
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.
| -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" |