diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-10-18 18:14:17 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-21 23:56:18 +0200 |
| commit | d4a6abc1b18d65a2bd665cdda10cedd97a98c249 (patch) | |
| tree | 1809712a95418c814a615d647f6f2b8211c912dc /Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp | |
| parent | 2761751ecaf61064c3742c639a37f110120e8292 (diff) | |
| download | qtwebkit-d4a6abc1b18d65a2bd665cdda10cedd97a98c249.tar.gz | |
Fix build for boot2qt eAndroid
Reverts the removal of Android support in WTF, and brings the support
up to date.
Merged change to MacroAssemblerARM.cpp from QtScript.
Replaces use of statvfs with statfs in one place.
Replaces shm-based shared memory with ashmem-based in WebKit2.
Change-Id: I440b1fbd94bb4148f7ba764d77de65230d13ed90
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp')
| -rw-r--r-- | Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp index 98dc3e987..a523939b7 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp +++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp @@ -36,7 +36,19 @@ #include <fcntl.h> #include <unistd.h> #include <elf.h> -#include <asm/hwcap.h> +#if !OS(ANDROID) && !PLATFORM(QT) +# include <asm/hwcap.h> +# else +# include <asm/procinfo.h> +typedef struct +{ + uint32_t a_type; + union + { + uint32_t a_val; + } a_un; +} Elf32_auxv_t; +# endif #endif namespace JSC { |