diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:19:26 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:19:27 +0100 |
| commit | c617e2a25aca6cb95ab9d1a7cc55b363a12e861e (patch) | |
| tree | 6d6f74338e81973c5f5d11984d822ee450205074 /Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp | |
| parent | 056b920c01121c095b20fa7ee3886c0bfebd3536 (diff) | |
| parent | 8c7a7606acbb2083c8077cce57054f43744cb1c0 (diff) | |
| download | qtwebkit-c617e2a25aca6cb95ab9d1a7cc55b363a12e861e.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I4e82a7abec9b95d3148e1eddc786ee5a16d1f768
Diffstat (limited to 'Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp')
| -rw-r--r-- | Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp index 98dc3e987..a523939b7 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp +++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp @@ -36,7 +36,19 @@ #include <fcntl.h> #include <unistd.h> #include <elf.h> -#include <asm/hwcap.h> +#if !OS(ANDROID) && !PLATFORM(QT) +# include <asm/hwcap.h> +# else +# include <asm/procinfo.h> +typedef struct +{ + uint32_t a_type; + union + { + uint32_t a_val; + } a_un; +} Elf32_auxv_t; +# endif #endif namespace JSC { |