diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2010-04-07 16:39:19 (GMT) |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2010-04-07 16:55:21 (GMT) |
| commit | a7fe17c177a8e4788e92b7931013da4ca3ad3b61 (patch) | |
| tree | 8b338e0cde290038aab421e6d2e4511d1ea40cda /src | |
| parent | 26466aca454bec1117a13af41b12efa66f4a6567 (diff) | |
| download | Qt-a7fe17c177a8e4788e92b7931013da4ca3ad3b61.zip Qt-a7fe17c177a8e4788e92b7931013da4ca3ad3b61.tar.gz Qt-a7fe17c177a8e4788e92b7931013da4ca3ad3b61.tar.bz2 | |
Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-07042010 ( 475f8c67522d8b3f3163dc3a6b24d6083fd0ac19 )
https://bugs.webkit.org/show_bug.cgi?id=36742
gcc for Symbian doesn't support gcc extensions like atomicity.h - disable
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog | 10 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 4 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/VERSION | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog index e2e1786..4f6e565 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog +++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog @@ -9,6 +9,16 @@ * os-win32/stdint.h: +2010-03-29 Thomas Zander <t.zander@nokia.com> + + Reviewed by Simon Hausmann. + + https://bugs.webkit.org/show_bug.cgi?id=36742 + + gcc for Symbian doesn't support gcc extensions like atomicity.h - disable + + * wtf/Threading.h: also detect os symbian + 2010-03-23 Mark Rowe <mrowe@apple.com> Build fix. diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h index 85c8743..920a4d7 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h @@ -75,7 +75,7 @@ #include <libkern/OSAtomic.h> #elif OS(ANDROID) #include <cutils/atomic.h> -#elif COMPILER(GCC) && !defined(__SYMBIAN32__) +#elif COMPILER(GCC) && !OS(SYMBIAN) #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) #include <ext/atomicity.h> #else @@ -239,7 +239,7 @@ inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Bar inline int atomicIncrement(int volatile* addend) { return android_atomic_inc(addend); } inline int atomicDecrement(int volatile* addend) { return android_atomic_dec(addend); } -#elif COMPILER(GCC) && !CPU(SPARC64) && !defined(__SYMBIAN32__) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc +#elif COMPILER(GCC) && !CPU(SPARC64) && !OS(SYMBIAN) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc #define WTF_USE_LOCKFREE_THREADSAFESHARED 1 inline int atomicIncrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, 1) + 1; } diff --git a/src/3rdparty/javascriptcore/VERSION b/src/3rdparty/javascriptcore/VERSION index 7a0b7a7..2b885a7 100644 --- a/src/3rdparty/javascriptcore/VERSION +++ b/src/3rdparty/javascriptcore/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - 3b44f0650780e009764ddc0aa6eba7234a85aa72 + 475f8c67522d8b3f3163dc3a6b24d6083fd0ac19 |