diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-10 10:16:41 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-10 10:16:42 +0200 |
| commit | 24a674183c7b620b8a12734f8a4da3a601939238 (patch) | |
| tree | bdfa28a496b9b08476249e76d5fa9ccafa9b8434 /Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp | |
| parent | 0b13f194d027b279ab7b813f26aaef9033a7d353 (diff) | |
| parent | cb0f788597a946438bfd993850426f848ff39aa2 (diff) | |
| download | qtwebkit-24a674183c7b620b8a12734f8a4da3a601939238.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Change-Id: Ic15a117b8136e64fd4268583f1220d0e9d381497
Diffstat (limited to 'Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp')
| -rw-r--r-- | Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp index 8f5a148f9..0264361b5 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp +++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp @@ -38,14 +38,6 @@ #include <elf.h> # if OS(ANDROID) && PLATFORM(QT) # include <asm/procinfo.h> -typedef struct -{ - uint32_t a_type; - union - { - uint32_t a_val; - } a_un; -} Elf32_auxv_t; # else # include <asm/hwcap.h> # endif |