Use objdump on Macos x86_64 as well.

Author: hkratz

crates/stdarch-test/src/disassembly.rs

@@ -67,43 +67,18 @@ pub(crate) fn disassemble_myself() -> HashSet<Function> {
         String::from_utf8_lossy(Vec::leak(output.stdout))
     } else if cfg!(target_os = "windows") {
         panic!("disassembly unimplemented")
-    } else if cfg!(target_os = "macos") && cfg!(target_arch = "aarch64") {
-        // use LLVM objdump because it is not possible to enable TME support with otool
-        let objdump = env::var("OBJDUMP").unwrap_or_else(|_| "objdump".to_string());
-        let output = Command::new(objdump.clone())
-            .arg("--disassemble")
-            .arg("--no-show-raw-insn")
-            .arg("--mattr=+crc,+crypto,+tme")
-            .arg(&me)
-            .output()
-            .unwrap_or_else(|_| panic!("failed to execute objdump. OBJDUMP={}", objdump));
-        println!(
-            "{}\n{}",
-            output.status,
-            String::from_utf8_lossy(&output.stderr)
-        );
-        assert!(output.status.success());
-
-        String::from_utf8_lossy(Vec::leak(output.stdout))
-    } else if cfg!(target_os = "macos") {
-        let output = Command::new("otool")
-            .arg("-vt")
-            .arg(&me)
-            .output()
-            .expect("failed to execute otool");
-        println!(
-            "{}\n{}",
-            output.status,
-            String::from_utf8_lossy(&output.stderr)
-        );
-        assert!(output.status.success());
-
-        String::from_utf8_lossy(Vec::leak(output.stdout))
     } else {
         let objdump = env::var("OBJDUMP").unwrap_or_else(|_| "objdump".to_string());
+        let add_args = if cfg!(target_os = "macos") && cfg!(target_arch = "aarch64") {
+            // Target features need to be enabled for LLVM objdump on Macos ARM64
+            vec!["--mattr=+crc,+crypto,+tme"]
+        } else {
+            vec![]
+        };
         let output = Command::new(objdump.clone())
             .arg("--disassemble")
             .arg("--no-show-raw-insn")
+            .args(add_args)
             .arg(&me)
             .output()
             .unwrap_or_else(|_| panic!("failed to execute objdump. OBJDUMP={}", objdump));