summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-10-26 09:56:57 (GMT)
committerJocelyn Turcotte <jocelyn.turcotte@nokia.com>2009-11-10 09:30:28 (GMT)
commitd09f0e3949d4e705ef60516a9ccfacad736dff43 (patch)
tree8f59f33e895e93c5a3a271478d47bdddf3c66df4 /src
parentd0c5bcf3b5793e73a059dea083b0f9ea0b16bfb3 (diff)
downloadQt-d09f0e3949d4e705ef60516a9ccfacad736dff43.zip
Qt-d09f0e3949d4e705ef60516a9ccfacad736dff43.tar.gz
Qt-d09f0e3949d4e705ef60516a9ccfacad736dff43.tar.bz2
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.
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp3
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"