mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update data layout for wasm32 targets

Browse source 
New address spaces were added in https://reviews.llvm.org/D111154.
This commit is contained in:
Nikita Popov 2022-02-02 10:16:48 +01:00 • committed by Nikita Popov
parent a380581ff8
commit 70ddd2ff1c
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_codegen_llvm/src/context.rs
View file

@ -154,6 +154,9 @@ pub unsafe fn create_module<'ll>(
"e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:32-n8:16:32-a:0:32-S32"
.to_string();
}
if sess.target.arch == "wasm32" {
target_data_layout = target_data_layout.replace("-p10:8:8-p20:8:8", "");
}
}
// Ensure the data-layout values hardcoded remain the defaults.

3
compiler/rustc_target/src/spec/wasm32_unknown_emscripten.rs
View file

@ -43,7 +43,8 @@ pub fn target() -> Target {
Target {
llvm_target: "wasm32-unknown-emscripten".to_string(),
pointer_width: 32,
data_layout: "e-m:e-p:32:32-i64:64-f128:64-n32:64-S128-ni:1:10:20".to_string(),
data_layout: "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-f128:64-n32:64-S128-ni:1:10:20"
.to_string(),
arch: "wasm32".to_string(),
options: opts,
}

2
compiler/rustc_target/src/spec/wasm32_unknown_unknown.rs
View file

@ -54,7 +54,7 @@ pub fn target() -> Target {
Target {
llvm_target: "wasm32-unknown-unknown".to_string(),
pointer_width: 32,
data_layout: "e-m:e-p:32:32-i64:64-n32:64-S128-ni:1:10:20".to_string(),
data_layout: "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20".to_string(),
arch: "wasm32".to_string(),
options,
}

2
compiler/rustc_target/src/spec/wasm32_wasi.rs
View file

@ -109,7 +109,7 @@ pub fn target() -> Target {
Target {
llvm_target: "wasm32-wasi".to_string(),
pointer_width: 32,
data_layout: "e-m:e-p:32:32-i64:64-n32:64-S128-ni:1:10:20".to_string(),
data_layout: "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20".to_string(),
arch: "wasm32".to_string(),
options,
}