diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-01 10:45:09 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-01 10:46:09 (GMT) |
| commit | 0081d328394dea7ddcf7411ece678973a86781c9 (patch) | |
| tree | 89fecd4135e7ba7881ca72f2e6538ce24ba29d71 | |
| parent | a842b7e0a937a934e8af7b1edad324db8425ba8f (diff) | |
| download | Qt-0081d328394dea7ddcf7411ece678973a86781c9.zip Qt-0081d328394dea7ddcf7411ece678973a86781c9.tar.gz Qt-0081d328394dea7ddcf7411ece678973a86781c9.tar.bz2 | |
Fix QML crashes on the N900
JavaScriptCore and QtWebKit JIT symbols were clashing. Hide the new
thunk functions that DEFINE_STUB_FUNCTION declares.
Reviewed-by: Tapani Mikola <tapani.mikola@nokia.com>
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp index 022689b..b3c229e 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp @@ -1094,6 +1094,10 @@ RVCT() #define DEFINE_STUB_FUNCTION(rtype, op) rtype JIT_STUB cti_##op(STUB_ARGS_DECLARATION) #endif +#if COMPILER(GCC) +#pragma GCC visibility push(hidden) +#endif + DEFINE_STUB_FUNCTION(EncodedJSValue, op_convert_this) { STUB_INIT_STACK_FRAME(stackFrame); @@ -3205,6 +3209,10 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, to_object) return JSValue::encode(stackFrame.args[0].jsValue().toObject(callFrame)); } +#if COMPILER(GCC) +#pragma GCC visibility pop +#endif + } // namespace JSC #endif // ENABLE(JIT) |