diff options
| author | bors <bors@rust-lang.org> | 2015-04-30 00:07:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-04-30 00:07:10 +0000 |
| commit | 5449f5d29e175230a1285ebe92394f50c76e1df6 (patch) | |
| tree | c89deb8cc68b46e6fc768e862c32bd3e830a31c3 /src/rustllvm/RustWrapper.cpp | |
| parent | 551a74dddd84cf01440ee84148ebd18bc68bd7c8 (diff) | |
| parent | 1b34c099a6a624947877315875018093587a8834 (diff) | |
| download | rust-5449f5d29e175230a1285ebe92394f50c76e1df6.tar.gz rust-5449f5d29e175230a1285ebe92394f50c76e1df6.zip | |
Auto merge of #24967 - alexcrichton:rollup, r=alexcrichton
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index fe0a7b454c1..375c5fc746c 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -189,8 +189,10 @@ extern "C" LLVMValueRef LLVMBuildAtomicCmpXchg(LLVMBuilderRef B, failure_order )); } -extern "C" LLVMValueRef LLVMBuildAtomicFence(LLVMBuilderRef B, AtomicOrdering order) { - return wrap(unwrap(B)->CreateFence(order)); +extern "C" LLVMValueRef LLVMBuildAtomicFence(LLVMBuilderRef B, + AtomicOrdering order, + SynchronizationScope scope) { + return wrap(unwrap(B)->CreateFence(order, scope)); } extern "C" void LLVMSetDebug(int Enabled) { |