Index: llvm/trunk/utils/gn/secondary/llvm/unittests/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/BUILD.gn
@@ -16,11 +16,9 @@
     "DebugInfo/MSF:DebugInfoMSFTests",
     "DebugInfo/PDB:DebugInfoPDBTests",
     "Demangle:DemangleTests",
-
-    # FIXME: Add.
-    #"ExecutionEngine:ExecutionEngineTests",
-    #"ExecutionEngine/MCJIT:MCJITTests",
-    #"ExecutionEngine/Orc:OrcJITTests",
+    "ExecutionEngine:ExecutionEngineTests",
+    "ExecutionEngine/MCJIT:MCJITTests",
+    "ExecutionEngine/Orc:OrcJITTests",
     "FuzzMutate:FuzzMutateTests",
     "IR:IRTests",
     "LineEditor:LineEditorTests",
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn
@@ -0,0 +1,16 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("ExecutionEngineTests") {
+  deps = [
+    "//llvm/lib/ExecutionEngine",
+    "//llvm/lib/ExecutionEngine/Interpreter",
+    "//llvm/lib/ExecutionEngine/Orc",
+    "//llvm/lib/ExecutionEngine/RuntimeDyld",
+    "//llvm/lib/IR",
+    "//llvm/lib/MC",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "ExecutionEngineTest.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn
@@ -0,0 +1,29 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("MCJITTests") {
+  deps = [
+    "//llvm/lib/Analysis",
+    "//llvm/lib/ExecutionEngine",
+    "//llvm/lib/ExecutionEngine/MCJIT",
+    "//llvm/lib/ExecutionEngine/RuntimeDyld",
+    "//llvm/lib/IR",
+    "//llvm/lib/MC",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target",
+    "//llvm/lib/Target:NativeTarget",
+    "//llvm/lib/Transforms/IPO",
+    "//llvm/lib/Transforms/InstCombine",
+    "//llvm/lib/Transforms/Scalar",
+  ]
+  sources = [
+    "MCJITCAPITest.cpp",
+    "MCJITMemoryManagerTest.cpp",
+    "MCJITMultipleModuleTest.cpp",
+    "MCJITObjectCacheTest.cpp",
+    "MCJITTest.cpp",
+  ]
+
+  if (host_os == "win") {
+    sources += [ "MCJITTest.def" ]
+  }
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/ExecutionEngine/Orc/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/ExecutionEngine/Orc/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/ExecutionEngine/Orc/BUILD.gn
@@ -0,0 +1,33 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("OrcJITTests") {
+  deps = [
+    "//llvm/lib/ExecutionEngine",
+    "//llvm/lib/ExecutionEngine/Orc",
+    "//llvm/lib/ExecutionEngine/RuntimeDyld",
+    "//llvm/lib/IR",
+    "//llvm/lib/Object",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target:NativeTarget",
+  ]
+  sources = [
+    "CoreAPIsTest.cpp",
+    "GlobalMappingLayerTest.cpp",
+    "IndirectionUtilsTest.cpp",
+    "JITTargetMachineBuilderTest.cpp",
+    "LazyCallThroughAndReexportsTest.cpp",
+    "LazyEmittingLayerTest.cpp",
+    "LegacyAPIInteropTest.cpp",
+    "LegacyCompileOnDemandLayerTest.cpp",
+    "LegacyRTDyldObjectLinkingLayerTest.cpp",
+    "ObjectTransformLayerTest.cpp",
+    "OrcCAPITest.cpp",
+    "OrcTestCommon.cpp",
+    "QueueChannel.cpp",
+    "RPCUtilsTest.cpp",
+    "RTDyldObjectLinkingLayerTest.cpp",
+    "RemoteObjectLayerTest.cpp",
+    "SymbolStringPoolTest.cpp",
+    "ThreadSafeModuleTest.cpp",
+  ]
+}