1 files changed, 10 insertions, 8 deletions
diff --git a/tools/llvm-objcopy/llvm-objcopy.cpp b/tools/llvm-objcopy/llvm-objcopy.cpp
index 4ccc67cc75dbe..21a1622db7652 100644
--- a/tools/llvm-objcopy/llvm-objcopy.cpp
+++ b/tools/llvm-objcopy/llvm-objcopy.cpp
@@ -185,6 +185,11 @@ LLVM_ATTRIBUTE_NORETURN void reportError(StringRef File, Error E) {
 } // end namespace objcopy
 } // end namespace llvm
 
+static bool IsDebugSection(const SectionBase &Sec) {
+  return Sec.Name.startswith(".debug") || Sec.Name.startswith(".zdebug") ||
+         Sec.Name == ".gdb_index";
+}
+
 static bool IsDWOSection(const SectionBase &Sec) {
   return Sec.Name.endswith(".dwo");
 }
@@ -316,8 +321,7 @@ static void HandleArgs(const CopyConfig &Config, Object &Obj,
   // Removes:
   if (!Config.ToRemove.empty()) {
     RemovePred = [&Config](const SectionBase &Sec) {
-      return std::find(std::begin(Config.ToRemove), std::end(Config.ToRemove),
-                       Sec.Name) != std::end(Config.ToRemove);
+      return find(Config.ToRemove, Sec.Name) != Config.ToRemove.end();
     };
   }
 
@@ -346,7 +350,7 @@ static void HandleArgs(const CopyConfig &Config, Object &Obj,
       case SHT_STRTAB:
         return true;
       }
-      return Sec.Name.startswith(".debug");
+      return IsDebugSection(Sec);
     };
 
   if (Config.StripSections) {
@@ -357,7 +361,7 @@ static void HandleArgs(const CopyConfig &Config, Object &Obj,
 
   if (Config.StripDebug) {
     RemovePred = [RemovePred](const SectionBase &Sec) {
-      return RemovePred(Sec) || Sec.Name.startswith(".debug");
+      return RemovePred(Sec) || IsDebugSection(Sec);
     };
   }
 
@@ -385,8 +389,7 @@ static void HandleArgs(const CopyConfig &Config, Object &Obj,
   if (!Config.OnlyKeep.empty()) {
     RemovePred = [&Config, RemovePred, &Obj](const SectionBase &Sec) {
       // Explicitly keep these sections regardless of previous removes.
-      if (std::find(std::begin(Config.OnlyKeep), std::end(Config.OnlyKeep),
-                    Sec.Name) != std::end(Config.OnlyKeep))
+      if (find(Config.OnlyKeep, Sec.Name) != Config.OnlyKeep.end())
         return false;
 
       // Allow all implicit removes.
@@ -408,8 +411,7 @@ static void HandleArgs(const CopyConfig &Config, Object &Obj,
   if (!Config.Keep.empty()) {
     RemovePred = [Config, RemovePred](const SectionBase &Sec) {
       // Explicitly keep these sections regardless of previous removes.
-      if (std::find(std::begin(Config.Keep), std::end(Config.Keep), Sec.Name) !=
-          std::end(Config.Keep))
+      if (find(Config.Keep, Sec.Name) != Config.Keep.end())
         return false;
       // Otherwise defer to RemovePred.
       return RemovePred(Sec);