Support ARM and Android
Conflicts: src/libcore/os.rs src/librustc/back/link.rs src/librustc/driver/driver.rs src/librustc/metadata/loader.rs src/librustc/middle/trans/base.rs
This commit is contained in:
committed by
Brian Anderson
parent
27e6a0fa56
commit
987f824f23
@@ -1291,6 +1291,7 @@ pub mod test {
|
||||
#[cfg(target_os="win32")]
|
||||
#[cfg(target_os="darwin")]
|
||||
#[cfg(target_os="linux")]
|
||||
#[cfg(target_os="android")]
|
||||
pub mod tcp_ipv4_server_and_client_test {
|
||||
#[cfg(target_arch="x86_64")]
|
||||
pub mod impl64 {
|
||||
@@ -1329,6 +1330,7 @@ pub mod test {
|
||||
}
|
||||
}
|
||||
#[cfg(target_arch="x86")]
|
||||
#[cfg(target_arch="arm")]
|
||||
pub mod impl32 {
|
||||
use net::tcp::test::*;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user