Skip to content

Commit 98ce505

Browse files
committed
Rollup merge of #50678 - semarie:openbsd-targets, r=sanxiyn
Update openbsd targets - add a new target `aarch64-unknown-openbsd` - update `i686-unknown-openbsd` to use lld with clang, in order to correctly link binaries with `i128`
2 parents b0d3170 + f430d7c commit 98ce505

File tree

3 files changed

+33
-0
lines changed

3 files changed

+33
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use spec::{LinkerFlavor, Target, TargetResult};
12+
13+
pub fn target() -> TargetResult {
14+
let mut base = super::openbsd_base::opts();
15+
base.max_atomic_width = Some(128);
16+
base.abi_blacklist = super::arm_base::abi_blacklist();
17+
18+
Ok(Target {
19+
llvm_target: "aarch64-unknown-openbsd".to_string(),
20+
target_endian: "little".to_string(),
21+
target_pointer_width: "64".to_string(),
22+
target_c_int_width: "32".to_string(),
23+
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
24+
arch: "aarch64".to_string(),
25+
target_os: "openbsd".to_string(),
26+
target_env: "".to_string(),
27+
target_vendor: "unknown".to_string(),
28+
linker_flavor: LinkerFlavor::Gcc,
29+
options: base,
30+
})
31+
}

src/librustc_target/spec/i686_unknown_openbsd.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pub fn target() -> TargetResult {
1515
base.cpu = "pentium4".to_string();
1616
base.max_atomic_width = Some(64);
1717
base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m32".to_string());
18+
base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-fuse-ld=lld".to_string());
1819
base.stack_probes = true;
1920

2021
Ok(Target {

src/librustc_target/spec/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ supported_targets! {
313313

314314
("x86_64-unknown-bitrig", x86_64_unknown_bitrig),
315315

316+
("aarch64-unknown-openbsd", aarch64_unknown_openbsd),
316317
("i686-unknown-openbsd", i686_unknown_openbsd),
317318
("x86_64-unknown-openbsd", x86_64_unknown_openbsd),
318319

0 commit comments

Comments
 (0)