about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2020-05-22 08:54:55 +0200
committerGitHub <noreply@github.com>2020-05-22 08:54:55 +0200
commit64beaffd6a69d9af4126038db92c989868bd982d (patch)
tree8d5fbd10aa5a997b2ce43c6f0e279fe168d08380 /src
parentafbbb86200121a65b8bb920198b8a808e3003959 (diff)
parent4a10f6cd084b4fb72485bff597dfbb5852042a33 (diff)
downloadrust-64beaffd6a69d9af4126038db92c989868bd982d.tar.gz
rust-64beaffd6a69d9af4126038db92c989868bd982d.zip
Rollup merge of #72438 - vertexclique:vcq/aarch64-tme-features, r=Amanieu
Enable ARM TME (Transactional Memory Extensions)

Enables ARM TME coming up with LLVM 10. Related ARM TME intrinsics are included by the merge of #67900.

Enables: https://github.com/rust-lang/stdarch/pull/855
Diffstat (limited to 'src')
-rw-r--r--src/librustc_codegen_llvm/llvm_util.rs1
-rw-r--r--src/libstd/tests/run-time-detect.rs1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/librustc_codegen_llvm/llvm_util.rs b/src/librustc_codegen_llvm/llvm_util.rs
index 286d3630181..67a2251e859 100644
--- a/src/librustc_codegen_llvm/llvm_util.rs
+++ b/src/librustc_codegen_llvm/llvm_util.rs
@@ -170,6 +170,7 @@ const AARCH64_WHITELIST: &[(&str, Option<Symbol>)] = &[
     ("fp16", Some(sym::aarch64_target_feature)),
     ("rcpc", Some(sym::aarch64_target_feature)),
     ("dotprod", Some(sym::aarch64_target_feature)),
+    ("tme", Some(sym::aarch64_target_feature)),
     ("v8.1a", Some(sym::aarch64_target_feature)),
     ("v8.2a", Some(sym::aarch64_target_feature)),
     ("v8.3a", Some(sym::aarch64_target_feature)),
diff --git a/src/libstd/tests/run-time-detect.rs b/src/libstd/tests/run-time-detect.rs
index 2e6d1bc8efd..8dd1a8ac0d2 100644
--- a/src/libstd/tests/run-time-detect.rs
+++ b/src/libstd/tests/run-time-detect.rs
@@ -32,6 +32,7 @@ fn aarch64_linux() {
     println!("rdm: {}", is_aarch64_feature_detected!("rdm"));
     println!("rcpc: {}", is_aarch64_feature_detected!("rcpc"));
     println!("dotprod: {}", is_aarch64_feature_detected!("dotprod"));
+    println!("tme: {}", is_aarch64_feature_detected!("tme"));
 }
 
 #[test]