From 32710633be0686ed8f62ce2266ba981c152f3f35 Mon Sep 17 00:00:00 2001
From: Simonas Kazlauskas <git@kazlauskas.me>
Date: Fri, 29 Jul 2016 18:56:46 +0300
Subject: [PATCH] Export LLVM init functions from rustc_llvm

---
 src/librustc_llvm/lib.rs | 105 ++++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 50 deletions(-)

diff --git a/src/librustc_llvm/lib.rs b/src/librustc_llvm/lib.rs
index e757201c88633..8520ce76b4226 100644
--- a/src/librustc_llvm/lib.rs
+++ b/src/librustc_llvm/lib.rs
@@ -2366,57 +2366,62 @@ pub unsafe fn debug_loc_to_string(c: ContextRef, tr: DebugLocRef) -> String {
         .expect("got a non-UTF8 DebugLoc from LLVM")
 }
 
-pub fn initialize_available_targets() {
-    macro_rules! init_target(
-        ($cfg:meta, $($method:ident),*) => { {
-            #[cfg($cfg)]
-            fn init() {
-                extern {
-                    $(fn $method();)*
+macro_rules! generate_target_init (
+    ($($cfg:meta: $($method:ident),*);*) => {
+        $(#[cfg($cfg)]
+        extern {
+            $(pub fn $method();)*
+        })*
+
+        pub fn initialize_available_targets() {
+            $({
+                #[cfg($cfg)]
+                fn init() {
+                    unsafe { $($method();)* }
                 }
-                unsafe {
-                    $($method();)*
-                }
-            }
-            #[cfg(not($cfg))]
-            fn init() { }
-            init();
-        } }
-    );
-    init_target!(llvm_component = "x86",
-                 LLVMInitializeX86TargetInfo,
-                 LLVMInitializeX86Target,
-                 LLVMInitializeX86TargetMC,
-                 LLVMInitializeX86AsmPrinter,
-                 LLVMInitializeX86AsmParser);
-    init_target!(llvm_component = "arm",
-                 LLVMInitializeARMTargetInfo,
-                 LLVMInitializeARMTarget,
-                 LLVMInitializeARMTargetMC,
-                 LLVMInitializeARMAsmPrinter,
-                 LLVMInitializeARMAsmParser);
-    init_target!(llvm_component = "aarch64",
-                 LLVMInitializeAArch64TargetInfo,
-                 LLVMInitializeAArch64Target,
-                 LLVMInitializeAArch64TargetMC,
-                 LLVMInitializeAArch64AsmPrinter,
-                 LLVMInitializeAArch64AsmParser);
-    init_target!(llvm_component = "mips",
-                 LLVMInitializeMipsTargetInfo,
-                 LLVMInitializeMipsTarget,
-                 LLVMInitializeMipsTargetMC,
-                 LLVMInitializeMipsAsmPrinter,
-                 LLVMInitializeMipsAsmParser);
-    init_target!(llvm_component = "powerpc",
-                 LLVMInitializePowerPCTargetInfo,
-                 LLVMInitializePowerPCTarget,
-                 LLVMInitializePowerPCTargetMC,
-                 LLVMInitializePowerPCAsmPrinter,
-                 LLVMInitializePowerPCAsmParser);
-    init_target!(llvm_component = "pnacl",
-                 LLVMInitializePNaClTargetInfo,
-                 LLVMInitializePNaClTarget,
-                 LLVMInitializePNaClTargetMC);
+                #[cfg(not($cfg))]
+                fn init() {};
+                init();
+            })*
+        }
+    }
+);
+
+generate_target_init! {
+llvm_component = "x86":
+    LLVMInitializeX86TargetInfo,
+    LLVMInitializeX86Target,
+    LLVMInitializeX86TargetMC,
+    LLVMInitializeX86AsmPrinter,
+    LLVMInitializeX86AsmParser;
+llvm_component = "arm":
+    LLVMInitializeARMTargetInfo,
+    LLVMInitializeARMTarget,
+    LLVMInitializeARMTargetMC,
+    LLVMInitializeARMAsmPrinter,
+    LLVMInitializeARMAsmParser;
+llvm_component = "aarch64":
+    LLVMInitializeAArch64TargetInfo,
+    LLVMInitializeAArch64Target,
+    LLVMInitializeAArch64TargetMC,
+    LLVMInitializeAArch64AsmPrinter,
+    LLVMInitializeAArch64AsmParser;
+llvm_component = "mips":
+    LLVMInitializeMipsTargetInfo,
+    LLVMInitializeMipsTarget,
+    LLVMInitializeMipsTargetMC,
+    LLVMInitializeMipsAsmPrinter,
+    LLVMInitializeMipsAsmParser;
+llvm_component = "powerpc":
+    LLVMInitializePowerPCTargetInfo,
+    LLVMInitializePowerPCTarget,
+    LLVMInitializePowerPCTargetMC,
+    LLVMInitializePowerPCAsmPrinter,
+    LLVMInitializePowerPCAsmParser;
+llvm_component = "pnacl":
+    LLVMInitializePNaClTargetInfo,
+    LLVMInitializePNaClTarget,
+    LLVMInitializePNaClTargetMC
 }
 
 pub fn last_error() -> Option<String> {