diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-16 09:23:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-16 09:23:15 +0200 |
| commit | 0be00760419a4eccdeea7828499d9fb47fc4bbad (patch) | |
| tree | d1abfcc27acc3e43bcd45aa713c486180b091864 /Source/JavaScriptCore/assembler | |
| parent | 14a3e9e525d48d18a823e9dd133a2175015bf6c2 (diff) | |
| parent | 93cc8d306f8033551fb60e2e1f8f480330778a21 (diff) | |
| download | qtwebkit-0be00760419a4eccdeea7828499d9fb47fc4bbad.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Id0ecdb116f20801d1bd3d3c57c47888ed7a5085b
Diffstat (limited to 'Source/JavaScriptCore/assembler')
| -rw-r--r-- | Source/JavaScriptCore/assembler/ARMv7Assembler.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/assembler/ARMv7Assembler.h b/Source/JavaScriptCore/assembler/ARMv7Assembler.h index 28989549d..ddb57b19d 100644 --- a/Source/JavaScriptCore/assembler/ARMv7Assembler.h +++ b/Source/JavaScriptCore/assembler/ARMv7Assembler.h @@ -1960,8 +1960,10 @@ public: int jumpSizeDelta(JumpType jumpType, JumpLinkType jumpLinkType) { return JUMP_ENUM_SIZE(jumpType) - JUMP_ENUM_SIZE(jumpLinkType); } // Assembler admin methods: - - static ALWAYS_INLINE bool linkRecordSourceComparator(const LinkRecord& a, const LinkRecord& b) +#if !OS(QNX) + ALWAYS_INLINE +#endif + static bool linkRecordSourceComparator(const LinkRecord& a, const LinkRecord& b) { return a.from() < b.from(); } |