[llvm] r332081 - [llvm-strip] Add support for -remove-section
Alexander Shaposhnikov via llvm-commits
llvm-commits at lists.llvm.org
Thu May 10 22:27:06 PDT 2018
Author: alexshap
Date: Thu May 10 22:27:06 2018
New Revision: 332081
URL: http://llvm.org/viewvc/llvm-project?rev=332081&view=rev
Log:
[llvm-strip] Add support for -remove-section
This diff adds support for -remove-section to llvm-strip.
Test plan: make check-all
Differential revision: https://reviews.llvm.org/D46567
Added:
llvm/trunk/test/tools/llvm-objcopy/strip-all-and-remove.test
llvm/trunk/test/tools/llvm-objcopy/strip-debug-and-remove.test
Modified:
llvm/trunk/tools/llvm-objcopy/StripOpts.td
llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp
Added: llvm/trunk/test/tools/llvm-objcopy/strip-all-and-remove.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/strip-all-and-remove.test?rev=332081&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/strip-all-and-remove.test (added)
+++ llvm/trunk/test/tools/llvm-objcopy/strip-all-and-remove.test Thu May 10 22:27:06 2018
@@ -0,0 +1,49 @@
+# RUN: yaml2obj %s > %t
+# RUN: cp %t %t1
+
+# RUN: llvm-strip -remove-section=.text.bar %t
+# RUN: llvm-readobj -file-headers -sections -symbols %t | FileCheck %s
+
+# RUN: llvm-objcopy -strip-all -remove-section=.text.bar %t1 %t1
+# RUN: cmp %t %t1
+
+!ELF
+FileHeader:
+ Class: ELFCLASS64
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_X86_64
+Sections:
+ - Name: .debug_foo
+ Type: SHT_PROGBITS
+ Content: "00000000"
+ - Name: .text
+ Type: SHT_PROGBITS
+ Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
+ AddressAlign: 0x0000000000000010
+ Content: "00000000"
+ - Name: .text.bar
+ Type: SHT_PROGBITS
+ Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
+ AddressAlign: 0x0000000000000010
+ Content: "00000000"
+Symbols:
+ Global:
+ - Name: debugfoo
+ Section: .debug_foo
+ - Name: foo
+ Section: .text
+ - Name: bar
+ Section: .text.bar
+
+# CHECK: SectionHeaderCount: 3
+
+# CHECK: Name: .text
+# CHECK: Name: .shstrtab
+# CHECK-NOT: Name: .text.bar
+# CHECK-NOT: Name: .debug_foo
+# CHECK-NOT: Name: .symtab
+
+# Check that *only* foo is copied and no debugfoo or textbar
+# CHECK: Symbols [
+# CHECK-NEXT: ]
Added: llvm/trunk/test/tools/llvm-objcopy/strip-debug-and-remove.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/strip-debug-and-remove.test?rev=332081&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/strip-debug-and-remove.test (added)
+++ llvm/trunk/test/tools/llvm-objcopy/strip-debug-and-remove.test Thu May 10 22:27:06 2018
@@ -0,0 +1,68 @@
+# RUN: yaml2obj %s > %t
+# RUN: cp %t %t1
+
+# RUN: llvm-strip -strip-debug -remove-section=.text.bar %t
+# RUN: llvm-readobj -file-headers -sections -symbols %t | FileCheck %s
+
+# RUN: llvm-objcopy -strip-debug -remove-section=.text.bar %t1 %t1
+# RUN: cmp %t %t1
+
+!ELF
+FileHeader:
+ Class: ELFCLASS64
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_X86_64
+Sections:
+ - Name: .debug_foo
+ Type: SHT_PROGBITS
+ Content: "00000000"
+ - Name: .text
+ Type: SHT_PROGBITS
+ Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
+ AddressAlign: 0x0000000000000010
+ Content: "00000000"
+ - Name: .text.bar
+ Type: SHT_PROGBITS
+ Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
+ AddressAlign: 0x0000000000000010
+ Content: "00000000"
+Symbols:
+ Global:
+ - Name: debugfoo
+ Section: .debug_foo
+ - Name: foo
+ Section: .text
+ - Name: bar
+ Section: .text.bar
+
+# CHECK: SectionHeaderCount: 5
+
+# CHECK: Name: .text
+# CHECK: Name: .symtab
+# CHECK: Name: .strtab
+# CHECK: Name: .shstrtab
+# CHECK-NOT: Name: .text.bar
+# CHECK-NOT: Name: .debug_foo
+
+# Check that *only* foo is copied and no debugfoo or textbar
+# CHECK: Symbols [
+# CHECK-NEXT: Symbol {
+# CHECK-NEXT: Name:
+# CHECK-NEXT: Value:
+# CHECK-NEXT: Size:
+# CHECK-NEXT: Binding:
+# CHECK-NEXT: Type:
+# CHECK-NEXT: Other:
+# CHECK-NEXT: Section: Undefined
+# CHECK-NEXT: }
+# CHECK-NEXT: Symbol {
+# CHECK-NEXT: Name: foo
+# CHECK-NEXT: Value:
+# CHECK-NEXT: Size:
+# CHECK-NEXT: Binding: Global
+# CHECK-NEXT: Type:
+# CHECK-NEXT: Other:
+# CHECK-NEXT: Section: .text
+# CHECK-NEXT: }
+# CHECK-NEXT: ]
Modified: llvm/trunk/tools/llvm-objcopy/StripOpts.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objcopy/StripOpts.td?rev=332081&r1=332080&r2=332081&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objcopy/StripOpts.td (original)
+++ llvm/trunk/tools/llvm-objcopy/StripOpts.td Thu May 10 22:27:06 2018
@@ -10,3 +10,9 @@ def help : Flag<["-", "--"], "help">;
def strip_debug : Flag<["-", "--"], "strip-debug">,
HelpText<"Remove debugging symbols only">;
+defm remove_section : Eq<"remove-section">,
+ MetaVarName<"section">,
+ HelpText<"Remove <section>">;
+
+def R : JoinedOrSeparate<["-"], "R">,
+ Alias<remove_section>;
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=332081&r1=332080&r2=332081&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp (original)
+++ llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp Thu May 10 22:27:06 2018
@@ -528,6 +528,10 @@ CopyConfig ParseStripOptions(ArrayRef<co
Config.StripDebug = InputArgs.hasArg(STRIP_strip_debug);
if (!Config.StripDebug)
Config.StripAll = true;
+
+ for (auto Arg : InputArgs.filtered(STRIP_remove_section))
+ Config.ToRemove.push_back(Arg->getValue());
+
return Config;
}
More information about the llvm-commits
mailing list