Skip to content

Commit 2a94ec6

Browse files
committed
---
yaml --- r: 173731 b: refs/heads/auto c: a2e3993 h: refs/heads/master i: 173729: ee1ac1d 173727: b797a8a v: v3
1 parent baf18f8 commit 2a94ec6

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: c055d995261203f9869399120a4174824481a305
13+
refs/heads/auto: a2e3993111d40308bc492c5683a08ecd335dbe95
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/os.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,6 +1422,11 @@ mod arch_consts {
14221422
pub const ARCH: &'static str = "mipsel";
14231423
}
14241424

1425+
#[cfg(target_arch = "powerpc")]
1426+
mod arch_consts {
1427+
pub const ARCH: &'static str = "powerpc";
1428+
}
1429+
14251430
#[cfg(test)]
14261431
mod tests {
14271432
use prelude::v1::*;

branches/auto/src/libstd/rand/os.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ mod imp {
3232
any(target_arch = "x86_64",
3333
target_arch = "x86",
3434
target_arch = "arm",
35-
target_arch = "aarch64")))]
35+
target_arch = "aarch64",
36+
target_arch = "powerpc")))]
3637
fn getrandom(buf: &mut [u8]) -> libc::c_long {
3738
extern "C" {
3839
fn syscall(number: libc::c_long, ...) -> libc::c_long;
@@ -44,6 +45,8 @@ mod imp {
4445
const NR_GETRANDOM: libc::c_long = 355;
4546
#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
4647
const NR_GETRANDOM: libc::c_long = 384;
48+
#[cfg(target_arch = "powerpc")]
49+
const NR_GETRANDOM: libc::c_long = 384;
4750

4851
unsafe {
4952
syscall(NR_GETRANDOM, buf.as_mut_ptr(), buf.len(), 0u)
@@ -54,7 +57,8 @@ mod imp {
5457
any(target_arch = "x86_64",
5558
target_arch = "x86",
5659
target_arch = "arm",
57-
target_arch = "aarch64"))))]
60+
target_arch = "aarch64",
61+
target_arch = "powerpc"))))]
5862
fn getrandom(_buf: &mut [u8]) -> libc::c_long { -1 }
5963

6064
fn getrandom_fill_bytes(v: &mut [u8]) {
@@ -91,7 +95,8 @@ mod imp {
9195
any(target_arch = "x86_64",
9296
target_arch = "x86",
9397
target_arch = "arm",
94-
target_arch = "aarch64")))]
98+
target_arch = "aarch64",
99+
target_arch = "powerpc")))]
95100
fn is_getrandom_available() -> bool {
96101
use sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
97102

@@ -119,7 +124,8 @@ mod imp {
119124
any(target_arch = "x86_64",
120125
target_arch = "x86",
121126
target_arch = "arm",
122-
target_arch = "aarch64"))))]
127+
target_arch = "aarch64",
128+
target_arch = "powerpc"))))]
123129
fn is_getrandom_available() -> bool { false }
124130

125131
/// A random number generator that retrieves randomness straight from

0 commit comments

Comments
 (0)