Skip to content

Commit eee815b

Browse files
committed
---
yaml --- r: 173273 b: refs/heads/snap-stage3 c: c8442af h: refs/heads/master i: 173271: 5567710 v: v3
1 parent 8c7f8f3 commit eee815b

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 896cb36ecab3eaeb7f101087e030e43771eca5ca
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: e5bbe8244b8e8efefa26df4287f22fa3f059bd1c
4+
refs/heads/snap-stage3: c8442afeb066656c4f4db3ca8538ee5976b504f6
55
refs/heads/try: 957472483d3a2f43c0e4f7c2056280a1022af93c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/libcoretest/mem.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ fn size_of_basic() {
2222
#[cfg(any(target_arch = "x86",
2323
target_arch = "arm",
2424
target_arch = "mips",
25-
target_arch = "mipsel"))]
25+
target_arch = "mipsel",
26+
target_arch = "powerpc"))]
2627
fn size_of_32() {
2728
assert_eq!(size_of::<uint>(), 4u);
2829
assert_eq!(size_of::<*const uint>(), 4u);
@@ -55,7 +56,8 @@ fn align_of_basic() {
5556
#[cfg(any(target_arch = "x86",
5657
target_arch = "arm",
5758
target_arch = "mips",
58-
target_arch = "mipsel"))]
59+
target_arch = "mipsel",
60+
target_arch = "powerpc"))]
5961
fn align_of_32() {
6062
assert_eq!(align_of::<uint>(), 4u);
6163
assert_eq!(align_of::<*const uint>(), 4u);

branches/snap-stage3/src/librustc_back/target/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ mod i686_unknown_dragonfly;
7272
mod i686_unknown_linux_gnu;
7373
mod mips_unknown_linux_gnu;
7474
mod mipsel_unknown_linux_gnu;
75+
mod powerpc_unknown_linux_gnu;
7576
mod x86_64_apple_darwin;
7677
mod x86_64_apple_ios;
7778
mod x86_64_pc_windows_gnu;
@@ -95,7 +96,7 @@ pub struct Target {
9596
/// OS name to use for conditional compilation.
9697
pub target_os: String,
9798
/// Architecture to use for ABI considerations. Valid options: "x86", "x86_64", "arm",
98-
/// "aarch64", and "mips". "mips" includes "mipsel".
99+
/// "aarch64", "mips", and "powerpc". "mips" includes "mipsel".
99100
pub arch: String,
100101
/// Optional settings with defaults.
101102
pub options: TargetOptions,
@@ -339,6 +340,7 @@ impl Target {
339340
i686_unknown_linux_gnu,
340341
mips_unknown_linux_gnu,
341342
mipsel_unknown_linux_gnu,
343+
powerpc_unknown_linux_gnu,
342344
arm_linux_androideabi,
343345
arm_unknown_linux_gnueabi,
344346
arm_unknown_linux_gnueabihf,

0 commit comments

Comments
 (0)