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 )