From d59930db47114bf440c9a898b98075b5552a3980 Mon Sep 17 00:00:00 2001 From: Noah <33094578+coolreader18@users.noreply.github.com> Date: Thu, 16 Jul 2020 19:57:55 -0500 Subject: [PATCH] Remove redundant patch --- packages/rust/PassWrapper.cpp.patch | 15 --------------- packages/rust/RustWrapper.cpp.patch | 17 ----------------- 2 files changed, 32 deletions(-) delete mode 100644 packages/rust/PassWrapper.cpp.patch delete mode 100644 packages/rust/RustWrapper.cpp.patch diff --git a/packages/rust/PassWrapper.cpp.patch b/packages/rust/PassWrapper.cpp.patch deleted file mode 100644 index 57bc2d9c5..000000000 --- a/packages/rust/PassWrapper.cpp.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ./src/rustllvm/PassWrapper.cpp.orig 2020-05-08 10:36:00.588540136 +0000 -+++ ./src/rustllvm/PassWrapper.cpp 2020-05-08 10:36:07.988661914 +0000 -@@ -67,7 +67,11 @@ - } - - 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 - } diff --git a/packages/rust/RustWrapper.cpp.patch b/packages/rust/RustWrapper.cpp.patch deleted file mode 100644 index 4f79d4ec7..000000000 --- a/packages/rust/RustWrapper.cpp.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ./src/rustllvm/RustWrapper.cpp.orig 2020-05-08 10:35:50.338371466 +0000 -+++ ./src/rustllvm/RustWrapper.cpp 2020-05-08 10:36:14.268765241 +0000 -@@ -1328,8 +1328,13 @@ - LLVMValueRef Dst, unsigned DstAlign, - LLVMValueRef Val, - LLVMValueRef Size, bool IsVolatile) { -+#if LLVM_VERSION_GE(10, 0) - return wrap(unwrap(B)->CreateMemSet( -- unwrap(Dst), unwrap(Val), unwrap(Size), DstAlign, IsVolatile)); -+ unwrap(Dst), unwrap(Val), unwrap(Size), MaybeAlign(DstAlign), IsVolatile)); -+#else -+ return wrap(unwrap(B)->CreateMemSet( return wrap(unwrap(B)->CreateMemSet( -+ unwrap(Dst), unwrap(Val), unwrap(Size), DstAlign, IsVolatile)); unwrap(Dst), unwrap(Val), unwrap(Size), DstAlign, IsVolatile)); -+#endif - } - - extern "C" LLVMValueRef