bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Fix rebase fallout

Browse source 
This commit includes manual merge conflict resolution changes from a rebase by @est31.
This commit is contained in:
Simonas Kazlauskas 2016-09-27 19:06:44 +03:00 • committed by est31
parent bfa53cfb76
commit 7a3704c500
13 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/rustllvm/RustWrapper.cpp
View file

@ -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)