Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: Id0ecdb116f20801d1bd3d3c57c47888ed7a5085b

2 files changed, 6 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();
     }
diff --git a/Source/JavaScriptCore/offlineasm/asm.rb b/Source/JavaScriptCore/offlineasm/asm.rb
index bf2426399..ed0f15340 100644
--- a/Source/JavaScriptCore/offlineasm/asm.rb
+++ b/Source/JavaScriptCore/offlineasm/asm.rb
@@ -28,6 +28,7 @@ $: << File.dirname(__FILE__)
 require "config"
 require "backends"
 require "digest/sha1"
+require "fileutils"
 require "offsets"
 require "parser"
 require "self_hash"
@@ -244,6 +245,7 @@ if FileTest.exist? outputFlnm
         firstLine = inp.gets
         if firstLine and firstLine.chomp == inputHash
             $stderr.puts "offlineasm: Nothing changed."
+            FileUtils.touch(outputFlnm)
             exit 0
         end
     }