diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 03:05:03 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 03:05:03 +0100 |
| commit | a21313fea09c6b6b44398424a0a14920911dc186 (patch) | |
| tree | 35fd3329cd6e2559a999418c9129fcf2e7d41dfc /src/3rdparty/javascriptcore | |
| parent | 5ccd29d6720260712655cc6f722824e5fcf11fb3 (diff) | |
| parent | 3e1692bebdf2e4c69adb2a23718ad230a74992dd (diff) | |
| download | qtscript-a21313fea09c6b6b44398424a0a14920911dc186.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Iccc9e012e446c72292d5c8ef4a45a735a4e88025
Diffstat (limited to 'src/3rdparty/javascriptcore')
| -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> |