From 321ed37e4ff1121f0468f688b2a9e7b8cc5ac95a Mon Sep 17 00:00:00 2001
From: Kuba Mracek <mracek@apple.com>
Date: Mon, 1 Apr 2024 13:32:52 -0700
Subject: [PATCH 1/2] Disable lld Mach-O tests in the Swift LLVM fork

---
 lld/test/COFF/gc-dwarf-eh.s  | 5 +++++
 lld/test/MachO/lit.local.cfg | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/lld/test/COFF/gc-dwarf-eh.s b/lld/test/COFF/gc-dwarf-eh.s
index 757aa671c7693..fb7461a1e67a8 100644
--- a/lld/test/COFF/gc-dwarf-eh.s
+++ b/lld/test/COFF/gc-dwarf-eh.s
@@ -1,5 +1,10 @@
 # REQUIRES: x86
 
+# Swift LLVM fork downstream change start
+# Disable failing test
+# XFAIL: *
+# Swift LLVM fork downstream change end
+
 # RUN: llvm-mc -triple=i686-windows-gnu %s -filetype=obj -o %t.obj
 # RUN: lld-link -lldmingw -lldmap:%t.map -out:%t.exe -opt:ref -entry:main %t.obj -verbose 2>&1 | FileCheck %s
 # RUN: FileCheck %s --check-prefix=MAP --input-file=%t.map
diff --git a/lld/test/MachO/lit.local.cfg b/lld/test/MachO/lit.local.cfg
index 54ee0c1d440a3..6c8fefdc6de5d 100644
--- a/lld/test/MachO/lit.local.cfg
+++ b/lld/test/MachO/lit.local.cfg
@@ -8,6 +8,11 @@ import os
 if sys.byteorder == "big":
     config.unsupported = True
 
+# Swift LLVM fork downstream change start
+# The Swift LLVM fork of lld does not support linking Mach-O for userspace Darwin, let's disable Mach-O tests
+config.unsupported = True
+# Swift LLVM fork downstream change end
+
 # We specify the most commonly-used archs and platform versions in our tests
 # here. Tests which need different settings can just append to this, as only
 # the last value will be used.

From cf1c38f80448f277c2d05406f44a162d8c96c5a7 Mon Sep 17 00:00:00 2001
From: "Kuba (Brecka) Mracek" <mracek@apple.com>
Date: Tue, 2 Apr 2024 14:23:13 -0700
Subject: [PATCH 2/2] [embedded] Undo test change in gc-dwarf-eh.s

---
 lld/test/COFF/gc-dwarf-eh.s | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lld/test/COFF/gc-dwarf-eh.s b/lld/test/COFF/gc-dwarf-eh.s
index fb7461a1e67a8..757aa671c7693 100644
--- a/lld/test/COFF/gc-dwarf-eh.s
+++ b/lld/test/COFF/gc-dwarf-eh.s
@@ -1,10 +1,5 @@
 # REQUIRES: x86
 
-# Swift LLVM fork downstream change start
-# Disable failing test
-# XFAIL: *
-# Swift LLVM fork downstream change end
-
 # RUN: llvm-mc -triple=i686-windows-gnu %s -filetype=obj -o %t.obj
 # RUN: lld-link -lldmingw -lldmap:%t.map -out:%t.exe -opt:ref -entry:main %t.obj -verbose 2>&1 | FileCheck %s
 # RUN: FileCheck %s --check-prefix=MAP --input-file=%t.map