diff --git a/lld/MachO/CMakeLists.txt b/lld/MachO/CMakeLists.txt
--- a/lld/MachO/CMakeLists.txt
+++ b/lld/MachO/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 include_directories(${LLVM_MAIN_SRC_DIR}/../libunwind/include)
 
-add_lld_library(lldMachO2
+add_lld_library(lldMachO
   Arch/ARM.cpp
   Arch/ARM64.cpp
   Arch/ARM64Common.cpp
@@ -58,5 +58,5 @@
   )
 
 if(LLVM_HAVE_LIBXAR)
-  target_link_libraries(lldMachO2 PRIVATE ${XAR_LIB})
+  target_link_libraries(lldMachO PRIVATE ${XAR_LIB})
 endif()
diff --git a/lld/lib/Driver/CMakeLists.txt b/lld/lib/Driver/CMakeLists.txt
--- a/lld/lib/Driver/CMakeLists.txt
+++ b/lld/lib/Driver/CMakeLists.txt
@@ -15,7 +15,7 @@
   LINK_LIBS
     lldCommon
     lldCore
-    lldMachO
+    lldMachOOld
     lldReaderWriter
     lldYAML
   )
diff --git a/lld/lib/ReaderWriter/MachO/CMakeLists.txt b/lld/lib/ReaderWriter/MachO/CMakeLists.txt
--- a/lld/lib/ReaderWriter/MachO/CMakeLists.txt
+++ b/lld/lib/ReaderWriter/MachO/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lld_library(lldMachO
+add_lld_library(lldMachOOld
   ArchHandler.cpp
   ArchHandler_arm.cpp
   ArchHandler_arm64.cpp
diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt
--- a/lld/tools/lld/CMakeLists.txt
+++ b/lld/tools/lld/CMakeLists.txt
@@ -15,7 +15,7 @@
   lldCOFF
   lldDriver
   lldELF
-  lldMachO2
+  lldMachO
   lldMinGW
   lldWasm
   )
diff --git a/lld/unittests/DriverTests/CMakeLists.txt b/lld/unittests/DriverTests/CMakeLists.txt
--- a/lld/unittests/DriverTests/CMakeLists.txt
+++ b/lld/unittests/DriverTests/CMakeLists.txt
@@ -5,5 +5,5 @@
 target_link_libraries(DriverTests
   PRIVATE
   lldDriver
-  lldMachO
+  lldMachOOld
   )
diff --git a/lld/unittests/MachOTests/CMakeLists.txt b/lld/unittests/MachOTests/CMakeLists.txt
--- a/lld/unittests/MachOTests/CMakeLists.txt
+++ b/lld/unittests/MachOTests/CMakeLists.txt
@@ -1,14 +1,14 @@
 
-add_lld_unittest(lldMachOTests
+add_lld_unittest(lldMachOOldTests
   MachONormalizedFileBinaryReaderTests.cpp
   MachONormalizedFileBinaryWriterTests.cpp
   MachONormalizedFileToAtomsTests.cpp
   MachONormalizedFileYAMLTests.cpp
   )
 
-target_link_libraries(lldMachOTests
+target_link_libraries(lldMachOOldTests
   PRIVATE
   lldDriver
-  lldMachO
+  lldMachOOld
   lldYAML
   )
diff --git a/llvm/utils/gn/secondary/lld/MachO/BUILD.gn b/llvm/utils/gn/secondary/lld/MachO/BUILD.gn
--- a/llvm/utils/gn/secondary/lld/MachO/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/MachO/BUILD.gn
@@ -1,12 +1,12 @@
 import("//llvm/utils/TableGen/tablegen.gni")
 
 tablegen("Options") {
-  visibility = [ ":MachO2" ]
+  visibility = [ ":MachO" ]
   args = [ "-gen-opt-parser-defs" ]
 }
 
-static_library("MachO2") {
-  output_name = "lldMachO2"
+static_library("MachO") {
+  output_name = "lldMachO"
   configs += [ "//llvm/utils/gn/build:lld_code" ]
   deps = [
     ":Options",
diff --git a/llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn b/llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn
--- a/llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn
@@ -13,7 +13,7 @@
     "//lld/Common",
     "//lld/lib/Core",
     "//lld/lib/ReaderWriter",
-    "//lld/lib/ReaderWriter/MachO",
+    "//lld/lib/ReaderWriter/MachO:MachOOld",
     "//lld/lib/ReaderWriter/YAML",
     "//llvm/lib/Option",
     "//llvm/lib/Support",
diff --git a/llvm/utils/gn/secondary/lld/lib/ReaderWriter/MachO/BUILD.gn b/llvm/utils/gn/secondary/lld/lib/ReaderWriter/MachO/BUILD.gn
--- a/llvm/utils/gn/secondary/lld/lib/ReaderWriter/MachO/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/lib/ReaderWriter/MachO/BUILD.gn
@@ -1,5 +1,5 @@
-static_library("MachO") {
-  output_name = "lldMachO"
+static_library("MachOOld") {
+  output_name = "lldMachOOld"
   configs += [ "//llvm/utils/gn/build:lld_code" ]
   deps = [
     "//lld/lib/Core",
diff --git a/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn b/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
--- a/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
@@ -29,7 +29,7 @@
   deps = [
     "//lld/COFF",
     "//lld/ELF",
-    "//lld/MachO:MachO2",
+    "//lld/MachO:MachO",
     "//lld/MinGW",
     "//lld/lib/Driver",
     "//lld/wasm",
diff --git a/llvm/utils/gn/secondary/lld/unittests/BUILD.gn b/llvm/utils/gn/secondary/lld/unittests/BUILD.gn
--- a/llvm/utils/gn/secondary/lld/unittests/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/unittests/BUILD.gn
@@ -1,7 +1,7 @@
 group("unittests") {
   deps = [
     "DriverTests",
-    "MachOTests",
+    "MachOTests:MachOOldTests",
   ]
   testonly = true
 }
diff --git a/llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn b/llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn
--- a/llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn
@@ -4,7 +4,7 @@
   configs += [ "//llvm/utils/gn/build:lld_code" ]
   deps = [
     "//lld/lib/Driver",
-    "//lld/lib/ReaderWriter/MachO",
+    "//lld/lib/ReaderWriter/MachO:MachOOld",
   ]
   sources = [ "DarwinLdDriverTest.cpp" ]
 }
diff --git a/llvm/utils/gn/secondary/lld/unittests/MachOTests/BUILD.gn b/llvm/utils/gn/secondary/lld/unittests/MachOTests/BUILD.gn
--- a/llvm/utils/gn/secondary/lld/unittests/MachOTests/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/unittests/MachOTests/BUILD.gn
@@ -1,10 +1,10 @@
 import("//llvm/utils/unittest/unittest.gni")
 
-unittest("MachOTests") {
+unittest("MachOOldTests") {
   configs += [ "//llvm/utils/gn/build:lld_code" ]
   deps = [
     "//lld/lib/Driver",
-    "//lld/lib/ReaderWriter/MachO",
+    "//lld/lib/ReaderWriter/MachO:MachOOld",
     "//lld/lib/ReaderWriter/YAML",
   ]
   sources = [