aboutsummaryrefslogtreecommitdiffstats
path: root/src/3rdparty/masm/assembler/MacroAssembler.h
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@qt.io>2017-05-10 15:20:50 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2017-05-10 15:21:47 +0200
commitafcbdccbe7be5446f693a84cdf1886fe92a2e033 (patch)
tree550d9ce3f11d95ee5a355f32a232c083cfe0304c /src/3rdparty/masm/assembler/MacroAssembler.h
parent23a3018fc6a1e650b7eb291009c20d46c9e5c9af (diff)
parent7434d05cc102f27d36b8efccb4e37f20a4886ea9 (diff)
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Contains the fix for tst_TouchMouse::hoverEnabled which has caused numerous failures in the last few days. Change-Id: I1e523087a53d1df0334d602e4125f5cddc9bf470
Diffstat (limited to 'src/3rdparty/masm/assembler/MacroAssembler.h')
-rw-r--r--src/3rdparty/masm/assembler/MacroAssembler.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/3rdparty/masm/assembler/MacroAssembler.h b/src/3rdparty/masm/assembler/MacroAssembler.h
index f37861eb66..6e77a9ffb7 100644
--- a/src/3rdparty/masm/assembler/MacroAssembler.h
+++ b/src/3rdparty/masm/assembler/MacroAssembler.h
@@ -248,14 +248,6 @@ public:
}
#endif
-#if CPU(MIPS)
- void poke(FPRegisterID src, int index = 0)
- {
- ASSERT(!(index & 1));
- storeDouble(src, addressForPoke(index));
- }
-#endif
-
// Backwards banches, these are currently all implemented using existing forwards branch mechanisms.
void branchPtr(RelationalCondition cond, RegisterID op1, TrustedImmPtr imm, Label target)
{