Index: test/tools/llvm-objcopy/COFF/only-section.test
===================================================================
--- /dev/null
+++ test/tools/llvm-objcopy/COFF/only-section.test
@@ -0,0 +1,13 @@
+RUN: yaml2obj %p/Inputs/only-keep-sections.yaml > %t.in.exe
+
+RUN: llvm-objcopy --only-section .debug_discardable %t.in.exe %t.out.exe
+RUN: llvm-objdump --section-headers -t %t.out.exe | FileCheck %s --check-prefixes=SECTIONS,SYMBOLS
+
+SECTIONS: Sections:
+SECTIONS-NEXT: Idx Name
+SECTIONS-NEXT: .debug_discardable
+SECTIONS-NEXT-EMPTY:
+
+SYMBOLS: SYMBOL TABLE:
+SYMBOLS-NEXT: debug_discardable_sym
+SYMBOLS-EMPTY:
Index: tools/llvm-objcopy/COFF/COFFObjcopy.cpp
===================================================================
--- tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+++ tools/llvm-objcopy/COFF/COFFObjcopy.cpp
@@ -34,6 +34,16 @@
 static Error handleArgs(const CopyConfig &Config, Object &Obj) {
   // Perform the actual section removals.
   Obj.removeSections([&Config](const Section &Sec) {
+    if (!Config.OnlySection.empty()) {
+      // Explicitly keep these sections.
+      if (is_contained(Config.OnlySection, Sec.Name))
+        return false;
+
+      // Remove everything else. Contrary to --only-keep-debug, --only-section
+      // fully removes everything else.
+      return true;
+    }
+
     if (Config.StripDebug || Config.StripAll || Config.StripAllGNU ||
         Config.DiscardAll || Config.StripUnneeded) {
       if (isDebugSection(Sec) &&