diff options
| author | Jorge Aparicio <japaricious@gmail.com> | 2016-01-30 03:28:37 -0500 |
|---|---|---|
| committer | Jorge Aparicio <japaricious@gmail.com> | 2016-01-30 14:44:40 -0500 |
| commit | 64ac041b1fb767982762ffca568a9fc3a81fcfbc (patch) | |
| tree | c9bb8d84e21cefc4b94703fac11fc982fdb92ece | |
| parent | 146dfce803e85844cd14bb6967594efae4dcdb13 (diff) | |
| download | rust-64ac041b1fb767982762ffca568a9fc3a81fcfbc.tar.gz rust-64ac041b1fb767982762ffca568a9fc3a81fcfbc.zip | |
rustc: set MIPS cpu/features in the compiler
cf #31303
| -rw-r--r-- | mk/cfg/mips-unknown-linux-musl.mk | 2 | ||||
| -rw-r--r-- | mk/cfg/mipsel-unknown-linux-musl.mk | 2 | ||||
| -rw-r--r-- | src/librustc_back/target/mips_unknown_linux_musl.rs | 8 | ||||
| -rw-r--r-- | src/librustc_back/target/mipsel_unknown_linux_musl.rs | 9 |
4 files changed, 14 insertions, 7 deletions
diff --git a/mk/cfg/mips-unknown-linux-musl.mk b/mk/cfg/mips-unknown-linux-musl.mk index e9a6891a1b2..33528b986f6 100644 --- a/mk/cfg/mips-unknown-linux-musl.mk +++ b/mk/cfg/mips-unknown-linux-musl.mk @@ -20,5 +20,5 @@ CFG_UNIXY_mips-unknown-linux-musl := 1 CFG_LDPATH_mips-unknown-linux-musl := CFG_RUN_mips-unknown-linux-musl= CFG_RUN_TARG_mips-unknown-linux-musl= -RUSTC_FLAGS_mips-unknown-linux-musl := -C target-cpu=mips32r2 -C target-feature="+mips32r2" -C soft-float +RUSTC_FLAGS_mips-unknown-linux-musl := CFG_GNU_TRIPLE_mips-unknown-linux-musl := mips-unknown-linux-musl diff --git a/mk/cfg/mipsel-unknown-linux-musl.mk b/mk/cfg/mipsel-unknown-linux-musl.mk index 659c71596d3..db836b81c5f 100644 --- a/mk/cfg/mipsel-unknown-linux-musl.mk +++ b/mk/cfg/mipsel-unknown-linux-musl.mk @@ -20,5 +20,5 @@ CFG_UNIXY_mipsel-unknown-linux-musl := 1 CFG_LDPATH_mipsel-unknown-linux-musl := CFG_RUN_mipsel-unknown-linux-musl= CFG_RUN_TARG_mipsel-unknown-linux-musl= -RUSTC_FLAGS_mipsel-unknown-linux-musl := -C target-cpu=mips32 -C target-feature="+mips32" +RUSTC_FLAGS_mipsel-unknown-linux-musl := CFG_GNU_TRIPLE_mipsel-unknown-linux-musl := mipsel-unknown-linux-musl diff --git a/src/librustc_back/target/mips_unknown_linux_musl.rs b/src/librustc_back/target/mips_unknown_linux_musl.rs index 21be075af8e..050fb91aa19 100644 --- a/src/librustc_back/target/mips_unknown_linux_musl.rs +++ b/src/librustc_back/target/mips_unknown_linux_musl.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use target::Target; +use target::{Target, TargetOptions}; pub fn target() -> Target { Target { @@ -19,6 +19,10 @@ pub fn target() -> Target { target_os: "linux".to_string(), target_env: "musl".to_string(), target_vendor: "unknown".to_string(), - options: super::linux_base::opts() + options: TargetOptions { + cpu: "mips32r2".to_string(), + features: "+mips32r2,+soft-float".to_string(), + ..super::linux_base::opts() + } } } diff --git a/src/librustc_back/target/mipsel_unknown_linux_musl.rs b/src/librustc_back/target/mipsel_unknown_linux_musl.rs index 11c9caf9037..383a0d891ca 100644 --- a/src/librustc_back/target/mipsel_unknown_linux_musl.rs +++ b/src/librustc_back/target/mipsel_unknown_linux_musl.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use target::Target; +use target::{Target, TargetOptions}; pub fn target() -> Target { Target { @@ -19,7 +19,10 @@ pub fn target() -> Target { target_os: "linux".to_string(), target_env: "musl".to_string(), target_vendor: "unknown".to_string(), - - options: super::linux_base::opts() + options: TargetOptions { + cpu: "mips32".to_string(), + features: "+mips32".to_string(), + ..super::linux_base::opts() + } } } |