Bug 97587

Summary: [Qt] Fix the LLInt build on Mac
Product: WebKit Reporter: Csaba Osztrogonác <ossy>
Component: JavaScriptCoreAssignee: Zeno Albisser <zeno>
Status: RESOLVED FIXED    
Severity: Normal CC: benjamin, fpizlo, hausmann, loki, mark.lam, ojan, ossy, vestbo, webkit.review.bot, zeno, zherczeg
Priority: P2 Keywords: Qt, QtTriaged
Version: 528+ (Nightly build)   
Hardware: All   
OS: All   
Bug Depends on: 95749    
Bug Blocks: 97584    
Attachments:
Description Flags
Patch none

Description Csaba Osztrogonác 2012-09-25 11:49:17 PDT 
See https://bugs.webkit.org/show_bug.cgi?id=95749#c30 for details
Comment 1 Simon Hausmann 2012-10-26 07:13:21 PDT 
The error is: 

Compiling /Users/torarne/dev/webkit/wip/Source/JavaScriptCore/profiler/ProfileGenerator.cpp
In file included from /Users/torarne/dev/webkit/wip/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:465:
generated/LLIntAssembly.h:15:13: error: expected ')'
    "\tjs " LOCAL_LABEL_STRING(_offlineasm_prologue__continue) "\n"
            ^
generated/LLIntAssembly.h:3:1: note: to match this '('
OFFLINE_ASM_BEGIN
^
/Users/torarne/dev/webkit/wip/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:441:33: note: expanded from macro 'OFFLINE_ASM_BEGIN'
#define OFFLINE_ASM_BEGIN   asm (
                                ^
1 error generated.
make[4]: *** [obj/debug/llint/LowLevelInterpreter.o] Error 1

and I think the fix is probably:


diff --git a/Source/WTF/wtf/InlineASM.h b/Source/WTF/wtf/InlineASM.h
index 37069a7..0a2fe78 100644
--- a/Source/WTF/wtf/InlineASM.h
+++ b/Source/WTF/wtf/InlineASM.h
@@ -77,7 +77,7 @@
 // FIXME: figure out how this works on all the platforms. I know that
 // on ELF, the preferred form is ".Lstuff" as opposed to "Lstuff".
 // Don't know about any of the others.
-#if PLATFORM(MAC)
+#if OS(DARWIN)
 #define LOCAL_LABEL_STRING(name) "L" #name
 #elif   OS(LINUX)               \
      || OS(FREEBSD)             \
Comment 2 Simon Hausmann 2012-11-26 06:50:56 PST 
Tor Arne or Zeno: Could you of you guys try the patch on a Mac, when you have time? This should be a straight-forward fix :)
Comment 3 Zeno Albisser 2012-11-26 06:57:09 PST 
(In reply to comment #2)
> Tor Arne or Zeno: Could you of you guys try the patch on a Mac, when you have time? This should be a straight-forward fix :)

I'll give it a try.
Comment 4 Zeno Albisser 2012-11-26 08:46:51 PST 
Created attachment 176010 [details]
Patch
Comment 5 Simon Hausmann 2012-11-26 12:27:59 PST 
Comment on attachment 176010 [details]
Patch

Thanks Zeno!
Comment 6 Zeno Albisser 2012-11-26 14:46:11 PST 
Comment on attachment 176010 [details]
Patch

Clearing flags on attachment: 176010

Committed r135770: <http://trac.webkit.org/changeset/135770>
Comment 7 Zeno Albisser 2012-11-26 14:46:17 PST 
All reviewed patches have been landed.  Closing bug.