Fix compile error on x86_64-unknown-uefi target (rust-lang#331)

wangrunji0408 · alexcrichton · commit 9193bbee5d65 · 2019-12-10T09:02:14.000-08:00
* fix compile error on x86_64-unknown-uefi target

* Fix tests on nightly
diff --git a/src/probestack.rs b/src/probestack.rs
@@ -56,7 +56,7 @@ extern "C" {
 // emitted for the function.
 //
 // This is the ELF version.
-#[cfg(not(target_vendor = "apple"))]
+#[cfg(not(any(target_vendor = "apple", target_os = "uefi")))]
 macro_rules! define_rust_probestack {
     ($body: expr) => {
         concat!(
@@ -76,7 +76,7 @@ macro_rules! define_rust_probestack {
 }
 
 // Same as above, but for Mach-O.
-#[cfg(target_vendor = "apple")]
+#[cfg(any(target_vendor = "apple", target_os = "uefi"))]
 macro_rules! define_rust_probestack {
     ($body: expr) => {
         concat!(
diff --git a/testcrate/tests/count_leading_zeros.rs b/testcrate/tests/count_leading_zeros.rs
@@ -1,5 +1,3 @@
-#![feature(compiler_builtins_lib)]
-
 extern crate compiler_builtins;
 
 use compiler_builtins::int::__clzsi2;
diff --git a/testcrate/tests/generated.rs b/testcrate/tests/generated.rs
@@ -1,4 +1,3 @@
-#![feature(compiler_builtins_lib)]
 #![feature(lang_items)]
 #![allow(bad_style)]
 #![allow(unused_imports)]

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#![feature(compiler_builtins_lib)]`
`2`		`-`
`3`	`1`	`extern crate compiler_builtins;`
`4`	`2`
`5`	`3`	`use compiler_builtins::int::__clzsi2;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#![feature(compiler_builtins_lib)]`
`2`	`1`	`#![feature(lang_items)]`
`3`	`2`	`#![allow(bad_style)]`
`4`	`3`	`#![allow(unused_imports)]`