[lld] 7a64822 - [CMake][gn] lldMachO=>lldMachOOld, lldMachO2=>lldMachO
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Wed Aug 4 18:52:47 PDT 2021
Author: Fangrui Song
Date: 2021-08-04T18:52:41-07:00
New Revision: 7a6482216ff02f81ed02ff4936f1b22d4b5a9a6c
URL: https://github.com/llvm/llvm-project/commit/7a6482216ff02f81ed02ff4936f1b22d4b5a9a6c
DIFF: https://github.com/llvm/llvm-project/commit/7a6482216ff02f81ed02ff4936f1b22d4b5a9a6c.diff
LOG: [CMake][gn] lldMachO=>lldMachOOld, lldMachO2=>lldMachO
Now that D95204 switched default to new Darwin backend, rename some CMake
targets to match.
Reviewed By: #lld-macho, smeenai, int3
Differential Revision: https://reviews.llvm.org/D107516
Added:
Modified:
lld/MachO/CMakeLists.txt
lld/lib/Driver/CMakeLists.txt
lld/lib/ReaderWriter/MachO/CMakeLists.txt
lld/tools/lld/CMakeLists.txt
lld/unittests/DriverTests/CMakeLists.txt
lld/unittests/MachOTests/CMakeLists.txt
llvm/utils/gn/secondary/lld/MachO/BUILD.gn
llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn
llvm/utils/gn/secondary/lld/lib/ReaderWriter/MachO/BUILD.gn
llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
llvm/utils/gn/secondary/lld/unittests/BUILD.gn
llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn
llvm/utils/gn/secondary/lld/unittests/MachOTests/BUILD.gn
Removed:
################################################################################
diff --git a/lld/MachO/CMakeLists.txt b/lld/MachO/CMakeLists.txt
index eff1812a6bb2..a524544045c2 100644
--- a/lld/MachO/CMakeLists.txt
+++ b/lld/MachO/CMakeLists.txt
@@ -4,7 +4,7 @@ add_public_tablegen_target(MachOOptionsTableGen)
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 @@ add_lld_library(lldMachO2
)
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
index ff67c282f47e..afc0bd1187f8 100644
--- a/lld/lib/Driver/CMakeLists.txt
+++ b/lld/lib/Driver/CMakeLists.txt
@@ -15,7 +15,7 @@ add_lld_library(lldDriver
LINK_LIBS
lldCommon
lldCore
- lldMachO
+ lldMachOOld
lldReaderWriter
lldYAML
)
diff --git a/lld/lib/ReaderWriter/MachO/CMakeLists.txt b/lld/lib/ReaderWriter/MachO/CMakeLists.txt
index bdbfbee74686..c3e2497b8c9e 100644
--- 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
index e77b2161a873..b0b24a007214 100644
--- a/lld/tools/lld/CMakeLists.txt
+++ b/lld/tools/lld/CMakeLists.txt
@@ -15,7 +15,7 @@ target_link_libraries(lld
lldCOFF
lldDriver
lldELF
- lldMachO2
+ lldMachO
lldMinGW
lldWasm
)
diff --git a/lld/unittests/DriverTests/CMakeLists.txt b/lld/unittests/DriverTests/CMakeLists.txt
index 7137d69e1b60..e750bf6b069b 100644
--- a/lld/unittests/DriverTests/CMakeLists.txt
+++ b/lld/unittests/DriverTests/CMakeLists.txt
@@ -5,5 +5,5 @@ add_lld_unittest(DriverTests
target_link_libraries(DriverTests
PRIVATE
lldDriver
- lldMachO
+ lldMachOOld
)
diff --git a/lld/unittests/MachOTests/CMakeLists.txt b/lld/unittests/MachOTests/CMakeLists.txt
index b2b22fb089c3..7cc71380cd62 100644
--- 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
index 6ed0221c5c05..086a71a5b948 100644
--- 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
index 2f20b57f43ad..298dc928bb8e 100644
--- a/llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn
@@ -13,7 +13,7 @@ static_library("Driver") {
"//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
index 746bb901a299..60a653884155 100644
--- 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
index f5934086fe0c..f3e8cb7ceacb 100644
--- a/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
@@ -29,7 +29,7 @@ executable("lld") {
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
index 275637c1ef89..7f976ddf0934 100644
--- 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
index e5cc57e8812f..4dda87fbf9b3 100644
--- a/llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn
@@ -4,7 +4,7 @@ unittest("DriverTests") {
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
index 90d0a618c309..3c63d026b6ff 100644
--- 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 = [
More information about the llvm-commits
mailing list