diff --git a/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/JITLink/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/JITLink/BUILD.gn
index ce458e997ee803..a0af193ffd803c 100644
--- a/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/JITLink/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/JITLink/BUILD.gn
@@ -2,6 +2,7 @@ static_library("JITLink") {
   output_name = "LLVMJITLink"
   deps = [
     "//llvm/lib/BinaryFormat",
+    "//llvm/lib/ExecutionEngine/Orc/Shared",
     "//llvm/lib/Object",
     "//llvm/lib/Support",
   ]
diff --git a/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/Orc/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/Orc/BUILD.gn
index fdb6b9c899f57b..c64a3f83aebb30 100644
--- a/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/Orc/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/Orc/BUILD.gn
@@ -3,7 +3,8 @@ static_library("Orc") {
   deps = [
     "//llvm/lib/ExecutionEngine",
     "//llvm/lib/ExecutionEngine/JITLink",
-    "//llvm/lib/ExecutionEngine/OrcError",
+    "//llvm/lib/ExecutionEngine/Orc/Shared",
+    "//llvm/lib/ExecutionEngine/Orc/TargetProcess",
     "//llvm/lib/ExecutionEngine/RuntimeDyld",
     "//llvm/lib/IR",
     "//llvm/lib/Object",
@@ -34,6 +35,7 @@ static_library("Orc") {
     "SpeculateAnalyses.cpp",
     "Speculation.cpp",
     "TPCDynamicLibrarySearchGenerator.cpp",
+    "TPCEHFrameRegistrar.cpp",
     "TPCIndirectionUtils.cpp",
     "TargetProcessControl.cpp",
     "ThreadSafeModule.cpp",
diff --git a/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/Orc/Shared/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/Orc/Shared/BUILD.gn
new file mode 100644
index 00000000000000..812e79d1e8ed20
--- /dev/null
+++ b/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/Orc/Shared/BUILD.gn
@@ -0,0 +1,9 @@
+static_library("Shared") {
+  output_name = "LLVMOrcShared"
+  deps = [ "//llvm/lib/Support" ]
+  sources = [
+    "OrcError.cpp",
+    "RPCError.cpp",
+    "TargetProcessControlTypes.cpp",
+  ]
+}
diff --git a/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/Orc/TargetProcess/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/Orc/TargetProcess/BUILD.gn
new file mode 100644
index 00000000000000..f885facb1fb4a4
--- /dev/null
+++ b/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/Orc/TargetProcess/BUILD.gn
@@ -0,0 +1,11 @@
+static_library("TargetProcess") {
+  output_name = "LLVMOrcTargetProcess"
+  deps = [
+    "//llvm/lib/ExecutionEngine/Orc/Shared",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "RegisterEHFrames.cpp",
+    "TargetExecutionUtils.cpp",
+  ]
+}
diff --git a/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/OrcError/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/OrcError/BUILD.gn
deleted file mode 100644
index 038ae514dfcba9..00000000000000
--- a/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/OrcError/BUILD.gn
+++ /dev/null
@@ -1,8 +0,0 @@
-static_library("OrcError") {
-  output_name = "LLVMOrcError"
-  deps = [ "//llvm/lib/Support" ]
-  sources = [
-    "OrcError.cpp",
-    "RPCError.cpp",
-  ]
-}
diff --git a/llvm/utils/gn/secondary/llvm/test/BUILD.gn b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
index 1b48d087512129..d474ea004a7335 100644
--- a/llvm/utils/gn/secondary/llvm/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
@@ -234,6 +234,7 @@ group("test") {
     "//llvm/tools/llvm-ifs",
     "//llvm/tools/llvm-isel-fuzzer",
     "//llvm/tools/llvm-jitlink",
+    "//llvm/tools/llvm-jitlink/llvm-jitlink-executor",
     "//llvm/tools/llvm-libtool-darwin",
     "//llvm/tools/llvm-link",
     "//llvm/tools/llvm-lipo",
diff --git a/llvm/utils/gn/secondary/llvm/tools/lli/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/lli/BUILD.gn
index e356479d2d5547..8eede7ee474171 100644
--- a/llvm/utils/gn/secondary/llvm/tools/lli/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/lli/BUILD.gn
@@ -9,6 +9,8 @@ executable("lli") {
     "//llvm/lib/ExecutionEngine/Interpreter",
     "//llvm/lib/ExecutionEngine/MCJIT",
     "//llvm/lib/ExecutionEngine/Orc",
+    "//llvm/lib/ExecutionEngine/Orc/Shared",
+    "//llvm/lib/ExecutionEngine/Orc/TargetProcess",
     "//llvm/lib/ExecutionEngine/RuntimeDyld",
     "//llvm/lib/IR",
     "//llvm/lib/IRReader",
diff --git a/llvm/utils/gn/secondary/llvm/tools/lli/ChildTarget/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/lli/ChildTarget/BUILD.gn
index 03bcb5f9838be6..6d2ec93584ef93 100644
--- a/llvm/utils/gn/secondary/llvm/tools/lli/ChildTarget/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/lli/ChildTarget/BUILD.gn
@@ -1,6 +1,7 @@
 executable("lli-child-target") {
   deps = [
     "//llvm/lib/ExecutionEngine/Orc",
+    "//llvm/lib/ExecutionEngine/Orc/Shared",
     "//llvm/lib/ExecutionEngine/RuntimeDyld",
     "//llvm/lib/Support",
   ]
diff --git a/llvm/utils/gn/secondary/llvm/tools/llvm-jitlink/llvm-jitlink-executor/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-jitlink/llvm-jitlink-executor/BUILD.gn
new file mode 100644
index 00000000000000..526897a92f09f8
--- /dev/null
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-jitlink/llvm-jitlink-executor/BUILD.gn
@@ -0,0 +1,7 @@
+executable("llvm-jitlink-executor") {
+  deps = [
+    "//llvm/lib/ExecutionEngine/Orc/TargetProcess",
+    "//llvm/lib/Support",
+  ]
+  sources = [ "llvm-jitlink-executor.cpp" ]
+}
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn
index 4844f3645d442c..ff53168f0289de 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn
@@ -3,6 +3,8 @@ import("//llvm/utils/unittest/unittest.gni")
 unittest("JITLinkTests") {
   deps = [
     "//llvm/lib/ExecutionEngine/JITLink",
+    "//llvm/lib/ExecutionEngine/Orc/Shared",
+    "//llvm/lib/ExecutionEngine/Orc/TargetProcess",
     "//llvm/lib/ExecutionEngine/RuntimeDyld",
     "//llvm/lib/Object",
     "//llvm/lib/Support",
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/Orc/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/Orc/BUILD.gn
index 266406b0446dad..d4dbec434c52b5 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/Orc/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/Orc/BUILD.gn
@@ -4,6 +4,7 @@ unittest("OrcJITTests") {
   deps = [
     "//llvm/lib/ExecutionEngine",
     "//llvm/lib/ExecutionEngine/Orc",
+    "//llvm/lib/ExecutionEngine/Orc/Shared",
     "//llvm/lib/ExecutionEngine/RuntimeDyld",
     "//llvm/lib/IR",
     "//llvm/lib/Object",