diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-26 10:54:43 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-26 10:54:43 +0100 |
| commit | 155ec2223c8f60ae88dd72e705c3621cf490dac2 (patch) | |
| tree | 56dac84375472355936db118252d2cbe49827bff /Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp | |
| parent | cc83829fde79c21622ca1db16a2e8fdc9bac91bc (diff) | |
| parent | 840e2817de1eda68f656f9764f824898ebf6d9c2 (diff) | |
| download | qtwebkit-155ec2223c8f60ae88dd72e705c3621cf490dac2.tar.gz | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I9088052f76de19e584cd16fd039502de6b22bec2
Diffstat (limited to 'Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp')
| -rw-r--r-- | Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp index a523939b7..8f5a148f9 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp +++ b/Source/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) # include <asm/procinfo.h> typedef struct { @@ -48,6 +46,8 @@ typedef struct uint32_t a_val; } a_un; } Elf32_auxv_t; +# else +# include <asm/hwcap.h> # endif #endif |