Also remove option static_llvm and add option bindist, which helps simplify building bootstrap tarballs.
28 lines
874 B
Diff
28 lines
874 B
Diff
Reason: Fixes LLVM10
|
|
Upstream: Yes
|
|
From a94fa896cc92d5e0678376cf5aa8b64af0899732 Mon Sep 17 00:00:00 2001
|
|
From: Nikita Popov <nikita.ppv@gmail.com>
|
|
Date: Tue, 4 Feb 2020 20:35:50 +0100
|
|
Subject: [PATCH] Fix timeTraceProfilerInitialize for LLVM 10
|
|
|
|
---
|
|
src/rustllvm/PassWrapper.cpp | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp
|
|
index 90d24d20737db..9e8614e3b6d34 100644
|
|
--- a/src/rustllvm/PassWrapper.cpp
|
|
+++ b/src/rustllvm/PassWrapper.cpp
|
|
@@ -67,7 +67,11 @@ extern "C" void LLVMInitializePasses() {
|
|
}
|
|
|
|
extern "C" void LLVMTimeTraceProfilerInitialize() {
|
|
-#if LLVM_VERSION_GE(9, 0)
|
|
+#if LLVM_VERSION_GE(10, 0)
|
|
+ timeTraceProfilerInitialize(
|
|
+ /* TimeTraceGranularity */ 0,
|
|
+ /* ProcName */ "rustc");
|
|
+#elif LLVM_VERSION_GE(9, 0)
|
|
timeTraceProfilerInitialize();
|
|
#endif
|
|
}
|