diff options
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp index f42e69d..0e64ea1 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp @@ -36,7 +36,7 @@ #include <fcntl.h> #include <unistd.h> #include <elf.h> -# if OS(ANDROID) && PLATFORM(QT) +# if OS(ANDROID) && PLATFORM(QT) && !defined(HAVE_asm_hwcap_h) # include <asm/procinfo.h> # else # include <asm/hwcap.h> |