diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-30 11:11:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-30 11:26:26 +0200 |
| commit | 22cc4d6707132c3914b43ca3ed5c7d1f354d84b6 (patch) | |
| tree | 733f3529205e43865070edab5416e6f1b0b4c9f4 /src/3rdparty/masm/assembler/MacroAssemblerX86_64.h | |
| parent | e321dc6bee3645e2492914f99fc30f8019e9383b (diff) | |
| parent | 44900962268c50aa1f9823e71d5b75cfa9e7ea4f (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/qml/jit/qv4assembler.cpp
src/qml/jit/qv4assembler_p.h
Change-Id: Ibfe69610ccd1f275f181b2bd87feece4ba221e50
Diffstat (limited to 'src/3rdparty/masm/assembler/MacroAssemblerX86_64.h')
| -rw-r--r-- | src/3rdparty/masm/assembler/MacroAssemblerX86_64.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/masm/assembler/MacroAssemblerX86_64.h b/src/3rdparty/masm/assembler/MacroAssemblerX86_64.h index 14757f4ea2..c7c6aae637 100644 --- a/src/3rdparty/masm/assembler/MacroAssemblerX86_64.h +++ b/src/3rdparty/masm/assembler/MacroAssemblerX86_64.h @@ -37,6 +37,7 @@ namespace JSC { class MacroAssemblerX86_64 : public MacroAssemblerX86Common { public: static const Scale ScalePtr = TimesEight; + static const int PointerSize = 8; using MacroAssemblerX86Common::add32; using MacroAssemblerX86Common::and32; |