diff options
| author | Amanieu d'Antras <amanieu@gmail.com> | 2020-04-09 00:05:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 00:05:10 +0100 |
| commit | 04c1a9a9e95b8d6ee4aa28e927b62653663f2df5 (patch) | |
| tree | b504145bdb9dbd5896c81edd335644e3ff735bac /library/stdarch/crates/std_detect | |
| parent | 70f3623b52282024611a7c62ea7ccc1272b8d696 (diff) | |
| download | rust-04c1a9a9e95b8d6ee4aa28e927b62653663f2df5.tar.gz rust-04c1a9a9e95b8d6ee4aa28e927b62653663f2df5.zip | |
Use llvm_asm! instead of asm! (#846)
Diffstat (limited to 'library/stdarch/crates/std_detect')
| -rw-r--r-- | library/stdarch/crates/std_detect/src/detect/os/aarch64.rs | 6 | ||||
| -rw-r--r-- | library/stdarch/crates/std_detect/src/lib.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/library/stdarch/crates/std_detect/src/detect/os/aarch64.rs b/library/stdarch/crates/std_detect/src/detect/os/aarch64.rs index 9adc938a264..56fe7958d62 100644 --- a/library/stdarch/crates/std_detect/src/detect/os/aarch64.rs +++ b/library/stdarch/crates/std_detect/src/detect/os/aarch64.rs @@ -34,7 +34,7 @@ pub(crate) fn detect_features() -> cache::Initializer { // ID_AA64ISAR0_EL1 - Instruction Set Attribute Register 0 let aa64isar0: u64; unsafe { - asm!("mrs $0, ID_AA64ISAR0_EL1" : "=r"(aa64isar0)); + llvm_asm!("mrs $0, ID_AA64ISAR0_EL1" : "=r"(aa64isar0)); } let aes = bits_shift(aa64isar0, 7, 4) >= 1; @@ -50,7 +50,7 @@ pub(crate) fn detect_features() -> cache::Initializer { // ID_AA64PFR0_EL1 - Processor Feature Register 0 let aa64pfr0: u64; unsafe { - asm!("mrs $0, ID_AA64PFR0_EL1" : "=r"(aa64pfr0)); + llvm_asm!("mrs $0, ID_AA64PFR0_EL1" : "=r"(aa64pfr0)); } let fp = bits_shift(aa64pfr0, 19, 16) < 0xF; @@ -73,7 +73,7 @@ pub(crate) fn detect_features() -> cache::Initializer { // ID_AA64ISAR1_EL1 - Instruction Set Attribute Register 1 let aa64isar1: u64; unsafe { - asm!("mrs $0, ID_AA64ISAR1_EL1" : "=r"(aa64isar1)); + llvm_asm!("mrs $0, ID_AA64ISAR1_EL1" : "=r"(aa64isar1)); } enable_feature(Feature::rcpc, bits_shift(aa64isar1, 23, 20) >= 1); diff --git a/library/stdarch/crates/std_detect/src/lib.rs b/library/stdarch/crates/std_detect/src/lib.rs index 88a00e40aac..8cd02c9616e 100644 --- a/library/stdarch/crates/std_detect/src/lib.rs +++ b/library/stdarch/crates/std_detect/src/lib.rs @@ -16,7 +16,7 @@ #![allow(clippy::shadow_reuse)] #![deny(clippy::missing_inline_in_public_items)] #![cfg_attr(target_os = "linux", feature(linkage))] -#![cfg_attr(all(target_os = "freebsd", target_arch = "aarch64"), feature(asm))] +#![cfg_attr(all(target_os = "freebsd", target_arch = "aarch64"), feature(llvm_asm))] #![cfg_attr(test, allow(unused_imports))] #![no_std] |