mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LLVM 16: Update RISCV data layout

Browse Source
This commit is contained in:
Tim Neumann 2022-11-06 19:03:22 +00:00
parent 1e1e5b8d98
commit f414715ebf
7 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_codegen_llvm/src/context.rs
View File

@ -158,6 +158,10 @@ pub unsafe fn create_module<'ll>(
if sess.target.arch == "s390x" { if sess.target.arch == "s390x" {
target_data_layout = target_data_layout.replace("-v128:64", ""); target_data_layout = target_data_layout.replace("-v128:64", "");
} }
if sess.target.arch == "riscv64" {
target_data_layout = target_data_layout.replace("-n32:64-", "-n64-");
}
} }
// Ensure the data-layout values hardcoded remain the defaults. // Ensure the data-layout values hardcoded remain the defaults.

2
compiler/rustc_target/src/spec/riscv64gc_unknown_freebsd.rs
View File

@ -4,7 +4,7 @@ pub fn target() -> Target {
Target { Target {
llvm_target: "riscv64-unknown-freebsd".into(), llvm_target: "riscv64-unknown-freebsd".into(),
pointer_width: 64, pointer_width: 64,
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n64-S128".into(), data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
arch: "riscv64".into(), arch: "riscv64".into(),
options: TargetOptions { options: TargetOptions {
code_model: Some(CodeModel::Medium), code_model: Some(CodeModel::Medium),

2
compiler/rustc_target/src/spec/riscv64gc_unknown_linux_gnu.rs
View File

@ -4,7 +4,7 @@ pub fn target() -> Target {
Target { Target {
llvm_target: "riscv64-unknown-linux-gnu".into(), llvm_target: "riscv64-unknown-linux-gnu".into(),
pointer_width: 64, pointer_width: 64,
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n64-S128".into(), data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
arch: "riscv64".into(), arch: "riscv64".into(),
options: TargetOptions { options: TargetOptions {
code_model: Some(CodeModel::Medium), code_model: Some(CodeModel::Medium),

2
compiler/rustc_target/src/spec/riscv64gc_unknown_linux_musl.rs
View File

@ -4,7 +4,7 @@ pub fn target() -> Target {
Target { Target {
llvm_target: "riscv64-unknown-linux-musl".into(), llvm_target: "riscv64-unknown-linux-musl".into(),
pointer_width: 64, pointer_width: 64,
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n64-S128".into(), data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
arch: "riscv64".into(), arch: "riscv64".into(),
options: TargetOptions { options: TargetOptions {
code_model: Some(CodeModel::Medium), code_model: Some(CodeModel::Medium),

2
compiler/rustc_target/src/spec/riscv64gc_unknown_none_elf.rs
View File

@ -3,7 +3,7 @@
pub fn target() -> Target { pub fn target() -> Target {
Target { Target {
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n64-S128".into(), data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
llvm_target: "riscv64".into(), llvm_target: "riscv64".into(),
pointer_width: 64, pointer_width: 64,
arch: "riscv64".into(), arch: "riscv64".into(),

2
compiler/rustc_target/src/spec/riscv64gc_unknown_openbsd.rs
View File

@ -4,7 +4,7 @@ pub fn target() -> Target {
Target { Target {
llvm_target: "riscv64-unknown-openbsd".into(), llvm_target: "riscv64-unknown-openbsd".into(),
pointer_width: 64, pointer_width: 64,
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n64-S128".into(), data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
arch: "riscv64".into(), arch: "riscv64".into(),
options: TargetOptions { options: TargetOptions {
code_model: Some(CodeModel::Medium), code_model: Some(CodeModel::Medium),

2
compiler/rustc_target/src/spec/riscv64imac_unknown_none_elf.rs
View File

@ -3,7 +3,7 @@
pub fn target() -> Target { pub fn target() -> Target {
Target { Target {
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n64-S128".into(), data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
llvm_target: "riscv64".into(), llvm_target: "riscv64".into(),
pointer_width: 64, pointer_width: 64,
arch: "riscv64".into(), arch: "riscv64".into(),