Index: test/tools/llvm-objcopy/remove-section.test =================================================================== --- test/tools/llvm-objcopy/remove-section.test +++ test/tools/llvm-objcopy/remove-section.test @@ -1,7 +1,12 @@ # RUN: yaml2obj %s > %t +# RUN: cp %t %t1 # RUN: llvm-objcopy -R .test2 %t %t2 # RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: cmp %t %t1 +# RUN: llvm-objcopy -remove-section=.test2 %t1 %t3 +# RUN: cmp %t2 %t3 + !ELF FileHeader: Class: ELFCLASS64 Index: test/tools/llvm-objcopy/strip-and-remove.test =================================================================== --- test/tools/llvm-objcopy/strip-and-remove.test +++ test/tools/llvm-objcopy/strip-and-remove.test @@ -0,0 +1,48 @@ +# 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: .debugfoo + 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: .debugfoo + - 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: .debugfoo + +# Check that *only* foo is copied and no debugfoo or textbar +# CHECK: Symbols [ +# CHECK-NEXT: ] Index: test/tools/llvm-objcopy/strip-debug-and-remove.test =================================================================== --- test/tools/llvm-objcopy/strip-debug-and-remove.test +++ test/tools/llvm-objcopy/strip-debug-and-remove.test @@ -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: .debugfoo + 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: .debugfoo + - 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: .debugfoo + +# 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: ] Index: tools/llvm-objcopy/StripOpts.td =================================================================== --- tools/llvm-objcopy/StripOpts.td +++ tools/llvm-objcopy/StripOpts.td @@ -10,3 +10,9 @@ def strip_debug : Flag<["-", "--"], "strip-debug">, HelpText<"Remove debugging symbols only">; +defm remove_section : Eq<"remove-section">, + MetaVarName<"section">, + HelpText<"Remove
">; + +def R : JoinedOrSeparate<["-"], "R">, + Alias; Index: tools/llvm-objcopy/llvm-objcopy.cpp =================================================================== --- tools/llvm-objcopy/llvm-objcopy.cpp +++ tools/llvm-objcopy/llvm-objcopy.cpp @@ -519,6 +519,10 @@ 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; }