diff options
| author | Jonathan Turner <jonathandturner@users.noreply.github.com> | 2016-09-28 10:33:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-28 10:33:58 -0700 |
| commit | ac82eaaafef1a85c266acfcf659fe62405f1c99f (patch) | |
| tree | 823929be225173c6097baa10f2cf2e15015151b0 | |
| parent | 46746012e7521f90a19a6a642b29cfb84b1e8650 (diff) | |
| parent | 3a276471f69a70b804359a4df2289e79061218dc (diff) | |
| download | rust-ac82eaaafef1a85c266acfcf659fe62405f1c99f.tar.gz rust-ac82eaaafef1a85c266acfcf659fe62405f1c99f.zip | |
Rollup merge of #36796 - TimNN:mips64-data-layout, r=japaric
update mips64* data-layout I tried to compile some (`#![no_core]`) code for the `mips64` targets on the latest nightly and got ICE's about mismatched data layouts. I updated the data layouts to match the listed llvm defaults. cc @japaric Funnily enough, this seems to be the exact reverse of what @japaric did in 2222d437a75dec627a21c0b68b32bee080fa1f5a as part of #36024.
| -rw-r--r-- | src/librustc_back/target/mips64_unknown_linux_gnuabi64.rs | 2 | ||||
| -rw-r--r-- | src/librustc_back/target/mips64el_unknown_linux_gnuabi64.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_back/target/mips64_unknown_linux_gnuabi64.rs b/src/librustc_back/target/mips64_unknown_linux_gnuabi64.rs index 83785634428..7e45b320653 100644 --- a/src/librustc_back/target/mips64_unknown_linux_gnuabi64.rs +++ b/src/librustc_back/target/mips64_unknown_linux_gnuabi64.rs @@ -15,7 +15,7 @@ pub fn target() -> TargetResult { llvm_target: "mips64-unknown-linux-gnuabi64".to_string(), target_endian: "big".to_string(), target_pointer_width: "64".to_string(), - data_layout: "E-m:m-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(), + data_layout: "E-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(), arch: "mips64".to_string(), target_os: "linux".to_string(), target_env: "gnu".to_string(), diff --git a/src/librustc_back/target/mips64el_unknown_linux_gnuabi64.rs b/src/librustc_back/target/mips64el_unknown_linux_gnuabi64.rs index e1340e8e127..338a5da1e1d 100644 --- a/src/librustc_back/target/mips64el_unknown_linux_gnuabi64.rs +++ b/src/librustc_back/target/mips64el_unknown_linux_gnuabi64.rs @@ -15,7 +15,7 @@ pub fn target() -> TargetResult { llvm_target: "mips64el-unknown-linux-gnuabi64".to_string(), target_endian: "little".to_string(), target_pointer_width: "64".to_string(), - data_layout: "e-m:m-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(), + data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(), arch: "mips64".to_string(), target_os: "linux".to_string(), target_env: "gnu".to_string(), |