Skip to content

Commit

Permalink
v8a as default aarch64 target
Browse files Browse the repository at this point in the history
After llvm/llvm-project@8689f5e landed, LLVM takes the intersection of v8a and v8r as default.
This commit brings back v8a support by explicitly specifying v8a in the feature list.

This should solve #97724.
  • Loading branch information
oToToT committed Nov 29, 2022
1 parent 8a09420 commit 382dba5
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 0 deletions.
5 changes: 5 additions & 0 deletions compiler/rustc_codegen_llvm/src/llvm_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,11 @@ pub(crate) fn global_llvm_features(sess: &Session, diagnostics: bool) -> Vec<Str
.flatten();
features.extend(feats);

// FIXME: Move v8a to target definition list when earliest supported LLVM is 14.
if get_version() >= (14, 0, 0) && sess.target.arch == "aarch64" {
features.push("+v8a".into());
}

if diagnostics && let Some(f) = check_tied_features(sess, &featsmap) {
sess.emit_err(TargetFeatureDisableOrEnable {
features: f,
Expand Down
37 changes: 37 additions & 0 deletions src/test/assembly/asm/aarch64-el2vmsa.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// assembly-output: emit-asm
// compile-flags: --target aarch64-unknown-linux-gnu
// needs-llvm-components: aarch64

#![feature(no_core, lang_items, rustc_attrs)]
#![crate_type = "rlib"]
#![no_core]

#[rustc_builtin_macro]
macro_rules! asm {
() => {};
}

#[lang = "sized"]
trait Sized {}

// CHECK-LABEL: ttbr0_el2:
#[no_mangle]
pub fn ttbr0_el2() {
// CHECK: //APP
// CHECK-NEXT: msr TTBR0_EL2, x0
// CHECK-NEXT: //NO_APP
unsafe {
asm!("msr ttbr0_el2, x0");
}
}

// CHECK-LABEL: vttbr_el2:
#[no_mangle]
pub fn vttbr_el2() {
// CHECK: //APP
// CHECK-NEXT: msr VTTBR_EL2, x0
// CHECK-NEXT: //NO_APP
unsafe {
asm!("msr vttbr_el2, x0");
}
}

0 comments on commit 382dba5

Please sign in to comment.