[llvm] r319071 - [llvm-objcopy] Add --strip-all-gnu and change --strip-all
Jake Ehrlich via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 27 10:56:01 PST 2017
Author: jakehehrlich
Date: Mon Nov 27 10:56:01 2017
New Revision: 319071
URL: http://llvm.org/viewvc/llvm-project?rev=319071&view=rev
Log:
[llvm-objcopy] Add --strip-all-gnu and change --strip-all
GNU's --strip-all doesn't strip as aggressively as it could in general.
Currently llvm-objcopy copies the exact behavoir of GNU's --strip-all.
eu-strip is used as a drop in replacement for GNU strip/objcopy in many many
places without issue. eu-strip removes non-allocated sections and keeps
.gnu.warning* sections. Because --strip-all will likely be the most widely
used stripping option we should make --strip-all as aggressive as it can safely
be. Since we have evidence from eu-strip that this is a safe option we should
allow it. For those that might still have an issue afterwards I've added
--strip-all-gnu as an exact drop in replacement for GNU's --strip-all as well.
Added:
llvm/trunk/test/tools/llvm-objcopy/strip-all-gnu.test
- copied, changed from r319070, llvm/trunk/test/tools/llvm-objcopy/strip-all.test
Modified:
llvm/trunk/test/tools/llvm-objcopy/strip-all.test
llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp
Copied: llvm/trunk/test/tools/llvm-objcopy/strip-all-gnu.test (from r319070, llvm/trunk/test/tools/llvm-objcopy/strip-all.test)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/strip-all-gnu.test?p2=llvm/trunk/test/tools/llvm-objcopy/strip-all-gnu.test&p1=llvm/trunk/test/tools/llvm-objcopy/strip-all.test&r1=319070&r2=319071&rev=319071&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/strip-all.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/strip-all-gnu.test Mon Nov 27 10:56:01 2017
@@ -1,5 +1,5 @@
# RUN: yaml2obj %s > %t
-# RUN: llvm-objcopy --strip-all %t %t2
+# RUN: llvm-objcopy --strip-all-gnu %t %t2
# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
!ELF
Modified: llvm/trunk/test/tools/llvm-objcopy/strip-all.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/strip-all.test?rev=319071&r1=319070&r2=319071&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/strip-all.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/strip-all.test Mon Nov 27 10:56:01 2017
@@ -9,46 +9,21 @@ FileHeader:
Type: ET_REL
Machine: EM_X86_64
Sections:
- - Name: .dynstr
- Type: SHT_STRTAB
- Flags: [ SHF_ALLOC ]
- - Name: .symtab.dyn
- Type: SHT_SYMTAB
- Flags: [ SHF_ALLOC ]
+ - Name: .bss
Type: SHT_NOBITS
+ Flags: [ SHF_ALLOC ]
- Name: .text
Type: SHT_PROGBITS
Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
- Size: 4
- - Name: .debug_info
+ - Name: .blarg
Type: SHT_PROGBITS
Flags: [ ]
- AddressAlign: 0x1
- Size: 4
- - Name: .debug_loc
- Type: SHT_PROGBITS
- Flags: [ SHF_ALLOC ]
- AddressAlign: 0x1
- Size: 4
- - Name: .comment
- Type: SHT_PROGBITS
- - Name: .random_section_name
- Type: SHT_PROGBITS
- - Name: .debug_not_a_real_debug_section
+ - Name: .gnu.warning.foo
Type: SHT_PROGBITS
- - Name: .rel.text
- Type: SHT_REL
- Info: .text
- - Name: .rela.text
- Type: SHT_RELA
- Info: .text
-# CHECK: SectionHeaderCount: 8
+# CHECK: SectionHeaderCount: 5
-# CHECK: Name: .dynstr
-# CHECK: Name: .symtab.dyn
-# CHECK: Name: .text
-# CHECK: Name: .debug_loc
-# CHECK: Name: .comment
-# CHECK: Name: .random_section_name
-# CHECK: Name: .shstrtab
+# CHECK: Name: .bss
+# CHECK: Name: .text
+# CHECK: Name: .gnu.warning.foo
+# CHECK: Name: .shstrtab
Modified: llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp?rev=319071&r1=319070&r2=319071&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp (original)
+++ llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp Mon Nov 27 10:56:01 2017
@@ -82,8 +82,13 @@ static cl::list<std::string> ToRemove("r
cl::value_desc("section"));
static cl::alias ToRemoveA("R", cl::desc("Alias for remove-section"),
cl::aliasopt(ToRemove));
-static cl::opt<bool> StripAll("strip-all",
- cl::desc("Removes symbol, relocation, and debug information"));
+static cl::opt<bool> StripAll(
+ "strip-all",
+ cl::desc(
+ "Removes non-allocated sections other than .gnu.warning* sections"));
+static cl::opt<bool>
+ StripAllGNU("strip-all-gnu",
+ cl::desc("Removes symbol, relocation, and debug information"));
static cl::opt<bool> StripDebug("strip-debug",
cl::desc("Removes all debug information"));
static cl::opt<bool> StripSections("strip-sections",
@@ -178,7 +183,7 @@ void CopyBinary(const ELFObjectFile<ELFT
return OnlyKeepDWOPred(*Obj, Sec) || RemovePred(Sec);
};
- if (StripAll)
+ if (StripAllGNU)
RemovePred = [RemovePred, &Obj](const SectionBase &Sec) {
if (RemovePred(Sec))
return true;
@@ -217,6 +222,17 @@ void CopyBinary(const ELFObjectFile<ELFT
return false;
return (Sec.Flags & SHF_ALLOC) == 0;
};
+
+ if (StripAll)
+ RemovePred = [RemovePred, &Obj](const SectionBase &Sec) {
+ if (RemovePred(Sec))
+ return true;
+ if (&Sec == Obj->getSectionHeaderStrTab())
+ return false;
+ if (Sec.Name.startswith(".gnu.warning"))
+ return false;
+ return (Sec.Flags & SHF_ALLOC) == 0;
+ };
Obj->removeSections(RemovePred);
Obj->finalize();
More information about the llvm-commits
mailing list