diff --git a/llvm/utils/gn/secondary/llvm/lib/ObjCopy/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/ObjCopy/BUILD.gn
new file mode 100644
index 000000000000..78fceb2e9236
--- /dev/null
+++ b/llvm/utils/gn/secondary/llvm/lib/ObjCopy/BUILD.gn
@@ -0,0 +1,29 @@
+static_library("ObjCopy") {
+  output_name = "LLVMObjCopy"
+  deps = [
+    "//llvm/lib/Object",
+    "//llvm/lib/MC",
+    "//llvm/lib/Support",
+  ]
+  include_dirs = [ "." ]
+  sources = [
+    "Archive.cpp",
+    "ObjCopy.cpp",
+    "ConfigManager.cpp",
+    "COFF/COFFObjcopy.cpp",
+    "COFF/Object.cpp",
+    "COFF/Reader.cpp",
+    "COFF/Writer.cpp",
+    "ELF/ELFObjcopy.cpp",
+    "ELF/Object.cpp",
+    "MachO/MachOObjcopy.cpp",
+    "MachO/MachOReader.cpp",
+    "MachO/MachOWriter.cpp",
+    "MachO/MachOLayoutBuilder.cpp",
+    "MachO/Object.cpp",
+    "wasm/Object.cpp",
+    "wasm/Reader.cpp",
+    "wasm/Writer.cpp",
+    "wasm/WasmObjcopy.cpp",
+  ]
+}
diff --git a/llvm/utils/gn/secondary/llvm/tools/llvm-objcopy/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-objcopy/BUILD.gn
index 64ea2b55c99e..23ee0273c3a6 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-objcopy/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-objcopy/BUILD.gn
@@ -56,28 +56,13 @@ executable("llvm-objcopy") {
     ":ObjcopyOpts",
     ":StripOpts",
     "//llvm/lib/MC",
+    "//llvm/lib/ObjCopy",
     "//llvm/lib/Object",
     "//llvm/lib/Option",
     "//llvm/lib/Support",
   ]
-  include_dirs = [ "." ]
   sources = [
-    "COFF/COFFObjcopy.cpp",
-    "COFF/Object.cpp",
-    "COFF/Reader.cpp",
-    "COFF/Writer.cpp",
-    "ConfigManager.cpp",
-    "ELF/ELFObjcopy.cpp",
-    "ELF/Object.cpp",
-    "MachO/MachOLayoutBuilder.cpp",
-    "MachO/MachOObjcopy.cpp",
-    "MachO/MachOReader.cpp",
-    "MachO/MachOWriter.cpp",
-    "MachO/Object.cpp",
+    "ObjcopyOptions.cpp",
     "llvm-objcopy.cpp",
-    "wasm/Object.cpp",
-    "wasm/Reader.cpp",
-    "wasm/WasmObjcopy.cpp",
-    "wasm/Writer.cpp",
   ]
 }
diff --git a/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn
index 4176e743bb13..cd92504743a5 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn
@@ -31,6 +31,7 @@ group("unittests") {
     "MC:MCTests",
     "MI:MITests",
     "MIR:MIRTests",
+    "ObjCopy:ObjCopyTests",
     "Object:ObjectTests",
     "ObjectYAML:ObjectYAMLTests",
     "Option:OptionTests",
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ObjCopy/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ObjCopy/BUILD.gn
new file mode 100644
index 000000000000..58c168156d07
--- /dev/null
+++ b/llvm/utils/gn/secondary/llvm/unittests/ObjCopy/BUILD.gn
@@ -0,0 +1,11 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("ObjCopyTests") {
+  deps = [
+    "//llvm/lib/ObjCopy",
+    "//llvm/lib/Object",
+    "//llvm/lib/ObjectYAML",
+    "//llvm/lib/Testing/Support",
+  ]
+  sources = [ "ObjCopyTest.cpp" ]
+}