diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 14:54:40 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 14:54:40 +0200 |
| commit | 6a66dbdddb6abd302898122b135513e95f659031 (patch) | |
| tree | dab8a06b1b0d0d0e5d6416d8e5b707e879c6dc91 | |
| parent | 1493a677c33693ea74ebf71277efcfc114fb46ce (diff) | |
| parent | 5d5f61912d4352e58d58fe8cf5fe1dd58b04b9e5 (diff) | |
| download | qtscript-6a66dbdddb6abd302898122b135513e95f659031.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I8bce6e1fdfd4a70bf60d1303982ea61e076683a7
3 files changed, 20 insertions, 7 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp index b5b20fa..efdd777 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp @@ -36,7 +36,18 @@ #include <fcntl.h> #include <unistd.h> #include <elf.h> -#include <asm/hwcap.h> +#if !OS(ANDROID) && !PLATFORM(QT) +# include <asm/hwcap.h> +# else +typedef struct +{ + uint32_t a_type; + union + { + uint32_t a_val; + } a_un; +} Elf32_auxv_t; +# endif #endif namespace JSC { @@ -56,7 +67,6 @@ static bool isVFPPresent() close(fd); } #endif - return false; } diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h index 17c06bf..d483806 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -452,6 +452,7 @@ || defined(__unix) \ || defined(__unix__) #define WTF_OS_UNIX 1 + #endif /* Operating environments */ @@ -643,16 +644,18 @@ #endif #if PLATFORM(ANDROID) +#if !PLATFORM(QT) #define WTF_USE_PTHREADS 1 +#define ENABLE_MAC_JAVA_BRIDGE 1 +#define ENABLE_JAVASCRIPT_DEBUGGER 0 +#endif /* !PLATFORM(QT) */ #define WTF_PLATFORM_SGL 1 #define USE_SYSTEM_MALLOC 1 -#define ENABLE_MAC_JAVA_BRIDGE 1 #define LOG_DISABLED 1 /* Prevents Webkit from drawing the caret in textfields and textareas This prevents unnecessary invals. */ #define ENABLE_TEXT_CARET 1 -#define ENABLE_JAVASCRIPT_DEBUGGER 0 -#endif +#endif /* PLATFORM(ANDROID) */ #if PLATFORM(WIN) #define WTF_USE_WININET 1 diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h index 8b76c0f..d1944a5 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h @@ -73,7 +73,7 @@ #include <windows.h> #elif OS(DARWIN) #include <libkern/OSAtomic.h> -#elif OS(ANDROID) +#elif OS(ANDROID) && !PLATFORM(QT) #include <cutils/atomic.h> #elif OS(QNX) #include <atomic.h> @@ -236,7 +236,7 @@ inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(r inline int atomicIncrement(int volatile* addend) { return OSAtomicIncrement32Barrier(const_cast<int*>(addend)); } inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Barrier(const_cast<int*>(addend)); } -#elif OS(ANDROID) +#elif OS(ANDROID) && !PLATFORM(QT) inline int atomicIncrement(int volatile* addend) { return android_atomic_inc(addend); } inline int atomicDecrement(int volatile* addend) { return android_atomic_dec(addend); } |