From 49ab1bd9838dc3c069be780ff6d69a2543c06ed6 Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kde.org>
Date: Tue, 4 Mar 2014 11:58:03 +0200
Subject: [PATCH] Android: fix compile
In early NDKs (previous to 9) Elf32_auxv_t struct was not defined at all.
In NDK 9+ Elf32_auxv_t struct is already defined in elf.h and we'll get an error.
We need to include asm/procinfo.h for HWCAP_VFP.
Change-Id: I1ba30991ea9dd14ad9d7273c58ed6e61cd75255e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
.../JavaScriptCore/assembler/MacroAssemblerARM.cpp | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp
index 71ab6e80..f42e69d3 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp
@@ -37,14 +37,7 @@
#include <unistd.h>
#include <elf.h>
# if OS(ANDROID) && PLATFORM(QT)
-typedef struct
-{
- uint32_t a_type;
- union
- {
- uint32_t a_val;
- } a_un;
-} Elf32_auxv_t;
+# include <asm/procinfo.h>
# else
# include <asm/hwcap.h>
# endif
--
GitLab