[llvm] 3716851 - [MC] Properly disable debug-frame test on AppleSilicon Mac

[Steven Wu via llvm-commits]

Author: Steven Wu
Date: 2022-09-29T16:21:12-07:00
New Revision: 3716851a84f2b4aac8afa08b2003b19cab166100

URL: https://github.com/llvm/llvm-project/commit/3716851a84f2b4aac8afa08b2003b19cab166100
DIFF: https://github.com/llvm/llvm-project/commit/3716851a84f2b4aac8afa08b2003b19cab166100.diff

LOG: [MC] Properly disable debug-frame test on AppleSilicon Mac

Disable debug-frame tests on AppleSilicon Mac to improve some of the fix
in PR46647.

Reviewed By: aprantl

Differential Revision: https://reviews.llvm.org/D134896

Added: 
    

Modified: 
    llvm/test/MC/ELF/cfi-version.ll
    llvm/test/lit.cfg.py

Removed: 
    


################################################################################
diff  --git a/llvm/test/MC/ELF/cfi-version.ll b/llvm/test/MC/ELF/cfi-version.ll
index c57dc9664cfd5..67f42ac446cf9 100644
--- a/llvm/test/MC/ELF/cfi-version.ll
+++ b/llvm/test/MC/ELF/cfi-version.ll
@@ -3,9 +3,6 @@
 ; RUN: %llc_dwarf %s -o - -dwarf-version 4 -filetype=obj | llvm-dwarfdump -v - | FileCheck %s --check-prefix=DWARF4
 ; RUN: %llc_dwarf %s -o - -dwarf-version 5 -filetype=obj | llvm-dwarfdump -v - | FileCheck %s --check-prefix=DWARF4
 
-; PR46647
-; XFAIL: arm64-apple
-
 ; .debug_frame is not emitted for targeting Windows x64, aarch64/arm64, or AIX.
 ; REQUIRES: debug_frame
 ; REQUIRES: object-emission

diff  --git a/llvm/test/lit.cfg.py b/llvm/test/lit.cfg.py
index bdbfbae9917b3..1da6274de0963 100644
--- a/llvm/test/lit.cfg.py
+++ b/llvm/test/lit.cfg.py
@@ -436,8 +436,9 @@ def have_ld64_plugin_support():
         if 'hw.optional.fma: 1' in result:
             config.available_features.add('fma3')
 
-# .debug_frame is not emitted for targeting Windows x64, aarch64/arm64, or AIX.
-if not re.match(r'^(x86_64|aarch64|arm64|powerpc|powerpc64).*-(windows-gnu|windows-msvc|aix)', config.target_triple):
+# .debug_frame is not emitted for targeting Windows x64, aarch64/arm64, AIX, or Apple Silicon Mac.
+if not re.match(r'^(x86_64|aarch64|arm64|powerpc|powerpc64).*-(windows-gnu|windows-msvc|aix)', config.target_triple) \
+    and not re.match(r'^arm64(e)?-apple-(macos|darwin)', config.target_triple):
     config.available_features.add('debug_frame')
 
 if config.have_libxar: