diff options
| author | BogDan Vatra <bogdan@kde.org> | 2014-03-04 11:58:03 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-04 11:37:26 +0100 |
| commit | 49ab1bd9838dc3c069be780ff6d69a2543c06ed6 (patch) | |
| tree | 77491418a1c921818bd107b79c60c68de5d76524 | |
| parent | ae1322df716e9ebdae9fa156c4eeb4fc18d3a191 (diff) | |
| download | qtscript-49ab1bd9838dc3c069be780ff6d69a2543c06ed6.tar.gz | |
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>
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp index 71ab6e8..f42e69d 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 |