Skip to content

Commit 745efcc

Browse files
borsbors
committed
Auto merge of #113061 - Amanieu:x86_64-ohos, r=compiler-errors
Add x86_64-unknown-linux-ohos target This complements the existing `aarch64-unknown-linux-ohos` and `armv7-unknown-linux-ohos` targets. This should be covered by the existing MCP (rust-lang/compiler-team#568), but I can also create a new MCP if that is preferred.
2 parents da6b55c + 5d46bd9 commit 745efcc

File tree

8 files changed

+79
-10
lines changed

8 files changed

+79
-10
lines changed

‎compiler/rustc_target/src/spec/aarch64_unknown_linux_ohos.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ use crate::spec::{Target, TargetOptions};
33
use super::SanitizerSet;
44

55
pub fn target() -> Target {
6-
let mut base = super::linux_musl_base::opts();
7-
base.env = "ohos".into();
8-
base.crt_static_default = false;
6+
let mut base = super::linux_ohos_base::opts();
97
base.max_atomic_width = Some(128);
108

119
Target {
@@ -17,8 +15,6 @@ pub fn target() -> Target {
1715
options: TargetOptions {
1816
features: "+reserve-x18".into(),
1917
mcount: "\u{1}_mcount".into(),
20-
force_emulated_tls: true,
21-
has_thread_local: false,
2218
supported_sanitizers: SanitizerSet::ADDRESS
2319
| SanitizerSet::CFI
2420
| SanitizerSet::LEAK

‎compiler/rustc_target/src/spec/armv7_unknown_linux_ohos.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@ pub fn target() -> Target {
1717
abi: "eabi".into(),
1818
features: "+v7,+thumb2,+soft-float,-neon".into(),
1919
max_atomic_width: Some(64),
20-
env: "ohos".into(),
21-
crt_static_default: false,
2220
mcount: "\u{1}mcount".into(),
23-
force_emulated_tls: true,
24-
has_thread_local: false,
25-
..super::linux_musl_base::opts()
21+
..super::linux_ohos_base::opts()
2622
},
2723
}
2824
}

‎compiler/rustc_target/src/spec/linux_ohos_base.rs

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
use crate::spec::TargetOptions;
2+
3+
pub fn opts() -> TargetOptions {
4+
let mut base = super::linux_base::opts();
5+
6+
base.env = "ohos".into();
7+
base.crt_static_default = false;
8+
base.force_emulated_tls = true;
9+
base.has_thread_local = false;
10+
11+
base
12+
}

‎compiler/rustc_target/src/spec/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ mod l4re_base;
7474
mod linux_base;
7575
mod linux_gnu_base;
7676
mod linux_musl_base;
77+
mod linux_ohos_base;
7778
mod linux_uclibc_base;
7879
mod msvc_base;
7980
mod netbsd_base;
@@ -1495,6 +1496,7 @@ supported_targets! {
14951496

14961497
("aarch64-unknown-linux-ohos", aarch64_unknown_linux_ohos),
14971498
("armv7-unknown-linux-ohos", armv7_unknown_linux_ohos),
1499+
("x86_64-unknown-linux-ohos", x86_64_unknown_linux_ohos),
14981500
}
14991501

15001502
/// Cow-Vec-Str: Cow<'static, [Cow<'static, str>]>

‎compiler/rustc_target/src/spec/x86_64_unknown_linux_ohos.rs

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
use crate::spec::{Cc, LinkerFlavor, Lld, SanitizerSet, StackProbeType, Target};
2+
3+
pub fn target() -> Target {
4+
let mut base = super::linux_ohos_base::opts();
5+
base.cpu = "x86-64".into();
6+
base.max_atomic_width = Some(64);
7+
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
8+
base.stack_probes = StackProbeType::X86;
9+
base.static_position_independent_executables = true;
10+
base.supported_sanitizers = SanitizerSet::ADDRESS
11+
| SanitizerSet::CFI
12+
| SanitizerSet::LEAK
13+
| SanitizerSet::MEMORY
14+
| SanitizerSet::THREAD;
15+
base.supports_xray = true;
16+
17+
Target {
18+
// LLVM 15 doesn't support OpenHarmony yet, use a linux target instead.
19+
llvm_target: "x86_64-unknown-linux-musl".into(),
20+
pointer_width: 64,
21+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
22+
.into(),
23+
arch: "x86_64".into(),
24+
options: base,
25+
}
26+
}

‎src/bootstrap/llvm.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1056,6 +1056,9 @@ fn supported_sanitizers(
10561056
"s390x-unknown-linux-musl" => {
10571057
common_libs("linux", "s390x", &["asan", "lsan", "msan", "tsan"])
10581058
}
1059+
"x86_64-unknown-linux-ohos" => {
1060+
common_libs("linux", "x86_64", &["asan", "lsan", "msan", "tsan"])
1061+
}
10591062
_ => Vec::new(),
10601063
}
10611064
}

‎src/doc/rustc/src/platform-support.md

+1
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ target | std | host | notes
329329
`x86_64-unknown-haiku` | ✓ | ✓ | 64-bit Haiku
330330
`x86_64-unknown-hermit` | ✓ | | HermitCore
331331
`x86_64-unknown-l4re-uclibc` | ? | |
332+
[`x86_64-unknown-linux-ohos`](platform-support/openharmony.md) | ✓ | | x86_64 OpenHarmony |
332333
[`x86_64-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | 64-bit OpenBSD
333334
`x86_64-uwp-windows-gnu` | ✓ | |
334335
`x86_64-uwp-windows-msvc` | ✓ | |

‎src/doc/rustc/src/platform-support/openharmony.md

+33
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,28 @@ exec /path/to/ohos-sdk/linux/native/llvm/bin/clang++ \
7171
"$@"
7272
```
7373

74+
`x86_64-unknown-linux-ohos-clang.sh`
75+
76+
```sh
77+
#!/bin/sh
78+
exec /path/to/ohos-sdk/linux/native/llvm/bin/clang \
79+
-target x86_64-linux-ohos \
80+
--sysroot=/path/to/ohos-sdk/linux/native/sysroot \
81+
-D__MUSL__ \
82+
"$@"
83+
```
84+
85+
`x86_64-unknown-linux-ohos-clang++.sh`
86+
87+
```sh
88+
#!/bin/sh
89+
exec /path/to/ohos-sdk/linux/native/llvm/bin/clang++ \
90+
-target x86_64-linux-ohos \
91+
--sysroot=/path/to/ohos-sdk/linux/native/sysroot \
92+
-D__MUSL__ \
93+
"$@"
94+
```
95+
7496
Future versions of the OpenHarmony SDK will avoid the need for this process.
7597

7698
## Building the target
@@ -98,6 +120,13 @@ cxx = "/path/to/armv7-unknown-linux-ohos-clang++.sh"
98120
ar = "/path/to/ohos-sdk/linux/native/llvm/bin/llvm-ar"
99121
ranlib = "/path/to/ohos-sdk/linux/native/llvm/bin/llvm-ranlib"
100122
linker = "/path/to/armv7-unknown-linux-ohos-clang.sh"
123+
124+
[target.x86_64-unknown-linux-ohos]
125+
cc = "/path/to/x86_64-unknown-linux-ohos-clang.sh"
126+
cxx = "/path/to/x86_64-unknown-linux-ohos-clang++.sh"
127+
ar = "/path/to/ohos-sdk/linux/native/llvm/bin/llvm-ar"
128+
ranlib = "/path/to/ohos-sdk/linux/native/llvm/bin/llvm-ranlib"
129+
linker = "/path/to/x86_64-unknown-linux-ohos-clang.sh"
101130
```
102131

103132
## Building Rust programs
@@ -116,6 +145,10 @@ linker = "/path/to/aarch64-unknown-linux-ohos-clang.sh"
116145
[target.armv7-unknown-linux-ohos]
117146
ar = "/path/to/ohos-sdk/linux/native/llvm/bin/llvm-ar"
118147
linker = "/path/to/armv7-unknown-linux-ohos-clang.sh"
148+
149+
[target.x86_64-unknown-linux-ohos]
150+
ar = "/path/to/ohos-sdk/linux/native/llvm/bin/llvm-ar"
151+
linker = "/path/to/x86_64-unknown-linux-ohos-clang.sh"
119152
```
120153

121154
## Testing

0 commit comments

Comments
 (0)