From 532c206141e5f85426a832d408772aedd98f6491 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Tue, 11 Oct 2022 10:26:00 -0400 Subject: [PATCH] [gn build] Reformat all build files Ran: git ls-files '*.gn' '*.gni' | xargs llvm/utils/gn/gn.py format --- llvm/utils/gn/build/compiled_action.gni | 5 ++--- llvm/utils/gn/secondary/clang-tools-extra/pseudo/include/BUILD.gn | 2 +- .../utils/gn/secondary/clang-tools-extra/pseudo/lib/grammar/BUILD.gn | 1 - llvm/utils/gn/secondary/clang/lib/Analysis/FlowSensitive/BUILD.gn | 2 +- .../lldb/source/Plugins/DynamicLoader/Darwin-Kernel/BUILD.gn | 1 + llvm/utils/gn/secondary/lldb/source/Target/BUILD.gn | 2 +- llvm/utils/gn/secondary/llvm/tools/llvm-dwarfutil/BUILD.gn | 2 +- llvm/utils/gn/secondary/llvm/unittests/BUILD.gn | 2 +- llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/BUILD.gn | 4 +--- 9 files changed, 9 insertions(+), 12 deletions(-) diff --git a/llvm/utils/gn/build/compiled_action.gni b/llvm/utils/gn/build/compiled_action.gni index 697fe3d..599ab31f 100644 --- a/llvm/utils/gn/build/compiled_action.gni +++ b/llvm/utils/gn/build/compiled_action.gni @@ -64,11 +64,10 @@ template("compiled_action") { "visibility", ]) host_tool = invoker.tool + "($host_toolchain)" - host_executable = get_label_info(host_tool, "root_out_dir") + - "/bin/" + get_label_info(host_tool, "name") + host_executable = get_label_info(host_tool, "root_out_dir") + "/bin/" + + get_label_info(host_tool, "name") deps = [ host_tool ] script = "//llvm/utils/gn/build/run_built_binary.py" args = [ rebase_path(host_executable, root_build_dir) ] + invoker.args } } - diff --git a/llvm/utils/gn/secondary/clang-tools-extra/pseudo/include/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/pseudo/include/BUILD.gn index 8a86255..a38d7d0 100644 --- a/llvm/utils/gn/secondary/clang-tools-extra/pseudo/include/BUILD.gn +++ b/llvm/utils/gn/secondary/clang-tools-extra/pseudo/include/BUILD.gn @@ -30,8 +30,8 @@ config("cxx_gen_config") { group("cxx_gen") { deps = [ - ":CXXSymbols.inc", ":CXXBNF.inc", + ":CXXSymbols.inc", ] # Let targets depending on this find the generated files. diff --git a/llvm/utils/gn/secondary/clang-tools-extra/pseudo/lib/grammar/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/pseudo/lib/grammar/BUILD.gn index d737870..6407a73 100644 --- a/llvm/utils/gn/secondary/clang-tools-extra/pseudo/lib/grammar/BUILD.gn +++ b/llvm/utils/gn/secondary/clang-tools-extra/pseudo/lib/grammar/BUILD.gn @@ -11,4 +11,3 @@ static_library("grammar") { "LRTableBuild.cpp", ] } - diff --git a/llvm/utils/gn/secondary/clang/lib/Analysis/FlowSensitive/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Analysis/FlowSensitive/BUILD.gn index e8220a0..f5f58a5 100644 --- a/llvm/utils/gn/secondary/clang/lib/Analysis/FlowSensitive/BUILD.gn +++ b/llvm/utils/gn/secondary/clang/lib/Analysis/FlowSensitive/BUILD.gn @@ -9,9 +9,9 @@ static_library("FlowSensitive") { "ControlFlowContext.cpp", "DataflowAnalysisContext.cpp", "DataflowEnvironment.cpp", + "DebugSupport.cpp", "Transfer.cpp", "TypeErasedDataflowAnalysis.cpp", "WatchedLiteralsSolver.cpp", - "DebugSupport.cpp", ] } diff --git a/llvm/utils/gn/secondary/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/BUILD.gn b/llvm/utils/gn/secondary/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/BUILD.gn index e7c8a24..61b6020 100644 --- a/llvm/utils/gn/secondary/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/BUILD.gn +++ b/llvm/utils/gn/secondary/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/BUILD.gn @@ -22,6 +22,7 @@ static_library("Darwin-Kernel") { "//lldb/source/Symbol", "//lldb/source/Target", "//lldb/source/Utility", + # "//lldb/source/Plugins/Platform/MacOSX", # Dependency cycle "//llvm/lib/Support", ] diff --git a/llvm/utils/gn/secondary/lldb/source/Target/BUILD.gn b/llvm/utils/gn/secondary/lldb/source/Target/BUILD.gn index 211742d..fc8528d 100644 --- a/llvm/utils/gn/secondary/lldb/source/Target/BUILD.gn +++ b/llvm/utils/gn/secondary/lldb/source/Target/BUILD.gn @@ -94,8 +94,8 @@ static_library("Target") { "ThreadSpec.cpp", "Trace.cpp", "TraceCursor.cpp", - "TraceExporter.cpp", "TraceDumper.cpp", + "TraceExporter.cpp", "UnixSignals.cpp", "UnwindAssembly.cpp", "UnwindLLDB.cpp", diff --git a/llvm/utils/gn/secondary/llvm/tools/llvm-dwarfutil/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-dwarfutil/BUILD.gn index 9d0c000..2283581 100644 --- a/llvm/utils/gn/secondary/llvm/tools/llvm-dwarfutil/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/tools/llvm-dwarfutil/BUILD.gn @@ -21,7 +21,7 @@ executable("llvm-dwarfutil") { "//llvm/lib/Target:AllTargetsInfos", ] sources = [ - "llvm-dwarfutil.cpp", "DebugInfoLinker.cpp", + "llvm-dwarfutil.cpp", ] } diff --git a/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn index 9be3fb5..ff79573 100644 --- a/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn @@ -53,8 +53,8 @@ group("unittests") { "XRay:XRayTests", "tools/llvm-cfi-verify:CFIVerifyTests", "tools/llvm-exegesis:LLVMExegesisTests", - "tools/llvm-profgen:LLVMProfgenTests", "tools/llvm-mca:LLVMMCATests", + "tools/llvm-profgen:LLVMProfgenTests", ] # Target-dependent unit tests. diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/BUILD.gn index 800dcab..9d79fb7 100644 --- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/BUILD.gn @@ -12,9 +12,7 @@ unittest("LLVMMCATests") { deps += [ "X86" ] } - sources = [ - "MCATestBase.cpp", - ] + sources = [ "MCATestBase.cpp" ] # FIXME: Why is this so complicated in the cmake file? mca_views_sources = [ "SummaryView.cpp" ] -- 2.7.4