Skip to content

Commit 65cc2e6

Browse files
authored
Rollup merge of rust-lang#57987 - parched:va-args, r=michaelwoerister
Fix some AArch64 typos cc @dlrobertson
2 parents 33c4769 + c1858f2 commit 65cc2e6

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/libcore/ffi.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ impl fmt::Debug for c_void {
4747
/// Basic implementation of a `va_list`.
4848
#[cfg(any(all(not(target_arch = "aarch64"), not(target_arch = "powerpc"),
4949
not(target_arch = "x86_64")),
50-
all(target_arch = "aarch4", target_os = "ios"),
50+
all(target_arch = "aarch64", target_os = "ios"),
5151
windows))]
5252
#[unstable(feature = "c_variadic",
5353
reason = "the `c_variadic` feature has not been properly tested on \
@@ -67,7 +67,7 @@ impl fmt::Debug for VaListImpl {
6767
}
6868

6969
/// AArch64 ABI implementation of a `va_list`. See the
70-
/// [Aarch64 Procedure Call Standard] for more details.
70+
/// [AArch64 Procedure Call Standard] for more details.
7171
///
7272
/// [AArch64 Procedure Call Standard]:
7373
/// http://infocenter.arm.com/help/topic/com.arm.doc.ihi0055b/IHI0055B_aapcs64.pdf
@@ -193,7 +193,7 @@ impl<'a> VaList<'a> {
193193
where F: for<'copy> FnOnce(VaList<'copy>) -> R {
194194
#[cfg(any(all(not(target_arch = "aarch64"), not(target_arch = "powerpc"),
195195
not(target_arch = "x86_64")),
196-
all(target_arch = "aarch4", target_os = "ios"),
196+
all(target_arch = "aarch64", target_os = "ios"),
197197
windows))]
198198
let mut ap = va_copy(self);
199199
#[cfg(all(any(target_arch = "aarch64", target_arch = "powerpc", target_arch = "x86_64"),

src/librustc_codegen_llvm/va_arg.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ pub(super) fn emit_va_arg(
108108
emit_ptr_va_arg(bx, addr, target_ty, false,
109109
Align::from_bytes(4).unwrap(), true)
110110
}
111-
// Windows Aarch64
112-
("aarch4", true) => {
111+
// Windows AArch64
112+
("aarch64", true) => {
113113
emit_ptr_va_arg(bx, addr, target_ty, false,
114114
Align::from_bytes(8).unwrap(), false)
115115
}
116-
// iOS Aarch64
117-
("aarch4", _) if target.target_os == "ios" => {
116+
// iOS AArch64
117+
("aarch64", _) if target.target_os == "ios" => {
118118
emit_ptr_va_arg(bx, addr, target_ty, false,
119119
Align::from_bytes(8).unwrap(), true)
120120
}

0 commit comments

Comments
 (0)