diff options
| author | bors <bors@rust-lang.org> | 2015-01-03 20:20:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-03 20:20:48 +0000 |
| commit | 496dc4eae7de9d14cd49511a9acfbf5f11ae6c3f (patch) | |
| tree | 0b4dfc99ed7c3f80a5748aca27b4bcd9a1899da1 /src/libstd/sys/unix/stack_overflow.rs | |
| parent | fe7e285d0cbae8e44c3853a6965caf2b575dcfcc (diff) | |
| parent | 6e5fb8bd1bef7a36c32194b35ec16d0365adbcf1 (diff) | |
| download | rust-496dc4eae7de9d14cd49511a9acfbf5f11ae6c3f.tar.gz rust-496dc4eae7de9d14cd49511a9acfbf5f11ae6c3f.zip | |
auto merge of #19790 : akiss77/rust/aarch64-configure, r=alexcrichton
Preparing AArch64 support, starting work at the build system.
Diffstat (limited to 'src/libstd/sys/unix/stack_overflow.rs')
| -rw-r--r-- | src/libstd/sys/unix/stack_overflow.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/stack_overflow.rs b/src/libstd/sys/unix/stack_overflow.rs index 95ab9b459d6..1fd619a28db 100644 --- a/src/libstd/sys/unix/stack_overflow.rs +++ b/src/libstd/sys/unix/stack_overflow.rs @@ -1,4 +1,4 @@ -// Copyright 2014 The Rust Project Developers. See the COPYRIGHT +// Copyright 2014-2015 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -147,6 +147,7 @@ mod imp { #[cfg(any(all(target_os = "linux", target_arch = "x86"), // may not match all(target_os = "linux", target_arch = "x86_64"), all(target_os = "linux", target_arch = "arm"), // may not match + all(target_os = "linux", target_arch = "aarch64"), all(target_os = "linux", target_arch = "mips"), // may not match all(target_os = "linux", target_arch = "mipsel"), // may not match target_os = "android"))] // may not match |