RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-01 05:01:59 +01:00
Code Issues Projects Releases Wiki Activity

[llvm-objcopy] Make --strip-debug strip .zdebug* (zlib-gnu) sections

Browse Source 
This behavior matches GNU objcopy.

llvm-svn: 338173
This commit is contained in:
Fangrui Song 2018-07-27 22:51:36 +00:00
parent 8f482e76dc
commit 553090ebe0
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/llvm-objcopy/llvm-objcopy.cpp
View File

@ -185,6 +185,10 @@ 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");
}
static bool IsDWOSection(const SectionBase &Sec) {
return Sec.Name.endswith(".dwo");
}
@ -316,8 +320,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 +349,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 +360,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 +388,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 +410,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);