Index: llvm/trunk/utils/gn/secondary/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/BUILD.gn
@@ -1,7 +1,7 @@
 group("default") {
   deps = [
+    "//llvm/lib/CodeGen",
     "//llvm/lib/Object",
-    "//llvm/lib/Target",
     "//llvm/tools/llvm-undname",
     "//llvm/utils/TableGen:llvm-tblgen",
   ]
Index: llvm/trunk/utils/gn/secondary/llvm/lib/Bitcode/Writer/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/lib/Bitcode/Writer/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/lib/Bitcode/Writer/BUILD.gn
@@ -0,0 +1,18 @@
+static_library("Writer") {
+  output_name = "LLVMBitWriter"
+  deps = [
+    "//llvm/include/llvm/Config:llvm-config",
+    "//llvm/lib/Analysis",
+    "//llvm/lib/IR",
+    "//llvm/lib/MC",
+    "//llvm/lib/Object",
+    "//llvm/lib/Support",
+  ]
+
+  sources = [
+    "BitWriter.cpp",
+    "BitcodeWriter.cpp",
+    "BitcodeWriterPass.cpp",
+    "ValueEnumerator.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn
@@ -0,0 +1,183 @@
+static_library("CodeGen") {
+  output_name = "LLVMCodeGen"
+  public_deps = [
+    # Must be a public_dep because CodeGen's headers include llvm-config.h.
+    "//llvm/include/llvm/Config:llvm-config",
+  ]
+  deps = [
+    "//llvm/lib/Analysis",
+    "//llvm/lib/Bitcode/Reader",
+    "//llvm/lib/Bitcode/Writer",
+    "//llvm/lib/IR",
+    "//llvm/lib/MC",
+    "//llvm/lib/ProfileData",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target",
+    "//llvm/lib/Transforms/Scalar",
+    "//llvm/lib/Transforms/Utils",
+  ]
+  sources = [
+    "AggressiveAntiDepBreaker.cpp",
+    "AllocationOrder.cpp",
+    "Analysis.cpp",
+    "AtomicExpandPass.cpp",
+    "BasicTargetTransformInfo.cpp",
+    "BranchFolding.cpp",
+    "BranchRelaxation.cpp",
+    "BreakFalseDeps.cpp",
+    "BuiltinGCs.cpp",
+    "CFIInstrInserter.cpp",
+    "CalcSpillWeights.cpp",
+    "CallingConvLower.cpp",
+    "CodeGen.cpp",
+    "CodeGenPrepare.cpp",
+    "CriticalAntiDepBreaker.cpp",
+    "DFAPacketizer.cpp",
+    "DeadMachineInstructionElim.cpp",
+    "DetectDeadLanes.cpp",
+    "DwarfEHPrepare.cpp",
+    "EarlyIfConversion.cpp",
+    "EdgeBundles.cpp",
+    "ExecutionDomainFix.cpp",
+    "ExpandISelPseudos.cpp",
+    "ExpandMemCmp.cpp",
+    "ExpandPostRAPseudos.cpp",
+    "ExpandReductions.cpp",
+    "FEntryInserter.cpp",
+    "FaultMaps.cpp",
+    "FuncletLayout.cpp",
+    "GCMetadata.cpp",
+    "GCMetadataPrinter.cpp",
+    "GCRootLowering.cpp",
+    "GCStrategy.cpp",
+    "GlobalMerge.cpp",
+    "IfConversion.cpp",
+    "ImplicitNullChecks.cpp",
+    "IndirectBrExpandPass.cpp",
+    "InlineSpiller.cpp",
+    "InterferenceCache.cpp",
+    "InterleavedAccessPass.cpp",
+    "InterleavedLoadCombinePass.cpp",
+    "IntrinsicLowering.cpp",
+    "LLVMTargetMachine.cpp",
+    "LatencyPriorityQueue.cpp",
+    "LazyMachineBlockFrequencyInfo.cpp",
+    "LexicalScopes.cpp",
+    "LiveDebugValues.cpp",
+    "LiveDebugVariables.cpp",
+    "LiveInterval.cpp",
+    "LiveIntervalUnion.cpp",
+    "LiveIntervals.cpp",
+    "LivePhysRegs.cpp",
+    "LiveRangeCalc.cpp",
+    "LiveRangeEdit.cpp",
+    "LiveRangeShrink.cpp",
+    "LiveRegMatrix.cpp",
+    "LiveRegUnits.cpp",
+    "LiveStacks.cpp",
+    "LiveVariables.cpp",
+    "LocalStackSlotAllocation.cpp",
+    "LoopTraversal.cpp",
+    "LowLevelType.cpp",
+    "LowerEmuTLS.cpp",
+    "MIRCanonicalizerPass.cpp",
+    "MIRPrinter.cpp",
+    "MIRPrintingPass.cpp",
+    "MachineBasicBlock.cpp",
+    "MachineBlockFrequencyInfo.cpp",
+    "MachineBlockPlacement.cpp",
+    "MachineBranchProbabilityInfo.cpp",
+    "MachineCSE.cpp",
+    "MachineCombiner.cpp",
+    "MachineCopyPropagation.cpp",
+    "MachineDominanceFrontier.cpp",
+    "MachineDominators.cpp",
+    "MachineFrameInfo.cpp",
+    "MachineFunction.cpp",
+    "MachineFunctionPass.cpp",
+    "MachineFunctionPrinterPass.cpp",
+    "MachineInstr.cpp",
+    "MachineInstrBundle.cpp",
+    "MachineLICM.cpp",
+    "MachineLoopInfo.cpp",
+    "MachineModuleInfo.cpp",
+    "MachineModuleInfoImpls.cpp",
+    "MachineOperand.cpp",
+    "MachineOptimizationRemarkEmitter.cpp",
+    "MachineOutliner.cpp",
+    "MachinePipeliner.cpp",
+    "MachinePostDominators.cpp",
+    "MachineRegionInfo.cpp",
+    "MachineRegisterInfo.cpp",
+    "MachineSSAUpdater.cpp",
+    "MachineScheduler.cpp",
+    "MachineSink.cpp",
+    "MachineTraceMetrics.cpp",
+    "MachineVerifier.cpp",
+    "MacroFusion.cpp",
+    "OptimizePHIs.cpp",
+    "PHIElimination.cpp",
+    "PHIEliminationUtils.cpp",
+    "ParallelCG.cpp",
+    "PatchableFunction.cpp",
+    "PeepholeOptimizer.cpp",
+    "PostRAHazardRecognizer.cpp",
+    "PostRASchedulerList.cpp",
+    "PreISelIntrinsicLowering.cpp",
+    "ProcessImplicitDefs.cpp",
+    "PrologEpilogInserter.cpp",
+    "PseudoSourceValue.cpp",
+    "ReachingDefAnalysis.cpp",
+    "RegAllocBase.cpp",
+    "RegAllocBasic.cpp",
+    "RegAllocFast.cpp",
+    "RegAllocGreedy.cpp",
+    "RegAllocPBQP.cpp",
+    "RegUsageInfoCollector.cpp",
+    "RegUsageInfoPropagate.cpp",
+    "RegisterClassInfo.cpp",
+    "RegisterCoalescer.cpp",
+    "RegisterPressure.cpp",
+    "RegisterScavenging.cpp",
+    "RegisterUsageInfo.cpp",
+    "RenameIndependentSubregs.cpp",
+    "ResetMachineFunctionPass.cpp",
+    "SafeStack.cpp",
+    "SafeStackColoring.cpp",
+    "SafeStackLayout.cpp",
+    "ScalarizeMaskedMemIntrin.cpp",
+    "ScheduleDAG.cpp",
+    "ScheduleDAGInstrs.cpp",
+    "ScheduleDAGPrinter.cpp",
+    "ScoreboardHazardRecognizer.cpp",
+    "ShadowStackGCLowering.cpp",
+    "ShrinkWrap.cpp",
+    "SjLjEHPrepare.cpp",
+    "SlotIndexes.cpp",
+    "SpillPlacement.cpp",
+    "SplitKit.cpp",
+    "StackColoring.cpp",
+    "StackMapLivenessAnalysis.cpp",
+    "StackMaps.cpp",
+    "StackProtector.cpp",
+    "StackSlotColoring.cpp",
+    "TailDuplication.cpp",
+    "TailDuplicator.cpp",
+    "TargetFrameLoweringImpl.cpp",
+    "TargetInstrInfo.cpp",
+    "TargetLoweringBase.cpp",
+    "TargetLoweringObjectFileImpl.cpp",
+    "TargetOptionsImpl.cpp",
+    "TargetPassConfig.cpp",
+    "TargetRegisterInfo.cpp",
+    "TargetSchedule.cpp",
+    "TargetSubtargetInfo.cpp",
+    "TwoAddressInstructionPass.cpp",
+    "UnreachableBlockElim.cpp",
+    "ValueTypes.cpp",
+    "VirtRegMap.cpp",
+    "WasmEHPrepare.cpp",
+    "WinEHPrepare.cpp",
+    "XRayInstrumentation.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/lib/Transforms/AggressiveInstCombine/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/lib/Transforms/AggressiveInstCombine/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/lib/Transforms/AggressiveInstCombine/BUILD.gn
@@ -0,0 +1,13 @@
+static_library("AggressiveInstCombine") {
+  output_name = "LLVMAggressiveInstCombine"
+  deps = [
+    "//llvm/lib/Analysis",
+    "//llvm/lib/IR",
+    "//llvm/lib/Support",
+    "//llvm/lib/Transforms/Utils",
+  ]
+  sources = [
+    "AggressiveInstCombine.cpp",
+    "TruncInstCombine.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/lib/Transforms/InstCombine/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/lib/Transforms/InstCombine/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/lib/Transforms/InstCombine/BUILD.gn
@@ -0,0 +1,32 @@
+import("//llvm/utils/TableGen/tablegen.gni")
+
+tablegen("InstCombineTables") {
+  visibility = [ ":InstCombine" ]
+  args = [ "-gen-searchable-tables" ]
+}
+
+static_library("InstCombine") {
+  output_name = "LLVMInstCombine"
+  deps = [
+    ":InstCombineTables",
+    "//llvm/lib/Analysis",
+    "//llvm/lib/IR",
+    "//llvm/lib/Support",
+    "//llvm/lib/Transforms/Utils",
+  ]
+  sources = [
+    "InstCombineAddSub.cpp",
+    "InstCombineAndOrXor.cpp",
+    "InstCombineCalls.cpp",
+    "InstCombineCasts.cpp",
+    "InstCombineCompares.cpp",
+    "InstCombineLoadStoreAlloca.cpp",
+    "InstCombineMulDivRem.cpp",
+    "InstCombinePHI.cpp",
+    "InstCombineSelect.cpp",
+    "InstCombineShifts.cpp",
+    "InstCombineSimplifyDemanded.cpp",
+    "InstCombineVectorOps.cpp",
+    "InstructionCombining.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/lib/Transforms/Scalar/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/lib/Transforms/Scalar/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/lib/Transforms/Scalar/BUILD.gn
@@ -0,0 +1,83 @@
+static_library("Scalar") {
+  output_name = "LLVMScalarOpts"
+  deps = [
+    "//llvm/include/llvm/Config:llvm-config",
+    "//llvm/lib/Analysis",
+    "//llvm/lib/IR",
+    "//llvm/lib/Support",
+    "//llvm/lib/Transforms/AggressiveInstCombine",
+    "//llvm/lib/Transforms/InstCombine",
+    "//llvm/lib/Transforms/Utils",
+  ]
+  sources = [
+    "ADCE.cpp",
+    "AlignmentFromAssumptions.cpp",
+    "BDCE.cpp",
+    "CallSiteSplitting.cpp",
+    "ConstantHoisting.cpp",
+    "ConstantProp.cpp",
+    "CorrelatedValuePropagation.cpp",
+    "DCE.cpp",
+    "DeadStoreElimination.cpp",
+    "DivRemPairs.cpp",
+    "EarlyCSE.cpp",
+    "FlattenCFGPass.cpp",
+    "Float2Int.cpp",
+    "GVN.cpp",
+    "GVNHoist.cpp",
+    "GVNSink.cpp",
+    "GuardWidening.cpp",
+    "IVUsersPrinter.cpp",
+    "IndVarSimplify.cpp",
+    "InductiveRangeCheckElimination.cpp",
+    "InferAddressSpaces.cpp",
+    "InstSimplifyPass.cpp",
+    "JumpThreading.cpp",
+    "LICM.cpp",
+    "LoopAccessAnalysisPrinter.cpp",
+    "LoopDataPrefetch.cpp",
+    "LoopDeletion.cpp",
+    "LoopDistribute.cpp",
+    "LoopIdiomRecognize.cpp",
+    "LoopInstSimplify.cpp",
+    "LoopInterchange.cpp",
+    "LoopLoadElimination.cpp",
+    "LoopPassManager.cpp",
+    "LoopPredication.cpp",
+    "LoopRerollPass.cpp",
+    "LoopRotation.cpp",
+    "LoopSimplifyCFG.cpp",
+    "LoopSink.cpp",
+    "LoopStrengthReduce.cpp",
+    "LoopUnrollAndJamPass.cpp",
+    "LoopUnrollPass.cpp",
+    "LoopUnswitch.cpp",
+    "LoopVersioningLICM.cpp",
+    "LowerAtomic.cpp",
+    "LowerExpectIntrinsic.cpp",
+    "LowerGuardIntrinsic.cpp",
+    "MemCpyOptimizer.cpp",
+    "MergeICmps.cpp",
+    "MergedLoadStoreMotion.cpp",
+    "NaryReassociate.cpp",
+    "NewGVN.cpp",
+    "PartiallyInlineLibCalls.cpp",
+    "PlaceSafepoints.cpp",
+    "Reassociate.cpp",
+    "Reg2Mem.cpp",
+    "RewriteStatepointsForGC.cpp",
+    "SCCP.cpp",
+    "SROA.cpp",
+    "Scalar.cpp",
+    "Scalarizer.cpp",
+    "SeparateConstOffsetFromGEP.cpp",
+    "SimpleLoopUnswitch.cpp",
+    "SimplifyCFGPass.cpp",
+    "Sink.cpp",
+    "SpeculateAroundPHIs.cpp",
+    "SpeculativeExecution.cpp",
+    "StraightLineStrengthReduce.cpp",
+    "StructurizeCFG.cpp",
+    "TailRecursionElimination.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/lib/Transforms/Utils/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/lib/Transforms/Utils/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/lib/Transforms/Utils/BUILD.gn
@@ -0,0 +1,68 @@
+static_library("Utils") {
+  output_name = "LLVMTransformUtils"
+  deps = [
+    "//llvm/lib/Analysis",
+    "//llvm/lib/IR",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "ASanStackFrameLayout.cpp",
+    "AddDiscriminators.cpp",
+    "BasicBlockUtils.cpp",
+    "BreakCriticalEdges.cpp",
+    "BuildLibCalls.cpp",
+    "BypassSlowDivision.cpp",
+    "CallPromotionUtils.cpp",
+    "CloneFunction.cpp",
+    "CloneModule.cpp",
+    "CodeExtractor.cpp",
+    "CtorUtils.cpp",
+    "DemoteRegToStack.cpp",
+    "EntryExitInstrumenter.cpp",
+    "EscapeEnumerator.cpp",
+    "Evaluator.cpp",
+    "FlattenCFG.cpp",
+    "FunctionComparator.cpp",
+    "FunctionImportUtils.cpp",
+    "GlobalStatus.cpp",
+    "GuardUtils.cpp",
+    "ImportedFunctionsInliningStatistics.cpp",
+    "InlineFunction.cpp",
+    "InstructionNamer.cpp",
+    "IntegerDivision.cpp",
+    "LCSSA.cpp",
+    "LibCallsShrinkWrap.cpp",
+    "Local.cpp",
+    "LoopRotationUtils.cpp",
+    "LoopSimplify.cpp",
+    "LoopUnroll.cpp",
+    "LoopUnrollAndJam.cpp",
+    "LoopUnrollPeel.cpp",
+    "LoopUnrollRuntime.cpp",
+    "LoopUtils.cpp",
+    "LoopVersioning.cpp",
+    "LowerInvoke.cpp",
+    "LowerMemIntrinsics.cpp",
+    "LowerSwitch.cpp",
+    "Mem2Reg.cpp",
+    "MetaRenamer.cpp",
+    "ModuleUtils.cpp",
+    "NameAnonGlobals.cpp",
+    "PredicateInfo.cpp",
+    "PromoteMemoryToRegister.cpp",
+    "SSAUpdater.cpp",
+    "SSAUpdaterBulk.cpp",
+    "SanitizerStats.cpp",
+    "SimplifyCFG.cpp",
+    "SimplifyIndVar.cpp",
+    "SimplifyLibCalls.cpp",
+    "SplitModule.cpp",
+    "StripGCRelocates.cpp",
+    "StripNonLineTableDebugInfo.cpp",
+    "SymbolRewriter.cpp",
+    "UnifyFunctionExitNodes.cpp",
+    "Utils.cpp",
+    "VNCoercion.cpp",
+    "ValueMapper.cpp",
+  ]
+}