Skip to content

Commit

Permalink
[gn build] Reformat all files
Browse files Browse the repository at this point in the history
Ran `git ls-files '*.gn' '*.gni' | xargs llvm/utils/gn/gn.py format`.
No behavior change.
  • Loading branch information
nico committed Nov 5, 2021
1 parent a00944e commit cf838eb
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 16 deletions.
3 changes: 2 additions & 1 deletion llvm/utils/gn/build/BUILD.gn
Expand Up @@ -370,7 +370,8 @@ config("no_rtti") {
config("zdefs") {
# -Wl,-z,defs doesn't work with sanitizers.
# https://clang.llvm.org/docs/AddressSanitizer.html
if (current_os != "ios" && current_os != "mac" && current_os != "win" && !(use_asan || use_tsan || use_ubsan)) {
if (current_os != "ios" && current_os != "mac" && current_os != "win" &&
!(use_asan || use_tsan || use_ubsan)) {
ldflags = [ "-Wl,-z,defs" ]
}
}
Expand Down
Expand Up @@ -9,10 +9,10 @@ unittest("ClangReplInterpreterExceptionTests") {
deps = [
"//clang/lib/AST",
"//clang/lib/Basic",
"//clang/lib/Interpreter",
"//clang/lib/Frontend",
"//llvm/lib/IR",
"//clang/lib/Interpreter",
"//llvm/lib/ExecutionEngine/Orc",
"//llvm/lib/IR",
"//llvm/lib/Support",
"//llvm/lib/Target:TargetsToBuild",
]
Expand Down
4 changes: 1 addition & 3 deletions llvm/utils/gn/secondary/compiler-rt/BUILD.gn
Expand Up @@ -18,9 +18,7 @@ if (android_ndk_path != "") {
]
}
group("compiler-rt") {
deps = [
"//compiler-rt/include($host_toolchain)",
]
deps = [ "//compiler-rt/include($host_toolchain)" ]
foreach(toolchain, supported_toolchains) {
deps += [ "//compiler-rt/lib($toolchain)" ]
}
Expand Down
2 changes: 1 addition & 1 deletion llvm/utils/gn/secondary/lld/COFF/BUILD.gn
Expand Up @@ -27,9 +27,9 @@ static_library("COFF") {
"//llvm/lib/WindowsManifest",
]
sources = [
"COFFLinkerContext.cpp",
"CallGraphSort.cpp",
"Chunks.cpp",
"COFFLinkerContext.cpp",
"DLL.cpp",
"DebugTypes.cpp",
"Driver.cpp",
Expand Down
2 changes: 1 addition & 1 deletion llvm/utils/gn/secondary/lldb/include/lldb/Host/BUILD.gn
Expand Up @@ -52,7 +52,7 @@ write_cmake_config("Config") {
"LLDB_ENABLE_TERMIOS=1",
]
}

if (current_os == "win" || current_os == "linux" || current_os == "android") {
values += [ "HAVE_SYS_EVENT_H=" ]
} else {
Expand Down
3 changes: 2 additions & 1 deletion llvm/utils/gn/secondary/lldb/source/Plugins/BUILD.gn
Expand Up @@ -215,7 +215,8 @@ write_cmake_config("Plugins.def") {
# These are in separate variables to make sure ProcessWindowsCommon is
# initalized after all plugins, but before ProcessGDBRemote.
if (current_os == "win") {
values += [ "LLDB_PROCESS_WINDOWS_PLUGIN=LLDB_PLUGIN(ProcessWindowsCommon)" ]
values +=
[ "LLDB_PROCESS_WINDOWS_PLUGIN=LLDB_PLUGIN(ProcessWindowsCommon)" ]
} else {
values += [ "LLDB_PROCESS_WINDOWS_PLUGIN=" ]
}
Expand Down
Expand Up @@ -9,6 +9,7 @@ static_library("JIT") {
#"//lldb/source/Target", # 2-hop dependency cycle.
"//llvm/lib/Support",
]

# For Utility/UuidCompatibility.h.
include_dirs = [ "//lldb/source" ]
sources = [ "ObjectFileJIT.cpp" ]
Expand Down
Expand Up @@ -9,9 +9,10 @@ static_library("Linux") {
"//lldb/source/Core",
"//lldb/source/Host",
"//lldb/source/Interpreter",
"//lldb/source/Target",
"//lldb/source/Plugins/Platform/POSIX",
"//lldb/source/Target",
]

# Reaches into Plugins/Platform/POSIX.
include_dirs = [ "//lldb/source" ]
sources = [ "PlatformLinux.cpp" ]
Expand Down
Expand Up @@ -4,13 +4,14 @@ static_library("Linux") {
deps = [
"//lldb/source/Core",
"//lldb/source/Host",
"//lldb/source/Plugins/Process/POSIX",
"//lldb/source/Plugins/Process/Utility",
"//lldb/source/Symbol",
"//lldb/source/Target",
"//lldb/source/Utility",
"//lldb/source/Plugins/Process/POSIX",
"//lldb/source/Plugins/Process/Utility",
"//llvm/lib/Support",
]

# Uses source-relative includes for own headers.
include_dirs = [ "//lldb/source" ]
sources = [
Expand All @@ -26,4 +27,3 @@ static_library("Linux") {
"SingleStepCheck.cpp",
]
}

Expand Up @@ -2,10 +2,11 @@ static_library("POSIX") {
output_name = "lldbPluginProcessPOSIX"
configs += [ "//llvm/utils/gn/build:lldb_code" ]
deps = [
"//lldb/source/Utility",
"//lldb/source/Plugins/Process/Utility",
"//lldb/source/Utility",
"//llvm/lib/Support",
]

# Reaches into Plugins/Platform/Process/Utility.
include_dirs = [ "//lldb/source" ]
sources = [
Expand Down
2 changes: 1 addition & 1 deletion llvm/utils/gn/secondary/lldb/tools/driver/BUILD.gn
Expand Up @@ -43,7 +43,7 @@ executable("lldb") {
if (current_os == "linux") {
deps += [ "//lldb/tools/lldb-server" ]
}
foreach (toolchain, supported_toolchains) {
foreach(toolchain, supported_toolchains) {
deps += [ "//lldb/tools/lldb-server($toolchain)" ]
}

Expand Down
2 changes: 1 addition & 1 deletion llvm/utils/gn/secondary/lldb/tools/lldb-server/BUILD.gn
Expand Up @@ -18,8 +18,8 @@ executable("lldb-server") {
"//lldb/source:lldbBase",
"//lldb/source/Host",
"//lldb/source/Initialization",

"//lldb/source/Plugins/Instruction/ARM",

#"//lldb/source/Plugins/Instruction/MIPS", # XXX
#"//lldb/source/Plugins/Instruction/MIPS64", # XXX
"//llvm/lib/Option",
Expand Down

0 comments on commit cf838eb

Please sign in to comment.