Clean up cfg attributes

Author: tmandry

src/probestack.rs

@@ -41,7 +41,11 @@
 //! probes on any other architecture like ARM or PowerPC64. LLVM I'm sure would
 //! be more than welcome to accept such a change!
 
-#![cfg(not(windows))] // Windows already has builtins to do this
+#![cfg(not(feature = "mangled-names"))]
+// Windows already has builtins to do this.
+#![cfg(not(windows))]
+// We only define stack probing for these architectures today.
+#![cfg(any(target_arch = "x86_64", target_arch = "x86"))]
 
 extern "C" {
     pub fn __rust_probestack();
@@ -52,11 +56,7 @@ extern "C" {
 // emitted for the function.
 //
 // This is the ELF version.
-#[cfg(all(
-    any(target_arch = "x86_64", target_arch = "x86"),
-    not(feature = "mangled-names"),
-    not(target_vendor = "apple")
-))]
+#[cfg(not(target_vendor = "apple"))]
 macro_rules! define_rust_probestack {
     ($body: expr) => {
         concat!(
@@ -76,11 +76,7 @@ macro_rules! define_rust_probestack {
 }
 
 // Same as above, but for Mach-O.
-#[cfg(all(
-    any(target_arch = "x86_64", target_arch = "x86"),
-    not(feature = "mangled-names"),
-    target_vendor = "apple"
-))]
+#[cfg(target_vendor = "apple")]
 macro_rules! define_rust_probestack {
     ($body: expr) => {
         concat!(
@@ -98,7 +94,7 @@ macro_rules! define_rust_probestack {
 //
 // The ABI here is that the stack frame size is located in `%rax`. Upon
 // return we're not supposed to modify `%rsp` or `%rax`.
-#[cfg(all(target_arch = "x86_64", not(feature = "mangled-names")))]
+#[cfg(target_arch = "x86_64")]
 global_asm!(define_rust_probestack!("
     .cfi_startproc
     pushq  %rbp
@@ -150,7 +146,7 @@ global_asm!(define_rust_probestack!("
     .cfi_endproc
 "));
 
-#[cfg(all(target_arch = "x86", not(feature = "mangled-names")))]
+#[cfg(target_arch = "x86")]
 // This is the same as x86_64 above, only translated for 32-bit sizes. Note
 // that on Unix we're expected to restore everything as it was, this
 // function basically can't tamper with anything.