[llvm] r348446 - [llvm-objcopy] Change --only-keep to --only-section
Jake Ehrlich via llvm-commits
llvm-commits at lists.llvm.org
Wed Dec 5 18:03:53 PST 2018
Author: jakehehrlich
Date: Wed Dec 5 18:03:53 2018
New Revision: 348446
URL: http://llvm.org/viewvc/llvm-project?rev=348446&view=rev
Log:
[llvm-objcopy] Change --only-keep to --only-section
I just hard core goofed when I wrote this and created a different name
for no good reason. I'm failry aware of most "fresh" users of llvm-objcopy
(that is, users which are not using it as a drop in replacement for GNU
objcopy) and can say that only "-j" is being used by such people so this
patch should strictly increase compatibility and not remove it.
Differential Revision: https://reviews.llvm.org/D52180
Added:
llvm/trunk/test/tools/llvm-objcopy/ELF/basic-only-section.test
llvm/trunk/test/tools/llvm-objcopy/ELF/explicit-only-section-remove.test
llvm/trunk/test/tools/llvm-objcopy/ELF/keep-only-section.test
llvm/trunk/test/tools/llvm-objcopy/ELF/only-section-many.test
llvm/trunk/test/tools/llvm-objcopy/ELF/only-section-remove-strtab.test
llvm/trunk/test/tools/llvm-objcopy/ELF/only-section-strip-non-alloc.test
llvm/trunk/test/tools/llvm-objcopy/ELF/strip-sections-only-section.test
Removed:
llvm/trunk/test/tools/llvm-objcopy/ELF/basic-only-keep.test
llvm/trunk/test/tools/llvm-objcopy/ELF/explicit-only-keep-remove.test
llvm/trunk/test/tools/llvm-objcopy/ELF/keep-only-keep.test
llvm/trunk/test/tools/llvm-objcopy/ELF/only-keep-many.test
llvm/trunk/test/tools/llvm-objcopy/ELF/only-keep-remove-strtab.test
llvm/trunk/test/tools/llvm-objcopy/ELF/only-keep-strip-non-alloc.test
llvm/trunk/test/tools/llvm-objcopy/ELF/strip-sections-only-keep.test
Modified:
llvm/trunk/test/tools/llvm-objcopy/ELF/dump-section.test
llvm/trunk/tools/llvm-objcopy/CopyConfig.cpp
llvm/trunk/tools/llvm-objcopy/CopyConfig.h
llvm/trunk/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
llvm/trunk/tools/llvm-objcopy/ObjcopyOpts.td
Removed: llvm/trunk/test/tools/llvm-objcopy/ELF/basic-only-keep.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/basic-only-keep.test?rev=348445&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/basic-only-keep.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/basic-only-keep.test (removed)
@@ -1,23 +0,0 @@
-# RUN: yaml2obj %s > %t
-# RUN: llvm-objcopy -only-keep=.test %t %t2
-# RUN: llvm-objcopy -j .test %t %t3
-# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
-# RUN: diff %t2 %t3
-
-!ELF
-FileHeader:
- Class: ELFCLASS64
- Data: ELFDATA2LSB
- Type: ET_REL
- Machine: EM_X86_64
-Sections:
- - Name: .test
- Type: SHT_PROGBITS
- Flags: [ ]
-
-# CHECK: SectionHeaderCount: 5
-
-# CHECK: Name: .test
-# CHECK: Name: .symtab
-# CHECK: Name: .strtab
-# CHECK: Name: .shstrtab
Added: llvm/trunk/test/tools/llvm-objcopy/ELF/basic-only-section.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/basic-only-section.test?rev=348446&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/basic-only-section.test (added)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/basic-only-section.test Wed Dec 5 18:03:53 2018
@@ -0,0 +1,23 @@
+# RUN: yaml2obj %s > %t
+# RUN: llvm-objcopy -only-section=.test %t %t2
+# RUN: llvm-objcopy -j .test %t %t3
+# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
+# RUN: diff %t2 %t3
+
+!ELF
+FileHeader:
+ Class: ELFCLASS64
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_X86_64
+Sections:
+ - Name: .test
+ Type: SHT_PROGBITS
+ Flags: [ ]
+
+# CHECK: SectionHeaderCount: 5
+
+# CHECK: Name: .test
+# CHECK: Name: .symtab
+# CHECK: Name: .strtab
+# CHECK: Name: .shstrtab
Modified: llvm/trunk/test/tools/llvm-objcopy/ELF/dump-section.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/dump-section.test?rev=348446&r1=348445&r2=348446&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/dump-section.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/dump-section.test Wed Dec 5 18:03:53 2018
@@ -1,6 +1,6 @@
# RUN: yaml2obj %s > %t
# RUN: llvm-objcopy -O binary -j .text %t %t2
-# RUN: llvm-objcopy -O binary -only-keep .text %t %t3
+# RUN: llvm-objcopy -O binary -only-section .text %t %t3
# RUN: llvm-objcopy --dump-section .text=%t4 %t %t5
# RUN: llvm-objcopy --dump-section .foo=%t6 %t %t7
# RUN: not llvm-objcopy --dump-section .bar=%t8 %t %t9 2>&1 | FileCheck %s --check-prefix=NOBITS
Removed: llvm/trunk/test/tools/llvm-objcopy/ELF/explicit-only-keep-remove.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/explicit-only-keep-remove.test?rev=348445&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/explicit-only-keep-remove.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/explicit-only-keep-remove.test (removed)
@@ -1,21 +0,0 @@
-# RUN: yaml2obj %s > %t
-# RUN: llvm-objcopy -R=.test -only-keep=.test %t %t2
-# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
-
-!ELF
-FileHeader:
- Class: ELFCLASS64
- Data: ELFDATA2LSB
- Type: ET_REL
- Machine: EM_X86_64
-Sections:
- - Name: .test
- Type: SHT_PROGBITS
- Flags: [ ]
-
-# CHECK: SectionHeaderCount: 5
-
-# CHECK: Name: .test
-# CHECK: Name: .symtab
-# CHECK: Name: .strtab
-# CHECK: Name: .shstrtab
Added: llvm/trunk/test/tools/llvm-objcopy/ELF/explicit-only-section-remove.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/explicit-only-section-remove.test?rev=348446&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/explicit-only-section-remove.test (added)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/explicit-only-section-remove.test Wed Dec 5 18:03:53 2018
@@ -0,0 +1,21 @@
+# RUN: yaml2obj %s > %t
+# RUN: llvm-objcopy -R=.test -only-section=.test %t %t2
+# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
+
+!ELF
+FileHeader:
+ Class: ELFCLASS64
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_X86_64
+Sections:
+ - Name: .test
+ Type: SHT_PROGBITS
+ Flags: [ ]
+
+# CHECK: SectionHeaderCount: 5
+
+# CHECK: Name: .test
+# CHECK: Name: .symtab
+# CHECK: Name: .strtab
+# CHECK: Name: .shstrtab
Removed: llvm/trunk/test/tools/llvm-objcopy/ELF/keep-only-keep.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/keep-only-keep.test?rev=348445&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/keep-only-keep.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/keep-only-keep.test (removed)
@@ -1,27 +0,0 @@
-# RUN: yaml2obj %s > %t
-# RUN: llvm-objcopy -keep-section=.test2 -only-keep=.test %t %t2
-# RUN: llvm-objcopy -j .test -keep-section=.test2 %t %t3
-# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
-# RUN: diff %t2 %t3
-
-!ELF
-FileHeader:
- Class: ELFCLASS64
- Data: ELFDATA2LSB
- Type: ET_REL
- Machine: EM_X86_64
-Sections:
- - Name: .test
- Type: SHT_PROGBITS
- - Name: .test2
- Type: SHT_PROGBITS
- - Name: .test3
- Type: SHT_PROGBITS
-
-# CHECK: SectionHeaderCount: 6
-
-# CHECK: Name: .test
-# CHECK: Name: .test2
-# CHECK: Name: .symtab
-# CHECK: Name: .strtab
-# CHECK: Name: .shstrtab
Added: llvm/trunk/test/tools/llvm-objcopy/ELF/keep-only-section.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/keep-only-section.test?rev=348446&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/keep-only-section.test (added)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/keep-only-section.test Wed Dec 5 18:03:53 2018
@@ -0,0 +1,27 @@
+# RUN: yaml2obj %s > %t
+# RUN: llvm-objcopy -keep-section=.test2 -only-section=.test %t %t2
+# RUN: llvm-objcopy -j .test -keep-section=.test2 %t %t3
+# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
+# RUN: diff %t2 %t3
+
+!ELF
+FileHeader:
+ Class: ELFCLASS64
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_X86_64
+Sections:
+ - Name: .test
+ Type: SHT_PROGBITS
+ - Name: .test2
+ Type: SHT_PROGBITS
+ - Name: .test3
+ Type: SHT_PROGBITS
+
+# CHECK: SectionHeaderCount: 6
+
+# CHECK: Name: .test
+# CHECK: Name: .test2
+# CHECK: Name: .symtab
+# CHECK: Name: .strtab
+# CHECK: Name: .shstrtab
Removed: llvm/trunk/test/tools/llvm-objcopy/ELF/only-keep-many.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/only-keep-many.test?rev=348445&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/only-keep-many.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/only-keep-many.test (removed)
@@ -1,28 +0,0 @@
-# RUN: yaml2obj %s > %t
-# RUN: llvm-objcopy -j .test1 -j .test2 %t %t2
-# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
-
-!ELF
-FileHeader:
- Class: ELFCLASS64
- Data: ELFDATA2LSB
- Type: ET_REL
- Machine: EM_X86_64
-Sections:
- - Name: .test1
- Type: SHT_PROGBITS
- Flags: [ ]
- - Name: .test2
- Type: SHT_PROGBITS
- Flags: [ ]
- - Name: .test3
- Type: SHT_PROGBITS
- Flags: [ ]
-
-# CHECK: SectionHeaderCount: 6
-
-# CHECK: Name: .test1
-# CHECK: Name: .test2
-# CHECK: Name: .symtab
-# CHECK: Name: .strtab
-# CHECK: Name: .shstrtab
Removed: llvm/trunk/test/tools/llvm-objcopy/ELF/only-keep-remove-strtab.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/only-keep-remove-strtab.test?rev=348445&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/only-keep-remove-strtab.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/only-keep-remove-strtab.test (removed)
@@ -1,21 +0,0 @@
-# RUN: yaml2obj %s > %t
-# RUN: llvm-objcopy -R .symtab -R .strtab -only-keep=.test %t %t2
-# RUN: llvm-objcopy -j .test -R .strtab -R .symtab %t %t3
-# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
-# RUN: diff %t2 %t3
-
-!ELF
-FileHeader:
- Class: ELFCLASS64
- Data: ELFDATA2LSB
- Type: ET_REL
- Machine: EM_X86_64
-Sections:
- - Name: .test
- Type: SHT_PROGBITS
- Flags: [ ]
-
-# CHECK: SectionHeaderCount: 3
-
-# CHECK: Name: .test
-# CHECK: Name: .shstrtab
Removed: llvm/trunk/test/tools/llvm-objcopy/ELF/only-keep-strip-non-alloc.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/only-keep-strip-non-alloc.test?rev=348445&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/only-keep-strip-non-alloc.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/only-keep-strip-non-alloc.test (removed)
@@ -1,19 +0,0 @@
-# RUN: yaml2obj %s > %t
-# RUN: llvm-objcopy -strip-non-alloc -only-keep=.test %t %t2
-# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
-
-!ELF
-FileHeader:
- Class: ELFCLASS64
- Data: ELFDATA2LSB
- Type: ET_REL
- Machine: EM_X86_64
-Sections:
- - Name: .test
- Type: SHT_PROGBITS
- Flags: [ ]
-
-# CHECK: SectionHeaderCount: 3
-
-# CHECK: Name: .test
-# CHECK: Name: .shstrtab
Added: llvm/trunk/test/tools/llvm-objcopy/ELF/only-section-many.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/only-section-many.test?rev=348446&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/only-section-many.test (added)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/only-section-many.test Wed Dec 5 18:03:53 2018
@@ -0,0 +1,28 @@
+# RUN: yaml2obj %s > %t
+# RUN: llvm-objcopy -j .test1 -j .test2 %t %t2
+# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
+
+!ELF
+FileHeader:
+ Class: ELFCLASS64
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_X86_64
+Sections:
+ - Name: .test1
+ Type: SHT_PROGBITS
+ Flags: [ ]
+ - Name: .test2
+ Type: SHT_PROGBITS
+ Flags: [ ]
+ - Name: .test3
+ Type: SHT_PROGBITS
+ Flags: [ ]
+
+# CHECK: SectionHeaderCount: 6
+
+# CHECK: Name: .test1
+# CHECK: Name: .test2
+# CHECK: Name: .symtab
+# CHECK: Name: .strtab
+# CHECK: Name: .shstrtab
Added: llvm/trunk/test/tools/llvm-objcopy/ELF/only-section-remove-strtab.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/only-section-remove-strtab.test?rev=348446&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/only-section-remove-strtab.test (added)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/only-section-remove-strtab.test Wed Dec 5 18:03:53 2018
@@ -0,0 +1,21 @@
+# RUN: yaml2obj %s > %t
+# RUN: llvm-objcopy -R .symtab -R .strtab -only-section=.test %t %t2
+# RUN: llvm-objcopy -j .test -R .strtab -R .symtab %t %t3
+# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
+# RUN: diff %t2 %t3
+
+!ELF
+FileHeader:
+ Class: ELFCLASS64
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_X86_64
+Sections:
+ - Name: .test
+ Type: SHT_PROGBITS
+ Flags: [ ]
+
+# CHECK: SectionHeaderCount: 3
+
+# CHECK: Name: .test
+# CHECK: Name: .shstrtab
Added: llvm/trunk/test/tools/llvm-objcopy/ELF/only-section-strip-non-alloc.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/only-section-strip-non-alloc.test?rev=348446&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/only-section-strip-non-alloc.test (added)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/only-section-strip-non-alloc.test Wed Dec 5 18:03:53 2018
@@ -0,0 +1,19 @@
+# RUN: yaml2obj %s > %t
+# RUN: llvm-objcopy -strip-non-alloc -only-section=.test %t %t2
+# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
+
+!ELF
+FileHeader:
+ Class: ELFCLASS64
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_X86_64
+Sections:
+ - Name: .test
+ Type: SHT_PROGBITS
+ Flags: [ ]
+
+# CHECK: SectionHeaderCount: 3
+
+# CHECK: Name: .test
+# CHECK: Name: .shstrtab
Removed: llvm/trunk/test/tools/llvm-objcopy/ELF/strip-sections-only-keep.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/strip-sections-only-keep.test?rev=348445&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/strip-sections-only-keep.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/strip-sections-only-keep.test (removed)
@@ -1,20 +0,0 @@
-# RUN: yaml2obj %s > %t
-# RUN: llvm-objcopy -strip-sections -only-keep=.test %t %t2
-# RUN: od -Ax -t x1 %t2 | FileCheck %s
-# RUN: od -Ax -t c %t2 | FileCheck %s -check-prefix=TEXT
-
-!ELF
-FileHeader:
- Class: ELFCLASS64
- Data: ELFDATA2LSB
- Type: ET_REL
- Machine: EM_X86_64
-Sections:
- - Name: .test
- Type: SHT_PROGBITS
- Flags: [ ]
- Content: "DEADBEEF"
-
-# CHECK: de ad be ef
-
-# TEXT-NOT: t e s t
Added: llvm/trunk/test/tools/llvm-objcopy/ELF/strip-sections-only-section.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/strip-sections-only-section.test?rev=348446&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/strip-sections-only-section.test (added)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/strip-sections-only-section.test Wed Dec 5 18:03:53 2018
@@ -0,0 +1,20 @@
+# RUN: yaml2obj %s > %t
+# RUN: llvm-objcopy -strip-sections -only-section=.test %t %t2
+# RUN: od -Ax -t x1 %t2 | FileCheck %s
+# RUN: od -Ax -t c %t2 | FileCheck %s -check-prefix=TEXT
+
+!ELF
+FileHeader:
+ Class: ELFCLASS64
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_X86_64
+Sections:
+ - Name: .test
+ Type: SHT_PROGBITS
+ Flags: [ ]
+ Content: "DEADBEEF"
+
+# CHECK: de ad be ef
+
+# TEXT-NOT: t e s t
Modified: llvm/trunk/tools/llvm-objcopy/CopyConfig.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objcopy/CopyConfig.cpp?rev=348446&r1=348445&r2=348446&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objcopy/CopyConfig.cpp (original)
+++ llvm/trunk/tools/llvm-objcopy/CopyConfig.cpp Wed Dec 5 18:03:53 2018
@@ -315,8 +315,8 @@ DriverConfig parseObjcopyOptions(ArrayRe
Config.ToRemove.push_back(Arg->getValue());
for (auto Arg : InputArgs.filtered(OBJCOPY_keep_section))
Config.KeepSection.push_back(Arg->getValue());
- for (auto Arg : InputArgs.filtered(OBJCOPY_only_keep))
- Config.OnlyKeep.push_back(Arg->getValue());
+ for (auto Arg : InputArgs.filtered(OBJCOPY_only_section))
+ Config.OnlySection.push_back(Arg->getValue());
for (auto Arg : InputArgs.filtered(OBJCOPY_add_section))
Config.AddSection.push_back(Arg->getValue());
for (auto Arg : InputArgs.filtered(OBJCOPY_dump_section))
Modified: llvm/trunk/tools/llvm-objcopy/CopyConfig.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objcopy/CopyConfig.h?rev=348446&r1=348445&r2=348446&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objcopy/CopyConfig.h (original)
+++ llvm/trunk/tools/llvm-objcopy/CopyConfig.h Wed Dec 5 18:03:53 2018
@@ -61,7 +61,7 @@ struct CopyConfig {
std::vector<StringRef> AddSection;
std::vector<StringRef> DumpSection;
std::vector<StringRef> KeepSection;
- std::vector<StringRef> OnlyKeep;
+ std::vector<StringRef> OnlySection;
std::vector<StringRef> SymbolsToGlobalize;
std::vector<StringRef> SymbolsToKeep;
std::vector<StringRef> SymbolsToLocalize;
Modified: llvm/trunk/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objcopy/ELF/ELFObjcopy.cpp?rev=348446&r1=348445&r2=348446&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objcopy/ELF/ELFObjcopy.cpp (original)
+++ llvm/trunk/tools/llvm-objcopy/ELF/ELFObjcopy.cpp Wed Dec 5 18:03:53 2018
@@ -415,10 +415,10 @@ static void handleArgs(const CopyConfig
};
// Explicit copies:
- if (!Config.OnlyKeep.empty()) {
+ if (!Config.OnlySection.empty()) {
RemovePred = [&Config, RemovePred, &Obj](const SectionBase &Sec) {
// Explicitly keep these sections regardless of previous removes.
- if (is_contained(Config.OnlyKeep, Sec.Name))
+ if (is_contained(Config.OnlySection, Sec.Name))
return false;
// Allow all implicit removes.
Modified: llvm/trunk/tools/llvm-objcopy/ObjcopyOpts.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objcopy/ObjcopyOpts.td?rev=348446&r1=348445&r2=348446&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objcopy/ObjcopyOpts.td (original)
+++ llvm/trunk/tools/llvm-objcopy/ObjcopyOpts.td Wed Dec 5 18:03:53 2018
@@ -78,9 +78,9 @@ defm redefine_symbol
MetaVarName<"old=new">;
defm keep_section : Eq<"keep-section", "Keep <section>">,
MetaVarName<"section">;
-defm only_keep : Eq<"only-keep", "Remove all but <section>">,
- MetaVarName<"section">;
-def j : JoinedOrSeparate<["-"], "j">, Alias<only_keep>;
+defm only_section : Eq<"only-section", "Remove all but <section>">,
+ MetaVarName<"section">;
+def j : JoinedOrSeparate<["-"], "j">, Alias<only_section>;
defm add_section
: Eq<"add-section",
"Make a section named <section> with the contents of <file>.">,
More information about the llvm-commits
mailing list