Rollup merge of #134115 - durin42:ppc64-target-string, r=jieyouxu
rustc_target: ppc64 target string fixes for LLVM 20 LLVM continues to clean these up, and we continue to make this consistent. This is similar to9caced7bad
,e985396145
, anda10e744faf
. ```@rustbot``` label: +llvm-main
This commit is contained in:
commit
6d17cb833d
10 changed files with 14 additions and 9 deletions
|
@ -159,6 +159,11 @@ pub(crate) unsafe fn create_module<'ll>(
|
||||||
// See https://github.com/llvm/llvm-project/pull/112084
|
// See https://github.com/llvm/llvm-project/pull/112084
|
||||||
target_data_layout = target_data_layout.replace("-i128:128", "");
|
target_data_layout = target_data_layout.replace("-i128:128", "");
|
||||||
}
|
}
|
||||||
|
if sess.target.arch.starts_with("powerpc64") {
|
||||||
|
// LLVM 20 updates the powerpc64 layout to correctly align 128 bit integers to 128 bit.
|
||||||
|
// See https://github.com/llvm/llvm-project/pull/118004
|
||||||
|
target_data_layout = target_data_layout.replace("-i128:128", "");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ensure the data-layout values hardcoded remain the defaults.
|
// Ensure the data-layout values hardcoded remain the defaults.
|
||||||
|
|
|
@ -19,7 +19,7 @@ pub(crate) fn target() -> Target {
|
||||||
std: None, // ?
|
std: None, // ?
|
||||||
},
|
},
|
||||||
pointer_width: 64,
|
pointer_width: 64,
|
||||||
data_layout: "E-m:a-Fi64-i64:64-n32:64-S128-v256:256:256-v512:512:512".into(),
|
data_layout: "E-m:a-Fi64-i64:64-i128:128-n32:64-S128-v256:256:256-v512:512:512".into(),
|
||||||
arch: "powerpc64".into(),
|
arch: "powerpc64".into(),
|
||||||
options: base,
|
options: base,
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ pub(crate) fn target() -> Target {
|
||||||
std: Some(true),
|
std: Some(true),
|
||||||
},
|
},
|
||||||
pointer_width: 64,
|
pointer_width: 64,
|
||||||
data_layout: "E-m:e-Fn32-i64:64-n32:64".into(),
|
data_layout: "E-m:e-Fn32-i64:64-i128:128-n32:64".into(),
|
||||||
arch: "powerpc64".into(),
|
arch: "powerpc64".into(),
|
||||||
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".into(), ..base },
|
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".into(), ..base },
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ pub(crate) fn target() -> Target {
|
||||||
std: Some(true),
|
std: Some(true),
|
||||||
},
|
},
|
||||||
pointer_width: 64,
|
pointer_width: 64,
|
||||||
data_layout: "E-m:e-Fi64-i64:64-n32:64-S128-v256:256:256-v512:512:512".into(),
|
data_layout: "E-m:e-Fi64-i64:64-i128:128-n32:64-S128-v256:256:256-v512:512:512".into(),
|
||||||
arch: "powerpc64".into(),
|
arch: "powerpc64".into(),
|
||||||
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".into(), ..base },
|
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".into(), ..base },
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ pub(crate) fn target() -> Target {
|
||||||
std: Some(true),
|
std: Some(true),
|
||||||
},
|
},
|
||||||
pointer_width: 64,
|
pointer_width: 64,
|
||||||
data_layout: "E-m:e-Fn32-i64:64-n32:64-S128-v256:256:256-v512:512:512".into(),
|
data_layout: "E-m:e-Fn32-i64:64-i128:128-n32:64-S128-v256:256:256-v512:512:512".into(),
|
||||||
arch: "powerpc64".into(),
|
arch: "powerpc64".into(),
|
||||||
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".into(), ..base },
|
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".into(), ..base },
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ pub(crate) fn target() -> Target {
|
||||||
std: Some(true),
|
std: Some(true),
|
||||||
},
|
},
|
||||||
pointer_width: 64,
|
pointer_width: 64,
|
||||||
data_layout: "E-m:e-Fn32-i64:64-n32:64".into(),
|
data_layout: "E-m:e-Fn32-i64:64-i128:128-n32:64".into(),
|
||||||
arch: "powerpc64".into(),
|
arch: "powerpc64".into(),
|
||||||
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".into(), ..base },
|
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".into(), ..base },
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ pub(crate) fn target() -> Target {
|
||||||
std: Some(true),
|
std: Some(true),
|
||||||
},
|
},
|
||||||
pointer_width: 64,
|
pointer_width: 64,
|
||||||
data_layout: "E-m:e-Fi64-i64:64-n32:64-S128-v256:256:256-v512:512:512".into(),
|
data_layout: "E-m:e-Fi64-i64:64-i128:128-n32:64-S128-v256:256:256-v512:512:512".into(),
|
||||||
arch: "powerpc64".into(),
|
arch: "powerpc64".into(),
|
||||||
options: TargetOptions { endian: Endian::Big, ..base },
|
options: TargetOptions { endian: Endian::Big, ..base },
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,7 @@ pub(crate) fn target() -> Target {
|
||||||
std: Some(true),
|
std: Some(true),
|
||||||
},
|
},
|
||||||
pointer_width: 64,
|
pointer_width: 64,
|
||||||
data_layout: "e-m:e-Fn32-i64:64-n32:64".into(),
|
data_layout: "e-m:e-Fn32-i64:64-i128:128-n32:64".into(),
|
||||||
arch: "powerpc64".into(),
|
arch: "powerpc64".into(),
|
||||||
options: TargetOptions { mcount: "_mcount".into(), ..base },
|
options: TargetOptions { mcount: "_mcount".into(), ..base },
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,7 @@ pub(crate) fn target() -> Target {
|
||||||
std: Some(true),
|
std: Some(true),
|
||||||
},
|
},
|
||||||
pointer_width: 64,
|
pointer_width: 64,
|
||||||
data_layout: "e-m:e-Fn32-i64:64-n32:64-S128-v256:256:256-v512:512:512".into(),
|
data_layout: "e-m:e-Fn32-i64:64-i128:128-n32:64-S128-v256:256:256-v512:512:512".into(),
|
||||||
arch: "powerpc64".into(),
|
arch: "powerpc64".into(),
|
||||||
options: TargetOptions { mcount: "_mcount".into(), ..base },
|
options: TargetOptions { mcount: "_mcount".into(), ..base },
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,7 @@ pub(crate) fn target() -> Target {
|
||||||
std: Some(true),
|
std: Some(true),
|
||||||
},
|
},
|
||||||
pointer_width: 64,
|
pointer_width: 64,
|
||||||
data_layout: "e-m:e-Fn32-i64:64-n32:64-S128-v256:256:256-v512:512:512".into(),
|
data_layout: "e-m:e-Fn32-i64:64-i128:128-n32:64-S128-v256:256:256-v512:512:512".into(),
|
||||||
arch: "powerpc64".into(),
|
arch: "powerpc64".into(),
|
||||||
options: TargetOptions { mcount: "_mcount".into(), ..base },
|
options: TargetOptions { mcount: "_mcount".into(), ..base },
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue