Skip to content

Commit

Permalink
[gn] Add explicit deps on TargetParser
Browse files Browse the repository at this point in the history
This diff was generated by the following script:

    #!/usr/bin/env python3
    import os, subprocess
    r = subprocess.run('git show --pretty='' --name-only f09cf34'.split(),
                       stdout=subprocess.PIPE, text=True)
    for line in r.stdout.splitlines():
      if not line.endswith('CMakeLists.txt'): continue
      gn = 'llvm/utils/gn/secondary/' + os.path.dirname(line) + '/BUILD.gn'
      if not os.path.exists(gn): continue
      with open(gn) as f:
        contents = f.read()
      if contents.count('"//llvm/lib/Support",') == 1:
        contents = contents.replace(
            '"//llvm/lib/Support",',
            '"//llvm/lib/Support", "//llvm/lib/TargetParser",')
      elif contents.count(' deps = [') == 1:
        contents = contents.replace(
            ' deps = [',
            ' deps = [ "//llvm/lib/TargetParser",')
      else:
        print('needs manual fixup:', gn)
        continue
      with open(gn, 'w') as f:
        f.write(contents)

I then manually fixed up the BUILD.gn files for Support (should not depend on
TargetParser) and TargetParser (should depend on Support) and ran `gn format`
on all touched files.
  • Loading branch information
nico committed Dec 20, 2022
1 parent 69186c5 commit 2aa998d
Show file tree
Hide file tree
Showing 210 changed files with 218 additions and 8 deletions.
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/bolt/lib/Core/BUILD.gn
Expand Up @@ -9,6 +9,7 @@ static_library("Core") {
"//llvm/lib/MC/MCDisassembler",
"//llvm/lib/Object",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
"//llvm/utils/gn/build/libs/pthread",
]
sources = [
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/bolt/lib/Passes/BUILD.gn
Expand Up @@ -7,6 +7,7 @@ static_library("Passes") {
"//llvm/lib/CodeGen/AsmPrinter",
"//llvm/lib/MC",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
"//llvm/lib/Transforms/Utils",
"//llvm/utils/gn/build/libs/pthread",
]
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/bolt/lib/Rewrite/BUILD.gn
Expand Up @@ -15,6 +15,7 @@ static_library("Rewrite") {
"//llvm/lib/MC",
"//llvm/lib/Object",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
"//llvm/utils/gn/build/libs/pthread",
]
sources = [
Expand Down
Expand Up @@ -10,6 +10,7 @@ static_library("portability") {
"//clang/lib/Lex",
"//clang/lib/Tooling",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
sources = [
"PortabilityTidyModule.cpp",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
Expand Up @@ -62,6 +62,7 @@ static_library("clangd") {
"//clang/lib/Tooling/Syntax",
"//llvm/lib/Support",
"//llvm/lib/Target:AllTargetsInfos",
"//llvm/lib/TargetParser",
"//llvm/utils/gn/build/libs/pthread",
]
include_dirs = [
Expand Down
Expand Up @@ -10,6 +10,7 @@ executable("modularize") {
"//clang/lib/Tooling",
"//llvm/lib/Option",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
sources = [
"CoverageChecker.cpp",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/lib/ARCMigrate/BUILD.gn
Expand Up @@ -12,6 +12,7 @@ static_library("ARCMigrate") {
"//clang/lib/Sema",
"//clang/lib/Serialization",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
sources = [
"ARCMT.cpp",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/lib/AST/BUILD.gn
Expand Up @@ -31,6 +31,7 @@ static_library("AST") {
"//llvm/lib/BinaryFormat",
"//llvm/lib/Frontend/OpenMP",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]

# Generated files used in public headers should be in public_deps, the rest
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
Expand Up @@ -50,6 +50,7 @@ static_library("Basic") {
"//clang/include/clang/Sema:AttrSpellingListIndex",
"//llvm/include/llvm/Config:llvm-config",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
include_dirs = [ "." ]
sources = [
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/lib/CodeGen/BUILD.gn
Expand Up @@ -27,6 +27,7 @@ static_library("CodeGen") {
"//llvm/lib/ProfileData/Coverage",
"//llvm/lib/Support",
"//llvm/lib/Target",
"//llvm/lib/TargetParser",
"//llvm/lib/Transforms/Coroutines",
"//llvm/lib/Transforms/IPO",
"//llvm/lib/Transforms/InstCombine",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/lib/CrossTU/BUILD.gn
Expand Up @@ -7,6 +7,7 @@ static_library("CrossTU") {
"//clang/lib/Frontend",
"//clang/lib/Index",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
sources = [ "CrossTranslationUnit.cpp" ]
}
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/lib/Driver/BUILD.gn
Expand Up @@ -18,6 +18,7 @@ static_library("Driver") {
"//llvm/lib/BinaryFormat",
"//llvm/lib/Option",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
"//llvm/lib/WindowsDriver",
]
public_deps = [
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/lib/ExtractAPI/BUILD.gn
Expand Up @@ -7,6 +7,7 @@ static_library("ExtractAPI") {
"//clang/lib/Frontend",
"//clang/lib/Index",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
sources = [
"API.cpp",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/lib/Frontend/BUILD.gn
Expand Up @@ -16,6 +16,7 @@ static_library("Frontend") {
"//llvm/lib/Option",
"//llvm/lib/ProfileData",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
sources = [
"ASTConsumers.cpp",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/lib/Interpreter/BUILD.gn
Expand Up @@ -20,6 +20,7 @@ static_library("Interpreter") {
"//llvm/lib/Support",
"//llvm/lib/Target",
"//llvm/lib/Target:NativeTarget",
"//llvm/lib/TargetParser",
]
sources = [
"IncrementalExecutor.cpp",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/lib/Lex/BUILD.gn
Expand Up @@ -4,6 +4,7 @@ static_library("Lex") {
deps = [
"//clang/lib/Basic",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
sources = [
"DependencyDirectivesScanner.cpp",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/lib/Parse/BUILD.gn
Expand Up @@ -12,6 +12,7 @@ static_library("Parse") {
"//llvm/lib/MC",
"//llvm/lib/MC/MCParser",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
sources = [
"ParseAST.cpp",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/lib/Sema/BUILD.gn
Expand Up @@ -29,6 +29,7 @@ static_library("Sema") {
"//llvm/lib/Frontend/OpenMP",
"//llvm/lib/MC",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
sources = [
"AnalysisBasedWarnings.cpp",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/lib/Serialization/BUILD.gn
Expand Up @@ -10,6 +10,7 @@ static_library("Serialization") {
"//clang/lib/Sema",
"//llvm/lib/Bitcode/Reader",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
sources = [
"ASTCommon.cpp",
Expand Down
Expand Up @@ -10,6 +10,7 @@ static_library("Checkers") {
"//clang/lib/Lex",
"//clang/lib/StaticAnalyzer/Core",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
include_dirs = [ "." ]
sources = [
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/lib/Tooling/BUILD.gn
Expand Up @@ -26,6 +26,7 @@ static_library("Tooling") {
"//clang/lib/Lex",
"//clang/lib/Rewrite",
"//clang/lib/Tooling/Core",
"//llvm/lib/TargetParser",
]
include_dirs = [ target_gen_dir ]
sources = [
Expand Down
Expand Up @@ -15,6 +15,7 @@ static_library("DependencyScanning") {
"//llvm/lib/IR",
"//llvm/lib/Support",
"//llvm/lib/Target:TargetsToBuild",
"//llvm/lib/TargetParser",
]
sources = [
"DependencyScanningFilesystem.cpp",
Expand Down
Expand Up @@ -10,6 +10,7 @@ executable("clang-import-test") {
"//clang/lib/Parse",
"//llvm/lib/IR",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
sources = [ "clang-import-test.cpp" ]
}
Expand Up @@ -24,6 +24,7 @@ executable("clang-linker-wrapper") {
"//llvm/lib/Support",
"//llvm/lib/Target",
"//llvm/lib/Target:TargetsToBuild",
"//llvm/lib/TargetParser",
"//llvm/lib/Transforms/Utils",
]
sources = [
Expand Down
Expand Up @@ -7,6 +7,7 @@ executable("clang-offload-bundler") {
"//llvm/lib/IR",
"//llvm/lib/Object",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
sources = [ "ClangOffloadBundler.cpp" ]
}
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/tools/driver/BUILD.gn
Expand Up @@ -69,6 +69,7 @@ driver_executable("clang") {
"//llvm/lib/Option",
"//llvm/lib/Support",
"//llvm/lib/Target:TargetsToBuild",
"//llvm/lib/TargetParser",
"//llvm/lib/Transforms/IPO",
"//llvm/lib/Transforms/InstCombine",
"//llvm/lib/Transforms/Instrumentation",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/tools/libclang/BUILD.gn
Expand Up @@ -39,6 +39,7 @@ shared_library("libclang") {
"//llvm/lib/IR",
"//llvm/lib/Support",
"//llvm/lib/Target:TargetsToBuild",
"//llvm/lib/TargetParser",
]
if (current_os == "win" || current_os == "mac") {
deps += [ ":exports" ]
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/unittests/AST/BUILD.gn
Expand Up @@ -11,6 +11,7 @@ unittest("ASTTests") {
"//clang/lib/Testing",
"//clang/lib/Tooling",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
"//llvm/lib/Testing/Support",
]
sources = [
Expand Down
Expand Up @@ -10,6 +10,7 @@ unittest("ASTMatchersTests") {
"//clang/lib/Testing",
"//clang/lib/Tooling",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
sources = [
"ASTMatchersInternalTest.cpp",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/unittests/CodeGen/BUILD.gn
Expand Up @@ -11,6 +11,7 @@ unittest("ClangCodeGenTests") {
"//clang/lib/Parse",
"//llvm/lib/IR",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
sources = [
"BufferSourceTest.cpp",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/unittests/Driver/BUILD.gn
Expand Up @@ -9,6 +9,7 @@ unittest("ClangDriverTests") {
"//llvm/lib/Option",
"//llvm/lib/Support",
"//llvm/lib/Target:TargetsToBuild",
"//llvm/lib/TargetParser",
]
sources = [
"DXCModeTest.cpp",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/unittests/Frontend/BUILD.gn
Expand Up @@ -11,6 +11,7 @@ unittest("FrontendTests") {
"//clang/lib/Lex",
"//clang/lib/Sema",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
sources = [
"ASTUnitTest.cpp",
Expand Down
Expand Up @@ -8,6 +8,7 @@ unittest("ClangReplInterpreterTests") {
"//clang/lib/Frontend",
"//clang/lib/Interpreter",
"//llvm/lib/IR",
"//llvm/lib/TargetParser",
]
sources = [
"IncrementalProcessingTest.cpp",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/clang/unittests/Tooling/BUILD.gn
Expand Up @@ -21,6 +21,7 @@ unittest("ToolingTests") {
"//clang/lib/Tooling/Transformer",
"//llvm/lib/Support",
"//llvm/lib/Target:TargetsToBuild",
"//llvm/lib/TargetParser",
"//llvm/lib/Testing/Support",
]
sources = [
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/lld/COFF/BUILD.gn
Expand Up @@ -22,6 +22,7 @@ static_library("COFF") {
"//llvm/lib/Option",
"//llvm/lib/Support",
"//llvm/lib/Target:TargetsToBuild",
"//llvm/lib/TargetParser",
"//llvm/lib/ToolDrivers/llvm-lib:LibDriver",
"//llvm/lib/WindowsDriver",
"//llvm/lib/WindowsManifest",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/lld/Common/BUILD.gn
Expand Up @@ -29,6 +29,7 @@ static_library("Common") {
"//llvm/lib/Option",
"//llvm/lib/Support",
"//llvm/lib/Target",
"//llvm/lib/TargetParser",
]
sources = [
"Args.cpp",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/lld/ELF/BUILD.gn
Expand Up @@ -20,6 +20,7 @@ static_library("ELF") {
"//llvm/lib/Option",
"//llvm/lib/Support",
"//llvm/lib/Target:TargetsToBuild",
"//llvm/lib/TargetParser",
]
include_dirs = [ "." ]
sources = [
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/lld/MachO/BUILD.gn
Expand Up @@ -16,6 +16,7 @@ static_library("MachO") {
"//llvm/lib/Option",
"//llvm/lib/Support",
"//llvm/lib/Target:TargetsToBuild",
"//llvm/lib/TargetParser",
]
include_dirs = [
".",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/lld/MinGW/BUILD.gn
Expand Up @@ -14,6 +14,7 @@ static_library("MinGW") {
"//lld/Common",
"//llvm/lib/Option",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
sources = [ "Driver.cpp" ]
}
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
Expand Up @@ -32,6 +32,7 @@ driver_executable("lld") {
"//lld/MinGW",
"//lld/wasm",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
"//llvm/utils/gn/build/libs/xar",
]
assert_no_deps = [ "//llvm/lib/Debuginfod" ]
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/lld/wasm/BUILD.gn
Expand Up @@ -16,6 +16,7 @@ static_library("wasm") {
"//llvm/lib/IR",
"//llvm/lib/Object",
"//llvm/lib/Option",
"//llvm/lib/TargetParser",
]
sources = [
"Driver.cpp",
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/lldb/source/Core/BUILD.gn
Expand Up @@ -31,6 +31,7 @@ static_library("Core") {
"//lldb/source/Utility",
"//llvm/lib/Demangle",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",

#"//lldb/source/Plugins/Language/CPlusPlus", # 3-hop dependency cycle.
#"//lldb/source/Plugins/Language/ObjC", # Many-hop dependency cycle.
Expand Down
Expand Up @@ -4,6 +4,7 @@ static_library("objcxx") {
deps = [
"//lldb/source/Utility",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]
include_dirs = [ "//lldb/source" ] # Includes internal headers from Utility.
cflags_objcc = [ "-fno-objc-exceptions" ]
Expand Down
Expand Up @@ -6,6 +6,7 @@ static_library("X86") {
"//lldb/source/Symbol",
"//lldb/source/Target",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]

# Uses source-relative paths for own includes.
Expand Down
Expand Up @@ -10,6 +10,7 @@ static_library("LLVMC") {
"//llvm/lib/MC/MCDisassembler",
"//llvm/lib/Support",
"//llvm/lib/Target:TargetsToBuild",
"//llvm/lib/TargetParser",
]
sources = [ "DisassemblerLLVMC.cpp" ]
}
Expand Up @@ -14,6 +14,7 @@ static_library("MacOSX-DYLD") {
"//lldb/source/Target",
"//lldb/source/Utility",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]

# Reaches into Plugins/LanguageRuntime/ObjC.
Expand Down
Expand Up @@ -5,6 +5,7 @@ static_library("Windows-DYLD") {
"//lldb/source/Core",
"//lldb/source/Target",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]

# Uses source-relative includes for own headers.
Expand Down
Expand Up @@ -34,6 +34,7 @@ static_library("Clang") {
#"//lldb/source/Plugins/TypeSystem/Clang", # Dependency cycle
"//llvm/lib/IR",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
"//llvm/lib/Transforms/IPO",
]

Expand Down
Expand Up @@ -7,6 +7,7 @@ static_library("Breakpad") {
"//lldb/source/Symbol",
"//lldb/source/Utility",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]

# Reaches into Plugins/Process/Utility.
Expand Down
Expand Up @@ -21,6 +21,7 @@ static_library("PECOFF") {
"//lldb/source/Target",
"//llvm/lib/BinaryFormat",
"//llvm/lib/Support",
"//llvm/lib/TargetParser",
]

# Reaches into Plugins/Process/Utility.
Expand Down

0 comments on commit 2aa998d

Please sign in to comment.