diff options
| author | Simonas Kazlauskas <git@kazlauskas.me> | 2016-09-27 19:06:44 +0300 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2016-12-30 15:17:27 +0100 |
| commit | 7a3704c50044a0e9d611a264daeabbf47d398474 (patch) | |
| tree | 15ae27e2975d19e8d7e2b13185ad2149c5c5f23b /src/rustllvm/RustWrapper.cpp | |
| parent | bfa53cfb76e6e23c8f0380132ceef5008add8ccb (diff) | |
| download | rust-7a3704c50044a0e9d611a264daeabbf47d398474.tar.gz rust-7a3704c50044a0e9d611a264daeabbf47d398474.zip | |
Fix rebase fallout
This commit includes manual merge conflict resolution changes from a rebase by @est31.
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index 81093249318..46ba68f0724 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -1456,6 +1456,7 @@ extern "C" LLVMRustLinkage LLVMRustGetLinkage(LLVMValueRef V) { extern "C" void LLVMRustSetLinkage(LLVMValueRef V, LLVMRustLinkage RustLinkage) { LLVMSetLinkage(V, from_rust(RustLinkage)); +} // Returns true if both high and low were successfully set. Fails in case constant wasn’t any of // the common sizes (1, 8, 16, 32, 64, 128 bits) |