diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2015-04-30 22:30:50 +1200 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2015-04-30 22:30:50 +1200 |
| commit | b2ddd937b20d8fc26132cb7ec665784422d92926 (patch) | |
| tree | cf257df60ded1b45616d797b8feb71178cab0142 /src/rustllvm/RustWrapper.cpp | |
| parent | c0a42aecbc85298fb6351253c4cd1824567b7a42 (diff) | |
| parent | f0bd14f7b15b978f8bf32bb368f63faa0f26c02e (diff) | |
| download | rust-b2ddd937b20d8fc26132cb7ec665784422d92926.tar.gz rust-b2ddd937b20d8fc26132cb7ec665784422d92926.zip | |
Merge branch 'master' into mulit-decor
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) { |