diff options
| author | Samuli Piippo <samuli.piippo@digia.com> | 2013-05-02 15:32:09 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-06 06:36:57 +0200 |
| commit | 15f8b3a5f8623d5230865e2fd9811c986a91f7e6 (patch) | |
| tree | 3200f7107e34fb4d0116333d2b82ebe114fef883 | |
| parent | c85662167123b433a69a662212c67ce03e44a25a (diff) | |
| download | qtscript-15f8b3a5f8623d5230865e2fd9811c986a91f7e6.tar.gz | |
Fix compilation on ARMv5.1.0-beta1
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>
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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 |