llvm-build: Add --native-target and --enable-targets options, and add logic to

handle defining the "magic" target related components (like native,
nativecodegen, and engine).
 - We still require these components to be in the project (currently in
   lib/Target) so that we have a place to document them and hopefully make it
   more obvious that they are "magic".

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144253 91177308-0d34-0410-b5e6-96231b3b80d8

13 files changed, 16 insertions, 16 deletions

diff --git a/lib/Target/ARM/LLVMBuild.txt b/lib/Target/ARM/LLVMBuild.txt
index cfac6ac51b..79cae91f5b 100644
--- a/lib/Target/ARM/LLVMBuild.txt
+++ b/lib/Target/ARM/LLVMBuild.txt
@@ -19,7 +19,6 @@
 type = TargetGroup
 name = ARM
 parent = Target
-add_to_library_groups = all-targets
 has_jit = 1
 
 [component_1]
diff --git a/lib/Target/CBackend/LLVMBuild.txt b/lib/Target/CBackend/LLVMBuild.txt
index 0b1f885703..851ded923c 100644
--- a/lib/Target/CBackend/LLVMBuild.txt
+++ b/lib/Target/CBackend/LLVMBuild.txt
@@ -19,7 +19,6 @@
 type = TargetGroup
 name = CBackend
 parent = Target
-add_to_library_groups = all-targets
 
 [component_1]
 type = Library
diff --git a/lib/Target/CellSPU/LLVMBuild.txt b/lib/Target/CellSPU/LLVMBuild.txt
index e8db9f3f84..a2127dd1c0 100644
--- a/lib/Target/CellSPU/LLVMBuild.txt
+++ b/lib/Target/CellSPU/LLVMBuild.txt
@@ -19,7 +19,6 @@
 type = TargetGroup
 name = CellSPU
 parent = Target
-add_to_library_groups = all-targets
 
 [component_1]
 type = Library
diff --git a/lib/Target/CppBackend/LLVMBuild.txt b/lib/Target/CppBackend/LLVMBuild.txt
index 79ad4c1f54..77e31c7af0 100644
--- a/lib/Target/CppBackend/LLVMBuild.txt
+++ b/lib/Target/CppBackend/LLVMBuild.txt
@@ -19,7 +19,6 @@
 type = TargetGroup
 name = CppBackend
 parent = Target
-add_to_library_groups = all-targets
 
 [component_1]
 type = Library
diff --git a/lib/Target/LLVMBuild.txt b/lib/Target/LLVMBuild.txt
index 073a76a0f1..09dadd6b1e 100644
--- a/lib/Target/LLVMBuild.txt
+++ b/lib/Target/LLVMBuild.txt
@@ -21,20 +21,32 @@ name = Target
 parent = Libraries
 required_libraries = Core MC Support
 
+; This is a convenient group we define (and expect targets to add to) which
+; makes it easy for tools to include every target.
 [component_1]
 type = LibraryGroup
 name = all-targets
 parent = Libraries
 
+; This is a special group whose required libraries are extended (by llvm-build)
+; with the configured native target, if any.
 [component_2]
 type = LibraryGroup
-name = native
+name = Native
 parent = Libraries
-required_libraries = X86
 
+; This is a special group whose required libraries are extended (by llvm-build)
+; with the configured native code generator, if any.
 [component_3]
 type = LibraryGroup
-name = nativecodegen
+name = NativeCodeGen
+parent = Libraries
+
+; 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
+; interpreter).
+[component_4]
+type = LibraryGroup
+name = Engine
 parent = Libraries
-required_libraries = X86CodeGen
 
diff --git a/lib/Target/MBlaze/LLVMBuild.txt b/lib/Target/MBlaze/LLVMBuild.txt
index b953e3df30..fa8955252d 100644
--- a/lib/Target/MBlaze/LLVMBuild.txt
+++ b/lib/Target/MBlaze/LLVMBuild.txt
@@ -19,7 +19,6 @@
 type = TargetGroup
 name = MBlaze
 parent = Target
-add_to_library_groups = all-targets
 
 [component_1]
 type = Library
diff --git a/lib/Target/MSP430/LLVMBuild.txt b/lib/Target/MSP430/LLVMBuild.txt
index 8b0b1f6534..9ade110668 100644
--- a/lib/Target/MSP430/LLVMBuild.txt
+++ b/lib/Target/MSP430/LLVMBuild.txt
@@ -19,7 +19,6 @@
 type = TargetGroup
 name = MSP430
 parent = Target
-add_to_library_groups = all-targets
 
 [component_1]
 type = Library
diff --git a/lib/Target/Mips/LLVMBuild.txt b/lib/Target/Mips/LLVMBuild.txt
index bcec4a9661..65c7d7fd2f 100644
--- a/lib/Target/Mips/LLVMBuild.txt
+++ b/lib/Target/Mips/LLVMBuild.txt
@@ -19,7 +19,6 @@
 type = TargetGroup
 name = Mips
 parent = Target
-add_to_library_groups = all-targets
 has_jit = 1
 
 [component_1]
diff --git a/lib/Target/PTX/LLVMBuild.txt b/lib/Target/PTX/LLVMBuild.txt
index 27119c2a3e..180e7ce82c 100644
--- a/lib/Target/PTX/LLVMBuild.txt
+++ b/lib/Target/PTX/LLVMBuild.txt
@@ -19,7 +19,6 @@
 type = TargetGroup
 name = PTX
 parent = Target
-add_to_library_groups = all-targets
 
 [component_1]
 type = Library
diff --git a/lib/Target/PowerPC/LLVMBuild.txt b/lib/Target/PowerPC/LLVMBuild.txt
index 3c439f3773..ce8b2e9196 100644
--- a/lib/Target/PowerPC/LLVMBuild.txt
+++ b/lib/Target/PowerPC/LLVMBuild.txt
@@ -19,7 +19,6 @@
 type = TargetGroup
 name = PowerPC
 parent = Target
-add_to_library_groups = all-targets
 has_jit = 1
 
 [component_1]
diff --git a/lib/Target/Sparc/LLVMBuild.txt b/lib/Target/Sparc/LLVMBuild.txt
index f59cc2eec4..d99057f20b 100644
--- a/lib/Target/Sparc/LLVMBuild.txt
+++ b/lib/Target/Sparc/LLVMBuild.txt
@@ -19,7 +19,6 @@
 type = TargetGroup
 name = Sparc
 parent = Target
-add_to_library_groups = all-targets
 
 [component_1]
 type = Library
diff --git a/lib/Target/X86/LLVMBuild.txt b/lib/Target/X86/LLVMBuild.txt
index 7f48a9e485..814e81b304 100644
--- a/lib/Target/X86/LLVMBuild.txt
+++ b/lib/Target/X86/LLVMBuild.txt
@@ -19,7 +19,6 @@
 type = TargetGroup
 name = X86
 parent = Target
-add_to_library_groups = all-targets
 has_jit = 1
 
 [component_1]
diff --git a/lib/Target/XCore/LLVMBuild.txt b/lib/Target/XCore/LLVMBuild.txt
index 41943c3690..f1b75740cb 100644
--- a/lib/Target/XCore/LLVMBuild.txt
+++ b/lib/Target/XCore/LLVMBuild.txt
@@ -19,7 +19,6 @@
 type = TargetGroup
 name = XCore
 parent = Target
-add_to_library_groups = all-targets
 
 [component_1]
 type = Library