diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-03-02 13:49:11 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-03-02 13:49:11 +0100 |
| commit | 32c1212f81fcfc7b5e49f85d68b05cd94cd90521 (patch) | |
| tree | 795a3175173285f4ba5bd15cdc7ae6ec11c556d2 /src/3rdparty/masm/assembler/MacroAssembler.h | |
| parent | 79d3fe1bba4589c7f5780bb505eac7872061ee32 (diff) | |
| parent | 78dd18a0cd18449e1289e428ea6eca65e28fb114 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: I7e43a0a47d49de38617f6afc7548f9a9e212a851
Diffstat (limited to 'src/3rdparty/masm/assembler/MacroAssembler.h')
| -rw-r--r-- | src/3rdparty/masm/assembler/MacroAssembler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/masm/assembler/MacroAssembler.h b/src/3rdparty/masm/assembler/MacroAssembler.h index 87794c8ef4..7d9f156c8c 100644 --- a/src/3rdparty/masm/assembler/MacroAssembler.h +++ b/src/3rdparty/masm/assembler/MacroAssembler.h @@ -31,12 +31,12 @@ #if ENABLE(ASSEMBLER) #include "MacroAssemblerARMv7.h" +#include "MacroAssemblerARM64.h" #if CPU(ARM_THUMB2) namespace JSC { typedef MacroAssemblerARMv7 MacroAssemblerBase; }; #elif CPU(ARM64) -#include "MacroAssemblerARM64.h" namespace JSC { typedef MacroAssemblerARM64 MacroAssemblerBase; }; #elif CPU(ARM_TRADITIONAL) |