From d4a6abc1b18d65a2bd665cdda10cedd97a98c249 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@digia.com>
Date: Fri, 18 Oct 2013 18:14:17 +0200
Subject: 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>
---
 Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp')

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 {
-- 
cgit v1.2.1