Skip to content

Commit 0037048

Browse files
borsbors
committed
Auto merge of rust-lang#131775 - Urgau:rollup-yc4a3sf, r=Urgau
Rollup of 10 pull requests Successful merges: - rust-lang#131582 (Add wasm32-unknown-emscripten platform support document) - rust-lang#131694 (Make fuchsia-test-runner.py compatible with new JSON output from llvm-readelf) - rust-lang#131700 (Fix match_same_arms in stable_mir) - rust-lang#131712 (Mark the unstable LazyCell::into_inner const) - rust-lang#131746 (Relax a memory order in `once_box`) - rust-lang#131754 (Don't report bivariance error when nesting a struct with field errors into another struct) - rust-lang#131760 (llvm: Match aarch64 data layout to new LLVM layout) - rust-lang#131764 (Fix unnecessary nesting in run-make test output directories) - rust-lang#131766 (Add mailmap entry for my dev-desktop setup) - rust-lang#131771 (Handle gracefully true/false in `cfg(target(..))` compact) r? `@ghost` `@rustbot` modify labels: rollup
2 parents d829780 + e0e1e35 commit 0037048

File tree

58 files changed

+400
-108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+400
-108
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ Jerry Hardee <[email protected]>
280280
Jesús Rubio <[email protected]>
281281
Jethro Beekman <[email protected]>
282282
Jian Zeng <[email protected]>
283+
Jieyou Xu <[email protected]> <[email protected]>
283284
Jihyun Yu <[email protected]> <[email protected]>
284285
Jihyun Yu <[email protected]> jihyun <[email protected]>
285286
Jihyun Yu <[email protected]> Jihyun Yu <[email protected]>

‎compiler/rustc_attr/src/builtin.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,13 @@ pub fn eval_condition(
723723
}
724724

725725
mis.iter().fold(true, |res, mi| {
726-
let mut mi = mi.meta_item().unwrap().clone();
726+
let Some(mut mi) = mi.meta_item().cloned() else {
727+
dcx.emit_err(session_diagnostics::CfgPredicateIdentifier {
728+
span: mi.span(),
729+
});
730+
return false;
731+
};
732+
727733
if let [seg, ..] = &mut mi.path.segments[..] {
728734
seg.ident.name = Symbol::intern(&format!("target_{}", seg.ident.name));
729735
}

‎compiler/rustc_codegen_llvm/src/context.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,16 @@ pub(crate) unsafe fn create_module<'ll>(
138138
}
139139
}
140140

141+
if llvm_version < (20, 0, 0) {
142+
if sess.target.arch == "aarch64" || sess.target.arch.starts_with("arm64") {
143+
// LLVM 20 defines three additional address spaces for alternate
144+
// pointer kinds used in Windows.
145+
// See https://github.com/llvm/llvm-project/pull/111879
146+
target_data_layout =
147+
target_data_layout.replace("-p270:32:32-p271:32:32-p272:64:64", "");
148+
}
149+
}
150+
141151
// Ensure the data-layout values hardcoded remain the defaults.
142152
{
143153
let tm = crate::back::write::create_informational_target_machine(tcx.sess, false);

‎compiler/rustc_hir_analysis/src/check/wfcheck.rs

Lines changed: 50 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1875,24 +1875,15 @@ fn check_variances_for_type_defn<'tcx>(
18751875
item: &'tcx hir::Item<'tcx>,
18761876
hir_generics: &hir::Generics<'tcx>,
18771877
) {
1878-
let identity_args = ty::GenericArgs::identity_for_item(tcx, item.owner_id);
1879-
18801878
match item.kind {
18811879
ItemKind::Enum(..) | ItemKind::Struct(..) | ItemKind::Union(..) => {
1882-
for field in tcx.adt_def(item.owner_id).all_fields() {
1883-
if field.ty(tcx, identity_args).references_error() {
1884-
return;
1885-
}
1886-
}
1880+
// Ok
18871881
}
18881882
ItemKind::TyAlias(..) => {
18891883
assert!(
18901884
tcx.type_alias_is_lazy(item.owner_id),
18911885
"should not be computing variance of non-weak type alias"
18921886
);
1893-
if tcx.type_of(item.owner_id).skip_binder().references_error() {
1894-
return;
1895-
}
18961887
}
18971888
kind => span_bug!(item.span, "cannot compute the variances of {kind:?}"),
18981889
}
@@ -1955,6 +1946,15 @@ fn check_variances_for_type_defn<'tcx>(
19551946
continue;
19561947
}
19571948

1949+
// Look for `ErrorGuaranteed` deeply within this type.
1950+
if let ControlFlow::Break(ErrorGuaranteed { .. }) = tcx
1951+
.type_of(item.owner_id)
1952+
.instantiate_identity()
1953+
.visit_with(&mut HasErrorDeep { tcx, seen: Default::default() })
1954+
{
1955+
continue;
1956+
}
1957+
19581958
match hir_param.name {
19591959
hir::ParamName::Error => {}
19601960
_ => {
@@ -1965,6 +1965,46 @@ fn check_variances_for_type_defn<'tcx>(
19651965
}
19661966
}
19671967

1968+
/// Look for `ErrorGuaranteed` deeply within structs' (unsubstituted) fields.
1969+
struct HasErrorDeep<'tcx> {
1970+
tcx: TyCtxt<'tcx>,
1971+
seen: FxHashSet<DefId>,
1972+
}
1973+
impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for HasErrorDeep<'tcx> {
1974+
type Result = ControlFlow<ErrorGuaranteed>;
1975+
1976+
fn visit_ty(&mut self, ty: Ty<'tcx>) -> Self::Result {
1977+
match *ty.kind() {
1978+
ty::Adt(def, _) => {
1979+
if self.seen.insert(def.did()) {
1980+
for field in def.all_fields() {
1981+
self.tcx.type_of(field.did).instantiate_identity().visit_with(self)?;
1982+
}
1983+
}
1984+
}
1985+
ty::Error(guar) => return ControlFlow::Break(guar),
1986+
_ => {}
1987+
}
1988+
ty.super_visit_with(self)
1989+
}
1990+
1991+
fn visit_region(&mut self, r: ty::Region<'tcx>) -> Self::Result {
1992+
if let Err(guar) = r.error_reported() {
1993+
ControlFlow::Break(guar)
1994+
} else {
1995+
ControlFlow::Continue(())
1996+
}
1997+
}
1998+
1999+
fn visit_const(&mut self, c: ty::Const<'tcx>) -> Self::Result {
2000+
if let Err(guar) = c.error_reported() {
2001+
ControlFlow::Break(guar)
2002+
} else {
2003+
ControlFlow::Continue(())
2004+
}
2005+
}
2006+
}
2007+
19682008
fn report_bivariance<'tcx>(
19692009
tcx: TyCtxt<'tcx>,
19702010
param: &'tcx hir::GenericParam<'tcx>,

‎compiler/rustc_target/src/spec/targets/aarch64_apple_darwin.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ pub(crate) fn target() -> Target {
1212
std: Some(true),
1313
},
1414
pointer_width: 64,
15-
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128-Fn32".into(),
15+
data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-n32:64-S128-Fn32"
16+
.into(),
1617
arch,
1718
options: TargetOptions {
1819
mcount: "\u{1}mcount".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_ios.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ pub(crate) fn target() -> Target {
1212
std: Some(true),
1313
},
1414
pointer_width: 64,
15-
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128-Fn32".into(),
15+
data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-n32:64-S128-Fn32"
16+
.into(),
1617
arch,
1718
options: TargetOptions {
1819
features: "+neon,+fp-armv8,+apple-a7".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_ios_macabi.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ pub(crate) fn target() -> Target {
1212
std: Some(true),
1313
},
1414
pointer_width: 64,
15-
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128-Fn32".into(),
15+
data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-n32:64-S128-Fn32"
16+
.into(),
1617
arch,
1718
options: TargetOptions {
1819
features: "+neon,+fp-armv8,+apple-a12".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_ios_sim.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ pub(crate) fn target() -> Target {
1212
std: Some(true),
1313
},
1414
pointer_width: 64,
15-
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128-Fn32".into(),
15+
data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-n32:64-S128-Fn32"
16+
.into(),
1617
arch,
1718
options: TargetOptions {
1819
features: "+neon,+fp-armv8,+apple-a7".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_tvos.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ pub(crate) fn target() -> Target {
1212
std: Some(true),
1313
},
1414
pointer_width: 64,
15-
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128-Fn32".into(),
15+
data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-n32:64-S128-Fn32"
16+
.into(),
1617
arch,
1718
options: TargetOptions {
1819
features: "+neon,+fp-armv8,+apple-a7".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_tvos_sim.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ pub(crate) fn target() -> Target {
1212
std: Some(true),
1313
},
1414
pointer_width: 64,
15-
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128-Fn32".into(),
15+
data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-n32:64-S128-Fn32"
16+
.into(),
1617
arch,
1718
options: TargetOptions {
1819
features: "+neon,+fp-armv8,+apple-a7".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_visionos.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ pub(crate) fn target() -> Target {
1212
std: Some(false),
1313
},
1414
pointer_width: 64,
15-
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128-Fn32".into(),
15+
data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-n32:64-S128-Fn32"
16+
.into(),
1617
arch,
1718
options: TargetOptions {
1819
features: "+neon,+fp-armv8,+apple-a16".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_visionos_sim.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ pub(crate) fn target() -> Target {
1212
std: Some(false),
1313
},
1414
pointer_width: 64,
15-
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128-Fn32".into(),
15+
data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-n32:64-S128-Fn32"
16+
.into(),
1617
arch,
1718
options: TargetOptions {
1819
features: "+neon,+fp-armv8,+apple-a16".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_watchos.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ pub(crate) fn target() -> Target {
1212
std: Some(true),
1313
},
1414
pointer_width: 64,
15-
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128-Fn32".into(),
15+
data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-n32:64-S128-Fn32"
16+
.into(),
1617
arch,
1718
options: TargetOptions {
1819
features: "+v8a,+neon,+fp-armv8,+apple-a7".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_watchos_sim.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ pub(crate) fn target() -> Target {
1212
std: Some(true),
1313
},
1414
pointer_width: 64,
15-
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128-Fn32".into(),
15+
data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-n32:64-S128-Fn32"
16+
.into(),
1617
arch,
1718
options: TargetOptions {
1819
features: "+neon,+fp-armv8,+apple-a7".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_kmc_solid_asp3.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub(crate) fn target() -> Target {
1111
std: Some(true),
1212
},
1313
pointer_width: 64,
14-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
14+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
1515
arch: "aarch64".into(),
1616
options: TargetOptions {
1717
linker: Some("aarch64-kmc-elf-gcc".into()),

‎compiler/rustc_target/src/spec/targets/aarch64_linux_android.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub(crate) fn target() -> Target {
1313
std: Some(true),
1414
},
1515
pointer_width: 64,
16-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
16+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
1717
arch: "aarch64".into(),
1818
options: TargetOptions {
1919
max_atomic_width: Some(128),

‎compiler/rustc_target/src/spec/targets/aarch64_nintendo_switch_freestanding.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub(crate) fn target() -> Target {
1515
std: Some(false),
1616
},
1717
pointer_width: 64,
18-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
18+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
1919
arch: "aarch64".into(),
2020
options: TargetOptions {
2121
features: "+v8a".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_pc_windows_gnullvm.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ pub(crate) fn target() -> Target {
1515
std: Some(true),
1616
},
1717
pointer_width: 64,
18-
data_layout: "e-m:w-p:64:64-i32:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
18+
data_layout:
19+
"e-m:w-p270:32:32-p271:32:32-p272:64:64-p:64:64-i32:32-i64:64-i128:128-n32:64-S128-Fn32"
20+
.into(),
1921
arch: "aarch64".into(),
2022
options: base,
2123
}

‎compiler/rustc_target/src/spec/targets/aarch64_pc_windows_msvc.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ pub(crate) fn target() -> Target {
1414
std: Some(true),
1515
},
1616
pointer_width: 64,
17-
data_layout: "e-m:w-p:64:64-i32:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
17+
data_layout:
18+
"e-m:w-p270:32:32-p271:32:32-p272:64:64-p:64:64-i32:32-i64:64-i128:128-n32:64-S128-Fn32"
19+
.into(),
1820
arch: "aarch64".into(),
1921
options: base,
2022
}

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_freebsd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub(crate) fn target() -> Target {
1010
std: Some(true),
1111
},
1212
pointer_width: 64,
13-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
13+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
1414
arch: "aarch64".into(),
1515
options: TargetOptions {
1616
features: "+v8a".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_fuchsia.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub(crate) fn target() -> Target {
1010
std: Some(true),
1111
},
1212
pointer_width: 64,
13-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
13+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
1414
arch: "aarch64".into(),
1515
options: TargetOptions {
1616
features: "+v8a".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_hermit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub(crate) fn target() -> Target {
1111
},
1212
pointer_width: 64,
1313
arch: "aarch64".into(),
14-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
14+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
1515
options: TargetOptions {
1616
features: "+v8a,+strict-align,+neon,+fp-armv8".into(),
1717
max_atomic_width: Some(128),

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_illumos.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub(crate) fn target() -> Target {
1818
std: Some(true),
1919
},
2020
pointer_width: 64,
21-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
21+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
2222
arch: "aarch64".into(),
2323
options: base,
2424
}

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_gnu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub(crate) fn target() -> Target {
1010
std: Some(true),
1111
},
1212
pointer_width: 64,
13-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
13+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
1414
arch: "aarch64".into(),
1515
options: TargetOptions {
1616
features: "+v8a,+outline-atomics".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_musl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub(crate) fn target() -> Target {
2121
std: Some(true),
2222
},
2323
pointer_width: 64,
24-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
24+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
2525
arch: "aarch64".into(),
2626
options: TargetOptions { mcount: "\u{1}_mcount".into(), ..base },
2727
}

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_ohos.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub(crate) fn target() -> Target {
1313
std: Some(true),
1414
},
1515
pointer_width: 64,
16-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
16+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
1717
arch: "aarch64".into(),
1818
options: TargetOptions {
1919
features: "+reserve-x18".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_netbsd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub(crate) fn target() -> Target {
1010
std: Some(true),
1111
},
1212
pointer_width: 64,
13-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
13+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
1414
arch: "aarch64".into(),
1515
options: TargetOptions {
1616
features: "+v8a".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_none.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub(crate) fn target() -> Target {
3737
std: Some(false),
3838
},
3939
pointer_width: 64,
40-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
40+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
4141
arch: "aarch64".into(),
4242
options: opts,
4343
}

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pub(crate) fn target() -> Target {
3232
std: Some(false),
3333
},
3434
pointer_width: 64,
35-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
35+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
3636
arch: "aarch64".into(),
3737
options: opts,
3838
}

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_nto_qnx700.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub(crate) fn target() -> Target {
2222
// i128:128 = 128-bit-integer, minimum_alignment=128, preferred_alignment=128
2323
// n32:64 = 32 and 64 are native integer widths; Elements of this set are considered to support most general arithmetic operations efficiently.
2424
// S128 = 128 bits are the natural alignment of the stack in bits.
25-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
25+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
2626
arch: "aarch64".into(),
2727
options: TargetOptions {
2828
features: "+v8a".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_openbsd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub(crate) fn target() -> Target {
1010
std: Some(true),
1111
},
1212
pointer_width: 64,
13-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
13+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
1414
arch: "aarch64".into(),
1515
options: TargetOptions {
1616
features: "+v8a".into(),

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_redox.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub(crate) fn target() -> Target {
1515
std: None, // ?
1616
},
1717
pointer_width: 64,
18-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
18+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
1919
arch: "aarch64".into(),
2020
options: base,
2121
}

0 commit comments

Comments
 (0)