Skip to content

Commit

Permalink
return TargetResult
Browse files Browse the repository at this point in the history
  • Loading branch information
Jorge Aparicio committed Jul 30, 2016
1 parent 87fa075 commit eb61738
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions src/librustc_back/target/arm_unknown_linux_musleabi.rs
Expand Up @@ -8,16 +8,16 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

use target::Target;
use target::{Target, TargetResult};

pub fn target() -> Target {
pub fn target() -> TargetResult {
let mut base = super::linux_musl_base::opts();

// Most of these settings are copied from the arm_unknown_linux_gnueabi
// target.
base.features = "+v6".to_string();
base.max_atomic_width = 64;
Target {
Ok(Target {
// It's important we use "gnueabi" and not "musleabi" here. LLVM uses it
// to determine the calling convention and float ABI, and it doesn't
// support the "musleabi" value.
Expand All @@ -30,5 +30,5 @@ pub fn target() -> Target {
target_env: "musl".to_string(),
target_vendor: "unknown".to_string(),
options: base,
}
})
}
8 changes: 4 additions & 4 deletions src/librustc_back/target/arm_unknown_linux_musleabihf.rs
Expand Up @@ -8,16 +8,16 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

use target::Target;
use target::{Target, TargetResult};

pub fn target() -> Target {
pub fn target() -> TargetResult {
let mut base = super::linux_musl_base::opts();

// Most of these settings are copied from the arm_unknown_linux_gnueabihf
// target.
base.features = "+v6,+vfp2".to_string();
base.max_atomic_width = 64;
Target {
Ok(Target {
// It's important we use "gnueabihf" and not "musleabihf" here. LLVM
// uses it to determine the calling convention and float ABI, and it
// doesn't support the "musleabihf" value.
Expand All @@ -30,5 +30,5 @@ pub fn target() -> Target {
target_env: "musl".to_string(),
target_vendor: "unknown".to_string(),
options: base,
}
})
}
8 changes: 4 additions & 4 deletions src/librustc_back/target/armv7_unknown_linux_musleabihf.rs
Expand Up @@ -8,17 +8,17 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

use target::Target;
use target::{Target, TargetResult};

pub fn target() -> Target {
pub fn target() -> TargetResult {
let mut base = super::linux_musl_base::opts();

// Most of these settings are copied from the armv7_unknown_linux_gnueabihf
// target.
base.features = "+v7,+vfp3,+neon".to_string();
base.cpu = "cortex-a8".to_string();
base.max_atomic_width = 64;
Target {
Ok(Target {
// It's important we use "gnueabihf" and not "musleabihf" here. LLVM
// uses it to determine the calling convention and float ABI, and LLVM
// doesn't support the "musleabihf" value.
Expand All @@ -31,5 +31,5 @@ pub fn target() -> Target {
target_env: "musl".to_string(),
target_vendor: "unknown".to_string(),
options: base,
}
})
}

0 comments on commit eb61738

Please sign in to comment.