From e0b6c1146d14239e90f620ac4286f213a7280010 Mon Sep 17 00:00:00 2001
From: Douglas Katzman <dougk@google.com>
Date: Thu, 14 May 2015 15:38:27 +0000
Subject: [PATCH] Reflow long lines of some LLVMBuild files

Differential Revision: http://reviews.llvm.org/D9752

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@237367 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/LLVMBuild.txt        |  4 +++-
 lib/Target/LLVMBuild.txt | 18 +++++++++++++++++-
 tools/LLVMBuild.txt      |  5 ++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/LLVMBuild.txt b/lib/LLVMBuild.txt
index bc2448da0ed..7e7ebc54597 100644
--- a/lib/LLVMBuild.txt
+++ b/lib/LLVMBuild.txt
@@ -16,7 +16,9 @@
 ;===------------------------------------------------------------------------===;
 
 [common]
-subdirectories = Analysis AsmParser Bitcode CodeGen DebugInfo ExecutionEngine LineEditor Linker IR IRReader LTO MC Object Option Passes ProfileData Support TableGen Target Transforms
+subdirectories = Analysis AsmParser Bitcode CodeGen DebugInfo ExecutionEngine
+ LineEditor Linker IR IRReader LTO MC Object Option Passes ProfileData Support
+ TableGen Target Transforms
 
 [component_0]
 type = Group
diff --git a/lib/Target/LLVMBuild.txt b/lib/Target/LLVMBuild.txt
index 4112046c33f..3af3426b94c 100644
--- a/lib/Target/LLVMBuild.txt
+++ b/lib/Target/LLVMBuild.txt
@@ -15,8 +15,24 @@
 ;
 ;===------------------------------------------------------------------------===;
 
+; Please keep these as one per line so that out-of-tree merges
+; will typically require only insertion of a line.
 [common]
-subdirectories = ARM AArch64 BPF CppBackend Hexagon MSP430 NVPTX Mips PowerPC R600 Sparc SystemZ X86 XCore
+subdirectories =
+ ARM
+ AArch64
+ BPF
+ CppBackend
+ Hexagon
+ MSP430
+ NVPTX
+ Mips
+ PowerPC
+ R600
+ Sparc
+ SystemZ
+ X86
+ XCore
 
 ; This is a special group whose required libraries are extended (by llvm-build)
 ; with the best execution engine (the native JIT, if available, or the
diff --git a/tools/LLVMBuild.txt b/tools/LLVMBuild.txt
index e7b81bbf53f..6a838b72ecf 100644
--- a/tools/LLVMBuild.txt
+++ b/tools/LLVMBuild.txt
@@ -16,7 +16,10 @@
 ;===------------------------------------------------------------------------===;
 
 [common]
-subdirectories = bugpoint llc lli llvm-ar llvm-as llvm-bcanalyzer llvm-cov llvm-diff llvm-dis llvm-dwarfdump llvm-extract llvm-jitlistener llvm-link llvm-lto llvm-mc llvm-nm llvm-objdump llvm-pdbdump llvm-profdata llvm-rtdyld llvm-size macho-dump opt llvm-mcmarkup verify-uselistorder dsymutil
+subdirectories = bugpoint llc lli llvm-ar llvm-as llvm-bcanalyzer llvm-cov
+ llvm-diff llvm-dis llvm-dwarfdump llvm-extract llvm-jitlistener llvm-link
+ llvm-lto llvm-mc llvm-nm llvm-objdump llvm-pdbdump llvm-profdata llvm-rtdyld
+ llvm-size macho-dump opt llvm-mcmarkup verify-uselistorder dsymutil
 
 [component_0]
 type = Group
-- 
2.11.0