about summary refs log tree commit diff
path: root/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-01-16 03:10:52 +0000
committerbors <bors@rust-lang.org>2021-01-16 03:10:52 +0000
commit635ccfe01c0be19d9fb0a99facbd9e06290f0ab1 (patch)
tree278f5200156f523b626bea00183518235a0b9074 /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
parent6c869d34ae2d87d21db9892d4dc088639bcbe041 (diff)
parentcd2580722375671fa2967661f65b7b33570547ec (diff)
downloadrust-635ccfe01c0be19d9fb0a99facbd9e06290f0ab1.tar.gz
rust-635ccfe01c0be19d9fb0a99facbd9e06290f0ab1.zip
Auto merge of #77885 - erikdesjardins:probeasm, r=cuviper
Use probe-stack=inline-asm in LLVM 11+

Fixes (?) #74405, related to #43241

r? `@cuviper`
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp')
-rw-r--r--compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
index 1d6f00562f1..1d89fc80496 100644
--- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
+++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
@@ -660,6 +660,8 @@ extern "C" uint32_t LLVMRustDebugMetadataVersion() {
   return DEBUG_METADATA_VERSION;
 }
 
+extern "C" uint32_t LLVMRustVersionPatch() { return LLVM_VERSION_PATCH; }
+
 extern "C" uint32_t LLVMRustVersionMinor() { return LLVM_VERSION_MINOR; }
 
 extern "C" uint32_t LLVMRustVersionMajor() { return LLVM_VERSION_MAJOR; }