Bug 97587 – [Qt] Fix the LLInt build on Mac

• Status: RESOLVED
• Resolution: FIXED
• Component: JavaScriptCore

[Csaba Osztrogonác]

See https://bugs.webkit.org/show_bug.cgi?id=95749#c30 for details

[Simon Hausmann]

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)             \

[Simon Hausmann]

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 :)

[Zeno Albisser]

(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.

[Zeno Albisser]

Created attachment 176010 [details]
Patch

[Simon Hausmann]

Comment on attachment 176010 [details]
Patch

Thanks Zeno!

[Zeno Albisser]

Comment on attachment 176010 [details]
Patch

Clearing flags on attachment: 176010

Committed r135770: <http://trac.webkit.org/changeset/135770>

[Zeno Albisser]

All reviewed patches have been landed.  Closing bug.