Skip to content

Commit 815ff51

Browse files
committed
Rollup merge of rust-lang#48484 - glaubitz:powerpcspe-linux, r=alexcrichton
Add support for powerpc-unknown-linux-gnuspe This PR adds support for the embedded PowerPC variant "e500". On Linux, this architecture is usually called "powerpcspe", it is a 32-bit PowerPC architecture. The main difference between normal 32-bit PowerPC and PowerPCSPE is the lack of Altivec instructions and the additional SPE instruction set. This architecture is supported in Debian through an unofficial port.
2 parents 2b6cc53 + 9bbacca commit 815ff51

File tree

5 files changed

+40
-0
lines changed

5 files changed

+40
-0
lines changed

src/bootstrap/native.rs

+1
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,7 @@ impl Step for Openssl {
480480
"mips64el-unknown-linux-gnuabi64" => "linux64-mips64",
481481
"mipsel-unknown-linux-gnu" => "linux-mips32",
482482
"powerpc-unknown-linux-gnu" => "linux-ppc",
483+
"powerpc-unknown-linux-gnuspe" => "linux-ppc",
483484
"powerpc64-unknown-linux-gnu" => "linux-ppc64",
484485
"powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
485486
"s390x-unknown-linux-gnu" => "linux64-s390x",

src/librustc_back/target/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ supported_targets! {
143143
("mips64el-unknown-linux-gnuabi64", mips64el_unknown_linux_gnuabi64),
144144
("mipsel-unknown-linux-gnu", mipsel_unknown_linux_gnu),
145145
("powerpc-unknown-linux-gnu", powerpc_unknown_linux_gnu),
146+
("powerpc-unknown-linux-gnuspe", powerpc_unknown_linux_gnuspe),
146147
("powerpc64-unknown-linux-gnu", powerpc64_unknown_linux_gnu),
147148
("powerpc64le-unknown-linux-gnu", powerpc64le_unknown_linux_gnu),
148149
("s390x-unknown-linux-gnu", s390x_unknown_linux_gnu),
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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 LinkerFlavor;
12+
use target::{Target, TargetResult};
13+
14+
pub fn target() -> TargetResult {
15+
let mut base = super::linux_base::opts();
16+
base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-mspe".to_string());
17+
base.max_atomic_width = Some(32);
18+
19+
// see #36994
20+
base.exe_allocation_crate = None;
21+
22+
Ok(Target {
23+
llvm_target: "powerpc-unknown-linux-gnuspe".to_string(),
24+
target_endian: "big".to_string(),
25+
target_pointer_width: "32".to_string(),
26+
target_c_int_width: "32".to_string(),
27+
data_layout: "E-m:e-p:32:32-i64:64-n32".to_string(),
28+
arch: "powerpc".to_string(),
29+
target_os: "linux".to_string(),
30+
target_env: "gnu".to_string(),
31+
target_vendor: "unknown".to_string(),
32+
linker_flavor: LinkerFlavor::Gcc,
33+
options: base,
34+
})
35+
}

src/test/run-make/atomic-lock-free/Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ endif
3232
ifeq ($(filter powerpc,$(LLVM_COMPONENTS)),powerpc)
3333
$(RUSTC) --target=powerpc-unknown-linux-gnu atomic_lock_free.rs
3434
nm "$(TMPDIR)/libatomic_lock_free.rlib" | $(CGREP) -v __atomic_fetch_add
35+
$(RUSTC) --target=powerpc-unknown-linux-gnuspe atomic_lock_free.rs
36+
nm "$(TMPDIR)/libatomic_lock_free.rlib" | $(CGREP) -v __atomic_fetch_add
3537
$(RUSTC) --target=powerpc64-unknown-linux-gnu atomic_lock_free.rs
3638
nm "$(TMPDIR)/libatomic_lock_free.rlib" | $(CGREP) -v __atomic_fetch_add
3739
$(RUSTC) --target=powerpc64le-unknown-linux-gnu atomic_lock_free.rs

src/tools/build-manifest/src/main.rs

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ static TARGETS: &'static [&'static str] = &[
8383
"mipsel-unknown-linux-gnu",
8484
"mipsel-unknown-linux-musl",
8585
"powerpc-unknown-linux-gnu",
86+
"powerpc-unknown-linux-gnuspe",
8687
"powerpc64-unknown-linux-gnu",
8788
"powerpc64le-unknown-linux-gnu",
8889
"s390x-unknown-linux-gnu",

0 commit comments

Comments
 (0)