[Hack] Disable Rust-specific modifications to LLVM

shepmaster · shepmaster · commit 8d5c71f59771 · 2016-12-04T11:08:31.000-05:00
Upstream Rust has custom functionality compared to LLVM upstream. Each
one makes upgrading harder. Sigh.

- target and feature listing support
- JSBackend
diff --git a/configure b/configure
@@ -1796,7 +1796,7 @@ do
         CMAKE_ARGS="$CMAKE_ARGS -DLLVM_ENABLE_ASSERTIONS=ON"
     fi
 
-    CMAKE_ARGS="$CMAKE_ARGS -DLLVM_TARGETS_TO_BUILD='X86;ARM;AVR;AArch64;Mips;PowerPC;SystemZ;JSBackend;MSP430'"
+    CMAKE_ARGS="$CMAKE_ARGS -DLLVM_TARGETS_TO_BUILD='X86;ARM;AVR;AArch64;Mips;PowerPC;SystemZ;MSP430'"
     CMAKE_ARGS="$CMAKE_ARGS -G '$CFG_CMAKE_GENERATOR'"
     CMAKE_ARGS="$CMAKE_ARGS $CFG_LLVM_SRC_DIR"
 
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp
@@ -250,7 +250,7 @@ from_rust(LLVMRustCodeGenOptLevel level)
   }
 }
 
-#if LLVM_RUSTLLVM
+#if LLVM_RUSTLLVM && false
 /// getLongestEntryLength - Return the length of the longest entry in the table.
 ///
 static size_t getLongestEntryLength(ArrayRef<SubtargetFeatureKV> Table) {

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ from_rust(LLVMRustCodeGenOptLevel level)`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`
`253`		`-#if LLVM_RUSTLLVM`
	`253`	`+#if LLVM_RUSTLLVM && false`
`254`	`254`	`/// getLongestEntryLength - Return the length of the longest entry in the table.`
`255`	`255`	`///`
`256`	`256`	`static size_t getLongestEntryLength(ArrayRef<SubtargetFeatureKV> Table) {`