diff options
| author | Kimmo Ollila <kimmo.ollila@qt.io> | 2018-04-25 13:25:45 +0300 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@qt.io> | 2018-04-26 11:49:48 +0000 |
| commit | 4b27062f5fae891850fd0f048f2a2421ca9b6c7c (patch) | |
| tree | c0185cbee8d3c3db2aee2743b7beecfc57b318b0 /src/3rdparty/masm/assembler/AbstractMacroAssembler.h | |
| parent | dd1b13a50b55652253cc04cc3fa52d2280f1da56 (diff) | |
Fix JIT build on INTEGRITY ARM64
-typedef "Jump" may not be used in an elaborated type specifier
-explicit specialization of function must precede its first use
-"Value" is ambiguous
Change-Id: Ic15c196f1b33211cd3f2f25a54ba478747336fe4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Nikola Velinov <nvelinov@ghs.com>
Diffstat (limited to 'src/3rdparty/masm/assembler/AbstractMacroAssembler.h')
| -rw-r--r-- | src/3rdparty/masm/assembler/AbstractMacroAssembler.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/3rdparty/masm/assembler/AbstractMacroAssembler.h b/src/3rdparty/masm/assembler/AbstractMacroAssembler.h index 6fac27fdf1..1076384900 100644 --- a/src/3rdparty/masm/assembler/AbstractMacroAssembler.h +++ b/src/3rdparty/masm/assembler/AbstractMacroAssembler.h @@ -327,7 +327,13 @@ public: template<class TemplateAssemblerType> friend class AbstractMacroAssembler; friend struct DFG::OSRExit; + +#if CPU(ARM_THUMB2) || CPU(ARM64) || defined(V4_BOOTSTRAP) + using Jump = typename AssemblerType::template Jump<Label>; + friend Jump; +#else friend class Jump; +#endif friend class JumpReplacementWatchpoint; friend class MacroAssemblerCodeRef; template <typename, template <typename> class> friend class LinkBufferBase; |