diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:08:31 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:08:31 +0100 |
| commit | c242216d99f76443f3fe9160d15d78f06f7ff406 (patch) | |
| tree | b55b470c20bda9f9d9f9052fc5a02bccbabc4d56 /Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp | |
| parent | c617e2a25aca6cb95ab9d1a7cc55b363a12e861e (diff) | |
| parent | 48c1382c33b77b002c1b295b9d2d6c4987526add (diff) | |
| download | qtwebkit-c242216d99f76443f3fe9160d15d78f06f7ff406.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I9f566e48b319664f2783788572935da39749c91c
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 |