Index: test/tools/llvm-objcopy/strip-debug.test
===================================================================
--- test/tools/llvm-objcopy/strip-debug.test
+++ test/tools/llvm-objcopy/strip-debug.test
@@ -67,7 +67,7 @@
 # RUN: llvm-objcopy --strip-debug %t.thin.a %t2.thin.a
 # RUN: cat %t.thin.a | FileCheck %s --check-prefix=VERIFY-THIN-ARCHIVE
 # RUN: cat %t2.thin.a | FileCheck %s --check-prefix=VERIFY-THIN-ARCHIVE
- 
+
 # VERIFY-THIN-ARCHIVE: !<thin>
 
 # Verify that the member of a thin archive was properly modified.
@@ -91,7 +91,13 @@
   Type:            ET_REL
   Machine:         EM_X86_64
 Sections:
-  - Name:            .debugfoo
+  - Name:            .debug_info
+    Type:            SHT_PROGBITS
+    Content:         "00000000"
+  - Name:            .zdebug_info
+    Type:            SHT_PROGBITS
+    Content:         "00000000"
+  - Name:            .gdb_index
     Type:            SHT_PROGBITS
     Content:         "00000000"
   - Name:            .text
@@ -103,8 +109,8 @@
   Global:
     - Name: foo
       Section: .text
-    - Name: debugfoo
-      Section: .debugfoo
+    - Name: debug_info
+      Section: .debug_info
 
 # CHECK: SectionHeaderCount: 5
 
Index: tools/llvm-objcopy/llvm-objcopy.cpp
===================================================================
--- tools/llvm-objcopy/llvm-objcopy.cpp
+++ tools/llvm-objcopy/llvm-objcopy.cpp
@@ -186,7 +186,8 @@
 } // end namespace llvm
 
 static bool IsDebugSection(const SectionBase &Sec) {
-  return Sec.Name.startswith(".debug") || Sec.Name.startswith(".zdebug");
+  return Sec.Name.startswith(".debug") || Sec.Name.startswith(".zdebug") ||
+         Sec.Name == ".gdb_index";
 }
 
 static bool IsDWOSection(const SectionBase &Sec) {