Skip to content

Commit 403e672

Browse files
authored
Merge pull request #1 from Wind-River/vxworks_bpang_static
update for vxWorks
2 parents 60960a2 + f161efa commit 403e672

18 files changed

+25
-202
lines changed

src/bootstrap/cc_detect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fn cc2ar(cc: &Path, target: &str) -> Option<PathBuf> {
4646
} else if target.contains("openbsd") {
4747
Some(PathBuf::from("ar"))
4848
} else if target.contains("vxworks") {
49-
Some(PathBuf::from("vx-ar"))
49+
Some(PathBuf::from("wr-ar"))
5050
} else {
5151
let parent = cc.parent().unwrap();
5252
let file = cc.file_name().unwrap().to_str().unwrap();

src/librustc_target/spec/aarch64_wrs_vxworks.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@ pub fn target() -> TargetResult {
99
target_endian: "little".to_string(),
1010
target_pointer_width: "64".to_string(),
1111
target_c_int_width: "32".to_string(),
12-
target_env: "gnu".to_string(),
1312
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1413
arch: "aarch64".to_string(),
1514
target_os: "vxworks".to_string(),
16-
target_vendor: "unknown".to_string(),
15+
target_env: "gnu".to_string(),
16+
target_vendor: "wrs".to_string(),
1717
linker_flavor: LinkerFlavor::Gcc,
1818
options: TargetOptions {
1919
abi_blacklist: super::arm_base::abi_blacklist(),
20-
target_mcount: "\u{1}_mcount".to_string(),
2120
.. base
2221
},
2322
})

src/librustc_target/spec/arm_wrs_vxworks_sf.rs

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/librustc_target/spec/armv7_wrs_vxworks.rs

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/librustc_target/spec/arm_wrs_vxworks.rs renamed to src/librustc_target/spec/armv7_wrs_vxworks_eabihf.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
22

3-
// This target is for glibc Linux on ARMv7 without NEON or
4-
// thumb-mode. See the thumbv7neon variant for enabling both.
5-
63
pub fn target() -> TargetResult {
74
let base = super::vxworks_base::opts();
85
Ok(Target {
@@ -14,17 +11,14 @@ pub fn target() -> TargetResult {
1411
arch: "arm".to_string(),
1512
target_os: "vxworks".to_string(),
1613
target_env: "gnu".to_string(),
17-
target_vendor: "unknown".to_string(),
14+
target_vendor: "wrs".to_string(),
1815
linker_flavor: LinkerFlavor::Gcc,
19-
2016
options: TargetOptions {
2117
// Info about features at https://wiki.debian.org/ArmHardFloatPort
2218
features: "+v7,+vfp3,-d32,+thumb2,-neon".to_string(),
2319
cpu: "generic".to_string(),
2420
max_atomic_width: Some(64),
2521
abi_blacklist: super::arm_base::abi_blacklist(),
26-
target_mcount: "\u{1}__gnu_mcount_nc".to_string(),
27-
position_independent_executables: false,
2822
.. base
2923
}
3024
})

src/librustc_target/spec/i586_wrs_vxworks.rs

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/librustc_target/spec/i686_wrs_vxworks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn target() -> TargetResult {
1616
arch: "x86".to_string(),
1717
target_os: "vxworks".to_string(),
1818
target_env: "gnu".to_string(),
19-
target_vendor: "unknown".to_string(),
19+
target_vendor: "wrs".to_string(),
2020
linker_flavor: LinkerFlavor::Gcc,
2121
options: base,
2222
})

src/librustc_target/spec/i686_wrs_vxworks_gnu.rs

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/librustc_target/spec/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -485,10 +485,9 @@ supported_targets! {
485485

486486
("nvptx64-nvidia-cuda", nvptx64_nvidia_cuda),
487487

488-
("x86_64-wrs-vxworks", x86_64_wrs_vxworks),
489488
("i686-wrs-vxworks", i686_wrs_vxworks),
490-
("i586-wrs-vxworks", i586_wrs_vxworks),
491-
("armv7-wrs-vxworks", armv7_wrs_vxworks),
489+
("x86_64-wrs-vxworks", x86_64_wrs_vxworks),
490+
("armv7-wrs-vxworks-eabihf", armv7_wrs_vxworks_eabihf),
492491
("aarch64-wrs-vxworks", aarch64_wrs_vxworks),
493492
("powerpc-wrs-vxworks", powerpc_wrs_vxworks),
494493
("powerpc-wrs-vxworks-spe", powerpc_wrs_vxworks_spe),

src/librustc_target/spec/powerpc64_wrs_vxworks.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ pub fn target() -> TargetResult {
1515
arch: "powerpc64".to_string(),
1616
target_os: "vxworks".to_string(),
1717
target_env: "gnu".to_string(),
18-
target_vendor: "unknown".to_string(),
18+
target_vendor: "wrs".to_string(),
1919
linker_flavor: LinkerFlavor::Gcc,
2020
options: TargetOptions {
21-
target_mcount: "_mcount".to_string(),
2221
.. base
2322
},
2423
})

0 commit comments

Comments
 (0)