From 15f8b3a5f8623d5230865e2fd9811c986a91f7e6 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Thu, 2 May 2013 15:32:09 +0300
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

Task-number: QTBUG-30978
Change-Id: I6708acd876d14b869a93a36f7d969e10febbd38b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
---
 .../javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/3rdparty/javascriptcore')

diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp
index efdd777..71ab6e8 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp
+++ b/src/3rdparty/javascriptcore/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)
 typedef struct
 {
     uint32_t a_type;
@@ -47,6 +45,8 @@ typedef struct
         uint32_t a_val;
     } a_un;
 } Elf32_auxv_t;
+# else
+# include <asm/hwcap.h>
 # endif
 #endif
 
-- 
cgit v1.2.1