From dfa35d7fd5aebe5ed5e38223dd8c313c4a3dfd72 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 24 Sep 2015 19:28:13 +0300 Subject: offlineasm: "touch" output file if nothing has changed. If offlineasm exits with "Nothing changed" timestamp of generated file is unchanged so make utility still considers it as outdated. Change-Id: Id3443294bc034978679219177f32acb0afa0dc00 Reviewed-by: Allan Sandfeld Jensen --- Source/JavaScriptCore/offlineasm/asm.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Source/JavaScriptCore') 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 } -- cgit v1.2.1 From 93cc8d306f8033551fb60e2e1f8f480330778a21 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 15 Oct 2015 11:31:00 +0200 Subject: Fix build for QNX The QNX target appears to be unable to accept ALWAYS_INLINE used as the sorting function in std::sort, so let it be normal inline there. Change-Id: I2d6df47764ed3dd87c8731c0d3c37eb79af40b3f Reviewed-by: Simon Hausmann --- Source/JavaScriptCore/assembler/ARMv7Assembler.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Source/JavaScriptCore') 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(); } -- cgit v1.2.1