This commit is contained in:
Folkert 2023-05-17 23:04:27 +02:00
parent c24312a045
commit 8833096a07
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
2 changed files with 3 additions and 5 deletions

View file

@ -120,8 +120,7 @@ fn main() -> io::Result<()> {
let input_path = matches.get_one::<PathBuf>(ROC_FILE).unwrap();
let target = matches
.get_one::<String>(FLAG_TARGET)
.map(|s| Target::from_str(s).ok())
.flatten()
.and_then(|s| Target::from_str(s).ok())
.unwrap_or_default();
roc_linker::generate_stub_lib(
input_path,
@ -132,8 +131,7 @@ fn main() -> io::Result<()> {
Some((CMD_BUILD, matches)) => {
let target = matches
.get_one::<String>(FLAG_TARGET)
.map(|s| Target::from_str(s).ok())
.flatten()
.and_then(|s| Target::from_str(s).ok())
.unwrap_or_default();
let link_type = match (matches.get_flag(FLAG_LIB), matches.get_flag(FLAG_NO_LINK)) {
(true, false) => LinkType::Dylib,

View file

@ -3430,7 +3430,7 @@ impl<
) {
let base_offset = storage_manager.claim_stack_area(&dst, 24);
ASM::mov_reg64_mem64_offset32(buf, tmp_reg, ptr_reg, offset + 0);
ASM::mov_reg64_mem64_offset32(buf, tmp_reg, ptr_reg, offset);
ASM::mov_base32_reg64(buf, base_offset, tmp_reg);
ASM::mov_reg64_mem64_offset32(buf, tmp_reg, ptr_reg, offset + 8);