Attachment 224579 Details for Bug 129020 – the patch

[patch] the patch

blah.patch (text/plain), 2.07 KB, created by Filip Pizlo on 2014-02-18 20:13:42 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Filip Pizlo

Created: 2014-02-18 20:13:42 PST

Size: 2.07 KB

patch

obsolete

>Index: Source/JavaScriptCore/ChangeLog
>===================================================================
>--- Source/JavaScriptCore/ChangeLog	(revision 164349)
>+++ Source/JavaScriptCore/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2014-02-18  Filip Pizlo  <fpizlo@apple.com>
>+
>+        Don't call LLVMInitializeNativeTarget() because it can be all messed up if you cross-compile LLVM
>+        https://bugs.webkit.org/show_bug.cgi?id=129020
>+
>+        Reviewed by NOBODY (OOPS!).
>+        
>+        LLVMInitializeNativeTarget() is this super special inline function in llvm-c/Target.h that
>+        depends on some #define's that come from some really weird magic in autoconf/configure.ac.
>+        That magic fails miserably for cross-compiles. So, we need to manually initialize the things
>+        that InitializeNativeTarget initializes.
>+
>+        * llvm/library/LLVMExports.cpp:
>+        (initializeAndGetJSCLLVMAPI):
>+
> 2014-02-18  Filip Pizlo  <fpizlo@apple.com>
> 
>         The shell scripts in the Xcode build system should tell you when they failed
>Index: Source/JavaScriptCore/llvm/library/LLVMExports.cpp
>===================================================================
>--- Source/JavaScriptCore/llvm/library/LLVMExports.cpp	(revision 164269)
>+++ Source/JavaScriptCore/llvm/library/LLVMExports.cpp	(working copy)
>@@ -47,11 +47,20 @@ extern "C" JSC::LLVMAPI* initializeAndGe
>         callback("Could not start LLVM multithreading");
>     
>     LLVMLinkInMCJIT();
>-    LLVMInitializeNativeTarget();
>+    
>+    // You think you want to call LLVMInitializeNativeTarget()? Think again. This presumes that
>+    // LLVM was ./configured correctly, which won't be the case in cross-compilation situations.
>+    
> #if CPU(X86_64)
>+    LLVMInitializeX86TargetInfo();
>+    LLVMInitializeX86Target();
>+    LLVMInitializeX86TargetMC();
>     LLVMInitializeX86AsmPrinter();
>     LLVMInitializeX86Disassembler();
> #elif CPU(ARM64)
>+    LLVMInitializeARM64TargetInfo();
>+    LLVMInitializeARM64Target();
>+    LLVMInitializeARM64TargetMC();
>     LLVMInitializeARM64AsmPrinter();
>     LLVMInitializeARM64Disassembler();
> #else

Flags:

mitz: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 129020: 224579