From b87fe58dce17c37a56eae4f2c1af4eeb41a490a4 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Thu, 2 Dec 2021 15:00:40 -0500 Subject: [PATCH] [gn build] (manually) port 9e3552523ebd (no more old mach-o lld) --- llvm/utils/gn/secondary/lld/lib/Core/BUILD.gn | 20 ------------- llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn | 22 --------------- .../gn/secondary/lld/lib/ReaderWriter/BUILD.gn | 15 ---------- .../secondary/lld/lib/ReaderWriter/MachO/BUILD.gn | 33 ---------------------- .../secondary/lld/lib/ReaderWriter/YAML/BUILD.gn | 9 ------ llvm/utils/gn/secondary/lld/test/BUILD.gn | 1 - llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn | 1 - llvm/utils/gn/secondary/lld/unittests/BUILD.gn | 7 ----- .../secondary/lld/unittests/DriverTests/BUILD.gn | 10 ------- .../gn/secondary/lld/unittests/MachOTests/BUILD.gn | 16 ----------- 10 files changed, 134 deletions(-) delete mode 100644 llvm/utils/gn/secondary/lld/lib/Core/BUILD.gn delete mode 100644 llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn delete mode 100644 llvm/utils/gn/secondary/lld/lib/ReaderWriter/BUILD.gn delete mode 100644 llvm/utils/gn/secondary/lld/lib/ReaderWriter/MachO/BUILD.gn delete mode 100644 llvm/utils/gn/secondary/lld/lib/ReaderWriter/YAML/BUILD.gn delete mode 100644 llvm/utils/gn/secondary/lld/unittests/BUILD.gn delete mode 100644 llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn delete mode 100644 llvm/utils/gn/secondary/lld/unittests/MachOTests/BUILD.gn diff --git a/llvm/utils/gn/secondary/lld/lib/Core/BUILD.gn b/llvm/utils/gn/secondary/lld/lib/Core/BUILD.gn deleted file mode 100644 index a1c974d..0000000 --- a/llvm/utils/gn/secondary/lld/lib/Core/BUILD.gn +++ /dev/null @@ -1,20 +0,0 @@ -static_library("Core") { - output_name = "lldCore" - configs += [ "//llvm/utils/gn/build:lld_code" ] - deps = [ - "//llvm/lib/BinaryFormat", - "//llvm/lib/MC", - "//llvm/lib/Support", - "//llvm/utils/gn/build/libs/pthread", - ] - sources = [ - "DefinedAtom.cpp", - "Error.cpp", - "File.cpp", - "LinkingContext.cpp", - "Reader.cpp", - "Resolver.cpp", - "SymbolTable.cpp", - "Writer.cpp", - ] -} diff --git a/llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn b/llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn deleted file mode 100644 index 298dc92..0000000 --- a/llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn +++ /dev/null @@ -1,22 +0,0 @@ -import("//llvm/utils/TableGen/tablegen.gni") - -tablegen("DarwinLdOptions") { - visibility = [ ":Driver" ] - args = [ "-gen-opt-parser-defs" ] -} - -static_library("Driver") { - output_name = "lldDriver" - configs += [ "//llvm/utils/gn/build:lld_code" ] - deps = [ - ":DarwinLdOptions", - "//lld/Common", - "//lld/lib/Core", - "//lld/lib/ReaderWriter", - "//lld/lib/ReaderWriter/MachO:MachOOld", - "//lld/lib/ReaderWriter/YAML", - "//llvm/lib/Option", - "//llvm/lib/Support", - ] - sources = [ "DarwinLdDriver.cpp" ] -} diff --git a/llvm/utils/gn/secondary/lld/lib/ReaderWriter/BUILD.gn b/llvm/utils/gn/secondary/lld/lib/ReaderWriter/BUILD.gn deleted file mode 100644 index 295a68e..0000000 --- a/llvm/utils/gn/secondary/lld/lib/ReaderWriter/BUILD.gn +++ /dev/null @@ -1,15 +0,0 @@ -static_library("ReaderWriter") { - output_name = "lldReaderWriter" - configs += [ "//llvm/utils/gn/build:lld_code" ] - deps = [ - "//lld/lib/Core", - "//llvm/lib/Object", - "//llvm/lib/Support", - ] - sources = [ "FileArchive.cpp" ] - - # FIXME: - # if (is_msvc) { - # cflags = [ "-wd4062" ] - # } -} diff --git a/llvm/utils/gn/secondary/lld/lib/ReaderWriter/MachO/BUILD.gn b/llvm/utils/gn/secondary/lld/lib/ReaderWriter/MachO/BUILD.gn deleted file mode 100644 index 60a6538..0000000 --- a/llvm/utils/gn/secondary/lld/lib/ReaderWriter/MachO/BUILD.gn +++ /dev/null @@ -1,33 +0,0 @@ -static_library("MachOOld") { - output_name = "lldMachOOld" - configs += [ "//llvm/utils/gn/build:lld_code" ] - deps = [ - "//lld/lib/Core", - "//lld/lib/ReaderWriter/YAML", - "//llvm/lib/DebugInfo/DWARF", - "//llvm/lib/Demangle", - "//llvm/lib/Object", - "//llvm/lib/Support", - ] - sources = [ - "ArchHandler.cpp", - "ArchHandler_arm.cpp", - "ArchHandler_arm64.cpp", - "ArchHandler_x86.cpp", - "ArchHandler_x86_64.cpp", - "CompactUnwindPass.cpp", - "GOTPass.cpp", - "LayoutPass.cpp", - "MachOLinkingContext.cpp", - "MachONormalizedFileBinaryReader.cpp", - "MachONormalizedFileBinaryWriter.cpp", - "MachONormalizedFileFromAtoms.cpp", - "MachONormalizedFileToAtoms.cpp", - "MachONormalizedFileYAML.cpp", - "ObjCPass.cpp", - "ShimPass.cpp", - "StubsPass.cpp", - "TLVPass.cpp", - "WriterMachO.cpp", - ] -} diff --git a/llvm/utils/gn/secondary/lld/lib/ReaderWriter/YAML/BUILD.gn b/llvm/utils/gn/secondary/lld/lib/ReaderWriter/YAML/BUILD.gn deleted file mode 100644 index c3339ef..0000000 --- a/llvm/utils/gn/secondary/lld/lib/ReaderWriter/YAML/BUILD.gn +++ /dev/null @@ -1,9 +0,0 @@ -static_library("YAML") { - output_name = "lldYAML" - configs += [ "//llvm/utils/gn/build:lld_code" ] - deps = [ - "//lld/lib/Core", - "//llvm/lib/Support", - ] - sources = [ "ReaderWriterYAML.cpp" ] -} diff --git a/llvm/utils/gn/secondary/lld/test/BUILD.gn b/llvm/utils/gn/secondary/lld/test/BUILD.gn index 7bfbb304..9d12327 100644 --- a/llvm/utils/gn/secondary/lld/test/BUILD.gn +++ b/llvm/utils/gn/secondary/lld/test/BUILD.gn @@ -93,7 +93,6 @@ group("test") { ":lit_site_cfg", ":lit_unit_site_cfg", "//lld/tools/lld:symlinks", - "//lld/unittests", "//llvm/tools/dsymutil", "//llvm/tools/llc", "//llvm/tools/llvm-ar:symlinks", diff --git a/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn b/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn index bbf992a..2689038 100644 --- a/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn +++ b/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn @@ -29,7 +29,6 @@ executable("lld") { "//lld/ELF", "//lld/MachO:MachO", "//lld/MinGW", - "//lld/lib/Driver", "//lld/wasm", "//llvm/lib/Support", "//llvm/utils/gn/build/libs/xar", diff --git a/llvm/utils/gn/secondary/lld/unittests/BUILD.gn b/llvm/utils/gn/secondary/lld/unittests/BUILD.gn deleted file mode 100644 index 7f976dd..0000000 --- a/llvm/utils/gn/secondary/lld/unittests/BUILD.gn +++ /dev/null @@ -1,7 +0,0 @@ -group("unittests") { - deps = [ - "DriverTests", - "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 deleted file mode 100644 index 4dda87f..0000000 --- a/llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn +++ /dev/null @@ -1,10 +0,0 @@ -import("//llvm/utils/unittest/unittest.gni") - -unittest("DriverTests") { - configs += [ "//llvm/utils/gn/build:lld_code" ] - deps = [ - "//lld/lib/Driver", - "//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 deleted file mode 100644 index 3c63d02..0000000 --- a/llvm/utils/gn/secondary/lld/unittests/MachOTests/BUILD.gn +++ /dev/null @@ -1,16 +0,0 @@ -import("//llvm/utils/unittest/unittest.gni") - -unittest("MachOOldTests") { - configs += [ "//llvm/utils/gn/build:lld_code" ] - deps = [ - "//lld/lib/Driver", - "//lld/lib/ReaderWriter/MachO:MachOOld", - "//lld/lib/ReaderWriter/YAML", - ] - sources = [ - "MachONormalizedFileBinaryReaderTests.cpp", - "MachONormalizedFileBinaryWriterTests.cpp", - "MachONormalizedFileToAtomsTests.cpp", - "MachONormalizedFileYAMLTests.cpp", - ] -} -- 2.7.4