97587 2012-09-25 11:49:17 -0700 [Qt] Fix the LLInt build on Mac 2012-11-26 14:46:17 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 95749 97584 1 ossy zeno benjamin fpizlo hausmann loki mark.lam ojan ossy vestbo webkit.review.bot zeno zherczeg oldest_to_newest 727836 0 ossy 2012-09-25 11:49:17 -0700 See https://bugs.webkit.org/show_bug.cgi?id=95749#c30 for details 752011 1 hausmann 2012-10-26 07:13:21 -0700 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) \ 775443 2 hausmann 2012-11-26 06:50:56 -0800 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 :) 775447 3 zeno 2012-11-26 06:57:09 -0800 (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. 775521 4 176010 zeno 2012-11-26 08:46:51 -0800 Created attachment 176010 Patch 775770 5 176010 hausmann 2012-11-26 12:27:59 -0800 Comment on attachment 176010 Patch Thanks Zeno! 775919 6 176010 zeno 2012-11-26 14:46:11 -0800 Comment on attachment 176010 Patch Clearing flags on attachment: 176010 Committed r135770: <http://trac.webkit.org/changeset/135770> 775920 7 zeno 2012-11-26 14:46:17 -0800 All reviewed patches have been landed. Closing bug. 176010 2012-11-26 08:46:51 -0800 2012-11-26 14:46:11 -0800 Patch bug-97587-20121126174429.patch text/plain 4708 zeno U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NzA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBi YTI5NzliYzJiODY5ZjYyNTI4MmY3ZDBkMTBhMWJlYWY1NGM0NTk4Li4yNTYzMjJhMjQ5NmI3NWE0 NmU1MThjM2QwZWZiODUyMTI1ODgyMDQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxMi0xMS0yNiAgWmVubyBBbGJpc3NlciAgPHplbm9Ad2Via2l0Lm9yZz4K KworICAgICAgICBbUXRdIEZpeCB0aGUgTExJbnQgYnVpbGQgb24gTWFjCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzU4NworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRGVyaXZlZFNvdXJjZXMucHJpOgor ICAgICAgICAqIEphdmFTY3JpcHRDb3JlLnBybzoKKwogMjAxMi0xMS0yMSAgRmlsaXAgUGl6bG8g IDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIEFueSBmdW5jdGlvbiB0aGF0IGNhbiBsb2cg dGhpbmdzIHNob3VsZCBiZSBhYmxlIHRvIGVhc2lseSBsb2cgdGhlbSB0byBhIG1lbW9yeSBidWZm ZXIgYXMgd2VsbApkaWZmIC0tZ2l0IGEvU291cmNlL1dURi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV1RG L0NoYW5nZUxvZwppbmRleCA1ZGQwZTliODJhYzc4MmYxNGFlYWRlMzEwOTFmN2JhZTM0NmYzZTA2 Li5hODUwNWYzYzVhOGRiNDg4NDIwMDU1OTU5NGJiZTU3NDZhZjQ3NzhhIDEwMDY0NAotLS0gYS9T b3VyY2UvV1RGL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE1IEBACisyMDEyLTExLTI2ICBaZW5vIEFsYmlzc2VyICA8emVub0B3ZWJraXQub3JnPgorCisg ICAgICAgIFtRdF0gRml4IHRoZSBMTEludCBidWlsZCBvbiBNYWMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3NTg3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvSW5saW5lQVNNLmg6CisgICAgICAg ICAgICBVc2UgT1MoREFSV0lOKSBpbnN0ZWFkIG9mIFBMQVRGT1JNKE1BQyksCisgICAgICAgICAg ICBpbiBvcmRlciB0byBhbGxvdyBRdCB0byB1c2UgdGhlIHNhbWUgY29kZS4KKyAgICAgICAgKiB3 dGYvUGxhdGZvcm0uaDoKKwogMjAxMi0xMS0yNCAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQu b3JnPgogCiAgICAgICAgIENocm9taXVtIHNob3VsZCB1c2UgVENNYWxsb2Mgb24gTWFjIHRvIGdv IGZhc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9EZXJpdmVkU291cmNlcy5w cmkgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvRGVyaXZlZFNvdXJjZXMucHJpCmluZGV4IGY5YmJi ZjY3YzZlMjA3NDc1MzgyMWJhNmRkODJhMGJiYWM2ZTBjMDYuLjhiYmMyOWQyYTZlODBiNzdiZDQ4 MmYzMzI3MTYxNDg4NTk0NGM5NGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9E ZXJpdmVkU291cmNlcy5wcmkKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0Rlcml2ZWRTb3Vy Y2VzLnByaQpAQCAtMTAyLDE1ICsxMDIsMTMgQEAgZm9yKGRpciwgRElSUykgewogICAgIGV4aXN0 cygkJGZpbGUpOiBMTElOVF9GSUxFUyArPSAkJGZpbGUKIH0KIAotaWYobGludXgtKnx3aW4zMikg ewotICAgICNHRU5FUkFUT1I6IExMSW50Ci0gICAgbGxpbnQub3V0cHV0ID0gJHtRTUFLRV9GSUxF X0lOX1BBVEh9JCR7UU1BS0VfRElSX1NFUH1MTEludEFzc2VtYmx5LmgKLSAgICBsbGludC5zY3Jp cHQgPSAkJFBXRC9vZmZsaW5lYXNtL2FzbS5yYgotICAgIGxsaW50LmlucHV0ID0gTExJTlRfRklM RVMKLSAgICBsbGludC5kZXBlbmRzID0gJCRMTElOVF9ERVBFTkRFTkNZCi0gICAgbGxpbnQuY29t bWFuZHMgPSBydWJ5ICQkbGxpbnQuc2NyaXB0ICQkTExJTlRfQVNTRU1CTEVSICR7UU1BS0VfRklM RV9JTn0gJHtRTUFLRV9GSUxFX09VVH0KLSAgICBHRU5FUkFUT1JTICs9IGxsaW50Ci19CisjR0VO RVJBVE9SOiBMTEludAorbGxpbnQub3V0cHV0ID0gJHtRTUFLRV9GSUxFX0lOX1BBVEh9JCR7UU1B S0VfRElSX1NFUH1MTEludEFzc2VtYmx5LmgKK2xsaW50LnNjcmlwdCA9ICQkUFdEL29mZmxpbmVh c20vYXNtLnJiCitsbGludC5pbnB1dCA9IExMSU5UX0ZJTEVTCitsbGludC5kZXBlbmRzID0gJCRM TElOVF9ERVBFTkRFTkNZCitsbGludC5jb21tYW5kcyA9IHJ1YnkgJCRsbGludC5zY3JpcHQgJCRM TElOVF9BU1NFTUJMRVIgJHtRTUFLRV9GSUxFX0lOfSAke1FNQUtFX0ZJTEVfT1VUfQorR0VORVJB VE9SUyArPSBsbGludAogCiBsaW51eC0qOmlmKGlzRXF1YWwoUVRfQVJDSCwgImkzODYiKXxpc0Vx dWFsKFFUX0FSQ0gsICJ4ODZfNjQiKSkgewogICAgICMgR0VORVJBVE9SOiBkaXNhc3NlbWJsZXIK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5wcm8gYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUucHJvCmluZGV4IDkyNDI2MWQ0ZmNi NmRlYjI4YTAxNzA0MjBhYjY0ZWNmN2JjZTU3OGYuLjEzMTMwYjg3ZjA1YWYzY2RjMzA2NmQzZTY2 NTY4NzQxODNmMDMwOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2Ny aXB0Q29yZS5wcm8KKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnBy bwpAQCAtNywxOCArNywxNiBAQAogVEVNUExBVEUgPSBzdWJkaXJzCiBDT05GSUcgKz0gb3JkZXJl ZAogCi1pZihsaW51eC0qfHdpbjMyKikgewotICAgIExMSW50T2Zmc2V0c0V4dHJhY3Rvci5maWxl ID0gTExJbnRPZmZzZXRzRXh0cmFjdG9yLnBybwotICAgIExMSW50T2Zmc2V0c0V4dHJhY3Rvci5t YWtlZmlsZSA9IE1ha2VmaWxlLkxMSW50T2Zmc2V0c0V4dHJhY3RvcgotICAgIFNVQkRJUlMgKz0g TExJbnRPZmZzZXRzRXh0cmFjdG9yCi19CitMTEludE9mZnNldHNFeHRyYWN0b3IuZmlsZSA9IExM SW50T2Zmc2V0c0V4dHJhY3Rvci5wcm8KK0xMSW50T2Zmc2V0c0V4dHJhY3Rvci5tYWtlZmlsZSA9 IE1ha2VmaWxlLkxMSW50T2Zmc2V0c0V4dHJhY3RvcgorU1VCRElSUyArPSBMTEludE9mZnNldHNF eHRyYWN0b3IKIAogZGVyaXZlZF9zb3VyY2VzLmZpbGUgPSBEZXJpdmVkU291cmNlcy5wcmkKIHRh cmdldC5maWxlID0gVGFyZ2V0LnByaQogCiBTVUJESVJTICs9IGRlcml2ZWRfc291cmNlcyB0YXJn ZXQKIAotaWYobGludXgtKnx3aW4zMiopOmFkZFN0cmljdFN1YmRpck9yZGVyQmV0d2VlbihMTElu dE9mZnNldHNFeHRyYWN0b3IsIGRlcml2ZWRfc291cmNlcykKK2FkZFN0cmljdFN1YmRpck9yZGVy QmV0d2VlbihMTEludE9mZnNldHNFeHRyYWN0b3IsIGRlcml2ZWRfc291cmNlcykKIGFkZFN0cmlj dFN1YmRpck9yZGVyQmV0d2VlbihkZXJpdmVkX3NvdXJjZXMsIHRhcmdldCkKIAoganNjLmZpbGUg PSBqc2MucHJvCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9JbmxpbmVBU00uaCBiL1NvdXJj ZS9XVEYvd3RmL0lubGluZUFTTS5oCmluZGV4IDM3MDY5YTdlNzRlMDViYWEzMmVhMDFmNzk0NGJk OThhMDEyYmUyYmMuLjBhMmZlNzhiNzhhNWIyZDA3OTBiMjgwNGI3ZTkyNzdlMWQ5Nzk5N2IgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0lubGluZUFTTS5oCisrKyBiL1NvdXJjZS9XVEYvd3Rm L0lubGluZUFTTS5oCkBAIC03Nyw3ICs3Nyw3IEBACiAvLyBGSVhNRTogZmlndXJlIG91dCBob3cg dGhpcyB3b3JrcyBvbiBhbGwgdGhlIHBsYXRmb3Jtcy4gSSBrbm93IHRoYXQKIC8vIG9uIEVMRiwg dGhlIHByZWZlcnJlZCBmb3JtIGlzICIuTHN0dWZmIiBhcyBvcHBvc2VkIHRvICJMc3R1ZmYiLgog Ly8gRG9uJ3Qga25vdyBhYm91dCBhbnkgb2YgdGhlIG90aGVycy4KLSNpZiBQTEFURk9STShNQUMp CisjaWYgT1MoREFSV0lOKQogI2RlZmluZSBMT0NBTF9MQUJFTF9TVFJJTkcobmFtZSkgIkwiICNu YW1lCiAjZWxpZiAgIE9TKExJTlVYKSAgICAgICAgICAgICAgIFwKICAgICAgfHwgT1MoRlJFRUJT RCkgICAgICAgICAgICAgXApkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvUGxhdGZvcm0uaCBi L1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgKaW5kZXggMTJmZmJmMjA3ZWYzZjhjM2Y1ZjUxOTI3 NTEwMGFmZTQ1ZmVlMjQ5Ny4uMTYwMzAxOTlhM2FkZWYwZTA3ZDJjZmE2OTIzZTVmNjcxODIwODBk NyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAorKysgYi9Tb3VyY2UvV1RG L3d0Zi9QbGF0Zm9ybS5oCkBAIC05MjYsNyArOTI2LDcgQEAKICNpZiAhZGVmaW5lZChFTkFCTEVf TExJTlQpIFwKICAgICAmJiBFTkFCTEUoSklUKSBcCiAgICAgJiYgKE9TKERBUldJTikgfHwgT1Mo TElOVVgpKSBcCi0gICAgJiYgKFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0oSU9TKSB8fCBQTEFU Rk9STShHVEspIHx8IChQTEFURk9STShRVCkgJiYgT1MoTElOVVgpKSkgXAorICAgICYmIChQTEFU Rk9STShNQUMpIHx8IFBMQVRGT1JNKElPUykgfHwgUExBVEZPUk0oR1RLKSB8fCBQTEFURk9STShR VCkpIFwKICAgICAmJiAoQ1BVKFg4NikgfHwgQ1BVKFg4Nl82NCkgfHwgQ1BVKEFSTV9USFVNQjIp KQogI2RlZmluZSBFTkFCTEVfTExJTlQgMQogI2VuZGlmCg==