Skip to content

Commit a7d0669

Browse files
committed
Auto merge of rust-lang#83387 - cuviper:min-llvm-10, r=nagisa
Update the minimum external LLVM to 10 r? `@nikic`
2 parents 8a2c600 + a5e4f4a commit a7d0669

File tree

4 files changed

+9
-16
lines changed

4 files changed

+9
-16
lines changed

core/src/num/dec2flt/algorithm.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,9 @@ mod fpu_precision {
6262
// any `u16`
6363
unsafe {
6464
asm!(
65-
"fldcw ({})",
65+
"fldcw word ptr [{}]",
6666
in(reg) &cw,
67-
// FIXME: We are using ATT syntax to support LLVM 8 and LLVM 9.
68-
options(att_syntax, nostack),
67+
options(nostack),
6968
)
7069
}
7170
}
@@ -87,10 +86,9 @@ mod fpu_precision {
8786
// any `u16`
8887
unsafe {
8988
asm!(
90-
"fnstcw ({})",
89+
"fnstcw word ptr [{}]",
9190
in(reg) &mut cw,
92-
// FIXME: We are using ATT syntax to support LLVM 8 and LLVM 9.
93-
options(att_syntax, nostack),
91+
options(nostack),
9492
)
9593
}
9694

profiler_builtins/build.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@ fn main() {
2424
"InstrProfilingPlatformLinux.c",
2525
"InstrProfilingPlatformOther.c",
2626
"InstrProfilingPlatformWindows.c",
27+
"InstrProfilingRuntime.cpp",
2728
"InstrProfilingUtil.c",
2829
"InstrProfilingValue.c",
2930
"InstrProfilingVersionVar.c",
3031
"InstrProfilingWriter.c",
31-
// This file was renamed in LLVM 10.
32-
"InstrProfilingRuntime.cc",
33-
"InstrProfilingRuntime.cpp",
3432
// These files were added in LLVM 11.
3533
"InstrProfilingInternal.c",
3634
"InstrProfilingBiasVar.c",

std/src/sys/sgx/abi/mem.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@ pub fn image_base() -> u64 {
3636
let base: u64;
3737
unsafe {
3838
asm!(
39-
"lea IMAGE_BASE(%rip), {}",
39+
"lea {}, qword ptr [rip + IMAGE_BASE]",
4040
lateout(reg) base,
41-
// NOTE(#76738): ATT syntax is used to support LLVM 8 and 9.
42-
options(att_syntax, nostack, preserves_flags, nomem, pure),
41+
options(nostack, preserves_flags, nomem, pure),
4342
)
4443
};
4544
base

std/src/sys/sgx/ext/arch.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ pub fn egetkey(request: &Align512<[u8; 512]>) -> Result<Align16<[u8; 16]>, u32>
3636
inlateout("eax") ENCLU_EGETKEY => error,
3737
in("rbx") request,
3838
in("rcx") out.as_mut_ptr(),
39-
// NOTE(#76738): ATT syntax is used to support LLVM 8 and 9.
40-
options(att_syntax, nostack),
39+
options(nostack),
4140
);
4241

4342
match error {
@@ -66,8 +65,7 @@ pub fn ereport(
6665
in("rbx") targetinfo,
6766
in("rcx") reportdata,
6867
in("rdx") report.as_mut_ptr(),
69-
// NOTE(#76738): ATT syntax is used to support LLVM 8 and 9.
70-
options(att_syntax, preserves_flags, nostack),
68+
options(preserves_flags, nostack),
7169
);
7270

7371
report.assume_init()

0 commit comments

Comments
 (0)