Skip to content

Commit ac82eaa

Browse files
author
Jonathan Turner
authored
Rollup merge of rust-lang#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 2222d43 as part of rust-lang#36024.
2 parents 4674601 + 3a27647 commit ac82eaa

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/librustc_back/target/mips64_unknown_linux_gnuabi64.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub fn target() -> TargetResult {
1515
llvm_target: "mips64-unknown-linux-gnuabi64".to_string(),
1616
target_endian: "big".to_string(),
1717
target_pointer_width: "64".to_string(),
18-
data_layout: "E-m:m-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(),
18+
data_layout: "E-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(),
1919
arch: "mips64".to_string(),
2020
target_os: "linux".to_string(),
2121
target_env: "gnu".to_string(),

src/librustc_back/target/mips64el_unknown_linux_gnuabi64.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub fn target() -> TargetResult {
1515
llvm_target: "mips64el-unknown-linux-gnuabi64".to_string(),
1616
target_endian: "little".to_string(),
1717
target_pointer_width: "64".to_string(),
18-
data_layout: "e-m:m-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(),
18+
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(),
1919
arch: "mips64".to_string(),
2020
target_os: "linux".to_string(),
2121
target_env: "gnu".to_string(),

0 commit comments

Comments
 (0)