diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-26 09:56:57 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-26 10:36:49 (GMT) |
| commit | 3f7a99565de7ed17d7ac4c0a25b02997b094b1a9 (patch) | |
| tree | e2a5433f72a5c7b9c7beda2636747a362d20f1ba /src | |
| parent | d2c9895fbc116ef87f9cc1161258fd4bba727c6c (diff) | |
| download | Qt-3f7a99565de7ed17d7ac4c0a25b02997b094b1a9.zip Qt-3f7a99565de7ed17d7ac4c0a25b02997b094b1a9.tar.gz Qt-3f7a99565de7ed17d7ac4c0a25b02997b094b1a9.tar.bz2 | |
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')
| -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 90ea807..2cbc13d 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" |