This is an archive of the discontinued LLVM Phabricator instance.

Differential D107516

[CMake] lldMachO=>lldMachOOld, lldMachO2=>lldMachO
ClosedPublic

Authored by MaskRay on Aug 4 2021, 5:34 PM.

Details

Reviewers
gkm
smeenai
int3
Group Reviewers
Restricted Project
Commits
rG7a6482216ff0: [CMake][gn] lldMachO=>lldMachOOld, lldMachO2=>lldMachO
Summary

Now that D95204 switched default to new Darwin backend, rename some CMake
targets to match.

Diff Detail

Event Timeline

MaskRay created this revision.Aug 4 2021, 5:34 PM
Herald added a reviewer: gkm. · View Herald TranscriptAug 4 2021, 5:34 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a subscriber: mgorny. · View Herald Transcript
MaskRay requested review of this revision.Aug 4 2021, 5:34 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 4 2021, 5:34 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
GMNGeoffrey mentioned this in D107414: [Bazel] Add support for lld.Aug 4 2021, 5:37 PM
smeenai accepted this revision.Aug 4 2021, 5:50 PM
smeenai added a subscriber: smeenai.

Thanks!

This revision is now accepted and ready to land.Aug 4 2021, 5:50 PM
Harbormaster completed remote builds in B118044: Diff 364300.Aug 4 2021, 6:03 PM
int3 accepted this revision.Aug 4 2021, 6:36 PM
Closed by commit rG7a6482216ff0: [CMake][gn] lldMachO=>lldMachOOld, lldMachO2=>lldMachO (authored by MaskRay). · Explain WhyAug 4 2021, 6:52 PM
This revision was automatically updated to reflect the committed changes.
MaskRay added a commit: rG7a6482216ff0: [CMake][gn] lldMachO=>lldMachOOld, lldMachO2=>lldMachO.

Revision Contents

PathSize
lld/
MachO/
4 lines
lib/
Driver/
2 lines
ReaderWriter/
MachO/
2 lines
tools/
lld/
2 lines
unittests/
DriverTests/
2 lines
MachOTests/
6 lines
llvm/
utils/
gn/
secondary/
lld/
MachO/
6 lines
lib/
Driver/
2 lines
ReaderWriter/
MachO/
4 lines
tools/
lld/
2 lines
unittests/
2 lines
DriverTests/
2 lines
MachOTests/
4 lines

Diff 364311

lld/MachO/CMakeLists.txt

set(LLVM_TARGET_DEFINITIONS Options.td) set(LLVM_TARGET_DEFINITIONS Options.td)
tablegen(LLVM Options.inc -gen-opt-parser-defs) tablegen(LLVM Options.inc -gen-opt-parser-defs)
add_public_tablegen_target(MachOOptionsTableGen) add_public_tablegen_target(MachOOptionsTableGen)
include_directories(${LLVM_MAIN_SRC_DIR}/../libunwind/include) include_directories(${LLVM_MAIN_SRC_DIR}/../libunwind/include)
add_lld_library(lldMachO2 add_lld_library(lldMachO
Arch/ARM.cpp Arch/ARM.cpp
Arch/ARM64.cpp Arch/ARM64.cpp
Arch/ARM64Common.cpp Arch/ARM64Common.cpp
Arch/ARM64_32.cpp Arch/ARM64_32.cpp
Arch/X86_64.cpp Arch/X86_64.cpp
ConcatOutputSection.cpp ConcatOutputSection.cpp
Driver.cpp Driver.cpp
DriverUtils.cpp DriverUtils.cpp
Show All 37 Linesadd_lld_library(lldMachO
${XAR_LIB} ${XAR_LIB}
DEPENDS DEPENDS
MachOOptionsTableGen MachOOptionsTableGen
${tablegen_deps} ${tablegen_deps}
) )
if(LLVM_HAVE_LIBXAR) if(LLVM_HAVE_LIBXAR)
target_link_libraries(lldMachO2 PRIVATE ${XAR_LIB}) target_link_libraries(lldMachO PRIVATE ${XAR_LIB})
endif() endif()

lld/lib/Driver/CMakeLists.txt

Show All 9 Linesadd_lld_library(lldDriver
LINK_COMPONENTS LINK_COMPONENTS
Option Option
Support Support
LINK_LIBS LINK_LIBS
lldCommon lldCommon
lldCore lldCore
lldMachO lldMachOOld
lldReaderWriter lldReaderWriter
lldYAML lldYAML
) )
add_dependencies(lldDriver DriverOptionsTableGen) add_dependencies(lldDriver DriverOptionsTableGen)

lld/lib/ReaderWriter/MachO/CMakeLists.txt

add_lld_library(lldMachO add_lld_library(lldMachOOld
ArchHandler.cpp ArchHandler.cpp
ArchHandler_arm.cpp ArchHandler_arm.cpp
ArchHandler_arm64.cpp ArchHandler_arm64.cpp
ArchHandler_x86.cpp ArchHandler_x86.cpp
ArchHandler_x86_64.cpp ArchHandler_x86_64.cpp
CompactUnwindPass.cpp CompactUnwindPass.cpp
GOTPass.cpp GOTPass.cpp
LayoutPass.cpp LayoutPass.cpp
Show All 27 Lines

lld/tools/lld/CMakeLists.txt

Show All 9 Lines
export_executable_symbols_for_plugins(lld) export_executable_symbols_for_plugins(lld)
target_link_libraries(lld target_link_libraries(lld
PRIVATE PRIVATE
lldCommon lldCommon
lldCOFF lldCOFF
lldDriver lldDriver
lldELF lldELF
lldMachO2 lldMachO
lldMinGW lldMinGW
lldWasm lldWasm
) )
install(TARGETS lld install(TARGETS lld
RUNTIME DESTINATION bin) RUNTIME DESTINATION bin)
if(NOT LLD_SYMLINKS_TO_CREATE) if(NOT LLD_SYMLINKS_TO_CREATE)
set(LLD_SYMLINKS_TO_CREATE set(LLD_SYMLINKS_TO_CREATE
lld-link ld.lld ld64.lld ld64.lld.darwinnew ld64.lld.darwinold wasm-ld) lld-link ld.lld ld64.lld ld64.lld.darwinnew ld64.lld.darwinold wasm-ld)
endif() endif()
foreach(link ${LLD_SYMLINKS_TO_CREATE}) foreach(link ${LLD_SYMLINKS_TO_CREATE})
add_lld_symlink(${link} lld) add_lld_symlink(${link} lld)
endforeach() endforeach()

lld/unittests/DriverTests/CMakeLists.txt

add_lld_unittest(DriverTests add_lld_unittest(DriverTests
DarwinLdDriverTest.cpp DarwinLdDriverTest.cpp
) )
target_link_libraries(DriverTests target_link_libraries(DriverTests
PRIVATE PRIVATE
lldDriver lldDriver
lldMachO lldMachOOld
) )

lld/unittests/MachOTests/CMakeLists.txt

add_lld_unittest(lldMachOTests add_lld_unittest(lldMachOOldTests
MachONormalizedFileBinaryReaderTests.cpp MachONormalizedFileBinaryReaderTests.cpp
MachONormalizedFileBinaryWriterTests.cpp MachONormalizedFileBinaryWriterTests.cpp
MachONormalizedFileToAtomsTests.cpp MachONormalizedFileToAtomsTests.cpp
MachONormalizedFileYAMLTests.cpp MachONormalizedFileYAMLTests.cpp
) )
target_link_libraries(lldMachOTests target_link_libraries(lldMachOOldTests
PRIVATE PRIVATE
lldDriver lldDriver
lldMachO lldMachOOld
lldYAML lldYAML
) )

llvm/utils/gn/secondary/lld/MachO/BUILD.gn

import("//llvm/utils/TableGen/tablegen.gni") import("//llvm/utils/TableGen/tablegen.gni")
tablegen("Options") { tablegen("Options") {
visibility = [ ":MachO2" ] visibility = [ ":MachO" ]
args = [ "-gen-opt-parser-defs" ] args = [ "-gen-opt-parser-defs" ]
} }
static_library("MachO2") { static_library("MachO") {
output_name = "lldMachO2" output_name = "lldMachO"
configs += [ "//llvm/utils/gn/build:lld_code" ] configs += [ "//llvm/utils/gn/build:lld_code" ]
deps = [ deps = [
":Options", ":Options",
"//lld/Common", "//lld/Common",
"//llvm/lib/BinaryFormat", "//llvm/lib/BinaryFormat",
"//llvm/lib/Object", "//llvm/lib/Object",
"//llvm/lib/Option", "//llvm/lib/Option",
"//llvm/lib/Support", "//llvm/lib/Support",
Show All 35 Lines

llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn

import("//llvm/utils/TableGen/tablegen.gni") import("//llvm/utils/TableGen/tablegen.gni")
tablegen("DarwinLdOptions") { tablegen("DarwinLdOptions") {
visibility = [ ":Driver" ] visibility = [ ":Driver" ]
args = [ "-gen-opt-parser-defs" ] args = [ "-gen-opt-parser-defs" ]
} }
static_library("Driver") { static_library("Driver") {
output_name = "lldDriver" output_name = "lldDriver"
configs += [ "//llvm/utils/gn/build:lld_code" ] configs += [ "//llvm/utils/gn/build:lld_code" ]
deps = [ deps = [
":DarwinLdOptions", ":DarwinLdOptions",
"//lld/Common", "//lld/Common",
"//lld/lib/Core", "//lld/lib/Core",
"//lld/lib/ReaderWriter", "//lld/lib/ReaderWriter",
"//lld/lib/ReaderWriter/MachO", "//lld/lib/ReaderWriter/MachO:MachOOld",
"//lld/lib/ReaderWriter/YAML", "//lld/lib/ReaderWriter/YAML",
"//llvm/lib/Option", "//llvm/lib/Option",
"//llvm/lib/Support", "//llvm/lib/Support",
] ]
sources = [ "DarwinLdDriver.cpp" ] sources = [ "DarwinLdDriver.cpp" ]
} }

llvm/utils/gn/secondary/lld/lib/ReaderWriter/MachO/BUILD.gn

static_library("MachO") { static_library("MachOOld") {
output_name = "lldMachO" output_name = "lldMachOOld"
configs += [ "//llvm/utils/gn/build:lld_code" ] configs += [ "//llvm/utils/gn/build:lld_code" ]
deps = [ deps = [
"//lld/lib/Core", "//lld/lib/Core",
"//lld/lib/ReaderWriter/YAML", "//lld/lib/ReaderWriter/YAML",
"//llvm/lib/DebugInfo/DWARF", "//llvm/lib/DebugInfo/DWARF",
"//llvm/lib/Demangle", "//llvm/lib/Demangle",
"//llvm/lib/Object", "//llvm/lib/Object",
"//llvm/lib/Support", "//llvm/lib/Support",
Show All 23 Lines

llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn

Show All 23 Linesgroup("symlinks") {
} }
} }
executable("lld") { executable("lld") {
configs += [ "//llvm/utils/gn/build:lld_code" ] configs += [ "//llvm/utils/gn/build:lld_code" ]
deps = [ deps = [
"//lld/COFF", "//lld/COFF",
"//lld/ELF", "//lld/ELF",
"//lld/MachO:MachO2", "//lld/MachO:MachO",
"//lld/MinGW", "//lld/MinGW",
"//lld/lib/Driver", "//lld/lib/Driver",
"//lld/wasm", "//lld/wasm",
"//llvm/lib/Support", "//llvm/lib/Support",
"//llvm/utils/gn/build/libs/xar", "//llvm/utils/gn/build/libs/xar",
] ]
sources = [ "lld.cpp" ] sources = [ "lld.cpp" ]
} }

llvm/utils/gn/secondary/lld/unittests/BUILD.gn

group("unittests") { group("unittests") {
deps = [ deps = [
"DriverTests", "DriverTests",
"MachOTests", "MachOTests:MachOOldTests",
] ]
testonly = true testonly = true
} }

llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn

import("//llvm/utils/unittest/unittest.gni") import("//llvm/utils/unittest/unittest.gni")
unittest("DriverTests") { unittest("DriverTests") {
configs += [ "//llvm/utils/gn/build:lld_code" ] configs += [ "//llvm/utils/gn/build:lld_code" ]
deps = [ deps = [
"//lld/lib/Driver", "//lld/lib/Driver",
"//lld/lib/ReaderWriter/MachO", "//lld/lib/ReaderWriter/MachO:MachOOld",
] ]
sources = [ "DarwinLdDriverTest.cpp" ] sources = [ "DarwinLdDriverTest.cpp" ]
} }

llvm/utils/gn/secondary/lld/unittests/MachOTests/BUILD.gn

import("//llvm/utils/unittest/unittest.gni") import("//llvm/utils/unittest/unittest.gni")
unittest("MachOTests") { unittest("MachOOldTests") {
configs += [ "//llvm/utils/gn/build:lld_code" ] configs += [ "//llvm/utils/gn/build:lld_code" ]
deps = [ deps = [
"//lld/lib/Driver", "//lld/lib/Driver",
"//lld/lib/ReaderWriter/MachO", "//lld/lib/ReaderWriter/MachO:MachOOld",
"//lld/lib/ReaderWriter/YAML", "//lld/lib/ReaderWriter/YAML",
] ]
sources = [ sources = [
"MachONormalizedFileBinaryReaderTests.cpp", "MachONormalizedFileBinaryReaderTests.cpp",
"MachONormalizedFileBinaryWriterTests.cpp", "MachONormalizedFileBinaryWriterTests.cpp",
"MachONormalizedFileToAtomsTests.cpp", "MachONormalizedFileToAtomsTests.cpp",
"MachONormalizedFileYAMLTests.cpp", "MachONormalizedFileYAMLTests.cpp",
] ]
} }