From 0224bf8f12293cc24f76649fb4881b93d1353373 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Mon, 18 Nov 2013 13:51:46 +0200
Subject: Fix compilation on ARM

Android fix broke ARM compilation on non-Android Linux platforms.
Now correcly define Elf32_auxv_t only on Android/Qt and otherwise
include asm/hwcap.h

Same fix was previously applied to QtScript, which had the exact
same android problem (QTBUG-30978).

Task-number: QTBUG-34917
Change-Id: I29d570731754c6291f8dc0c379e6fdc8ec72b897
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
---
 Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp
index a523939b7..8f5a148f9 100644
--- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp
+++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp
@@ -36,9 +36,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <elf.h>
-#if !OS(ANDROID) && !PLATFORM(QT)
-# include <asm/hwcap.h>
-# else
+# if OS(ANDROID) && PLATFORM(QT)
 # include <asm/procinfo.h>
 typedef struct
 {
@@ -48,6 +46,8 @@ typedef struct
         uint32_t a_val;
     } a_un;
 } Elf32_auxv_t;
+# else
+# include <asm/hwcap.h>
 # endif
 #endif
 
-- 
cgit v1.2.1