diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-01-20 10:43:55 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-01-31 17:09:02 +0000 |
| commit | 4eca12e9f5b6e6b09d89cd4438e8557c5b66dbd1 (patch) | |
| tree | b9670bbfe9e682098376f8d0f63b6ab47dac9766 /src/3rdparty/masm/assembler/MacroAssemblerARMv7.h | |
| parent | 64f21fc7825404ab12d08f233114f2895dea58d8 (diff) | |
Remove branch compaction #ifdef
Since the #ifdef for ARMv7 and ARM64 makes it impossible to cross
compile, we need to replace it with a template specialization of
LinkBuffer. The "old" LinkBuffer becomes LinkBufferBase, then there's a
generic LinkBuffer that's a sub-class of LinkBufferBase. Then there's a
BranchCompactingLinkBuffer template that implements the compaction and
two ARMv7 and ARM64 specializations of LinkBuffer<T> end up being
sub-classes of BranchCompactingLinkBuffer instead of LinkBufferBase.
Change-Id: Ib62fe24aa6c3570dfa311edc39fde6fb5975f3cc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/3rdparty/masm/assembler/MacroAssemblerARMv7.h')
| -rw-r--r-- | src/3rdparty/masm/assembler/MacroAssemblerARMv7.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h b/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h index 9f5a089a75..3f6352c1db 100644 --- a/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h +++ b/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h @@ -1930,7 +1930,7 @@ protected: } private: - template <typename> friend class LinkBuffer; + template <typename, template <typename> class> friend class LinkBufferBase; friend class RepatchBuffer; static void linkCall(void* code, Call call, FunctionPtr function) |