summary refs log tree commit diff
path: root/src/libcore/internal_macros.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-05-04 23:45:41 +0000
committerbors <bors@rust-lang.org>2020-05-04 23:45:41 +0000
commit8d69840ab92ea7f4d323420088dd8c9775f180cd (patch)
treeb343bbbb72d07af4b8a88d9c07e77edf925ec6e9 /src/libcore/internal_macros.rs
parent4fb7144ed159f94491249e86d5bbd033b5d60550 (diff)
parent1eb1c8d1f270014d68ca8becb693a1f02f7332fc (diff)
downloadrust-1.43.1.tar.gz
rust-1.43.1.zip
Auto merge of #71868 - Mark-Simulacrum:stable-1.43.1, r=pietroalbini 1.43.1
[stable] 1.43.1 release

* [Updated openssl-src to 1.1.1g for CVE-2020-1967.][71430]
* [Fixed the stabilization of AVX-512 features.][71473]
* [Fixed `cargo package --list` not working with unpublished dependencies.][cargo/8151]

[71430]: https://github.com/rust-lang/rust/pull/71430
[71473]: https://github.com/rust-lang/rust/issues/71473
[cargo/8151]: https://github.com/rust-lang/cargo/issues/8151
Diffstat (limited to 'src/libcore/internal_macros.rs')
-rw-r--r--src/libcore/internal_macros.rs6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libcore/internal_macros.rs b/src/libcore/internal_macros.rs
index 4ea7dfc0735..8304a676918 100644
--- a/src/libcore/internal_macros.rs
+++ b/src/libcore/internal_macros.rs
@@ -117,3 +117,9 @@ macro_rules! impl_fn_for_zst {
         )+
     }
 }
+
+#[allow(unused_macros)]
+macro_rules! llvm_asm {
+    // Redirect to asm! for stdarch in stable 1.43
+    ($($arg:tt)*) => { $crate::asm!($($arg)*) }
+}