[llvm-objcopy] Rename --keep to --keep-section.
Summary:
llvm-objcopy/strip support `--keep` (for sections) and `--keep-symbols` (for symbols). For consistency and clarity, rename `--keep` to `--keep-section`.
In fact, for GNU compatability, -K is --keep-symbol, so it's weird that the alias `-K` is not the same as the short-ish `--keep`.
Reviewers: jakehehrlich, jhenderson, alexshap, MaskRay, espindola
Reviewed By: jakehehrlich, MaskRay
Subscribers: emaste, arichardson, llvm-commits
Differential Revision: https://reviews.llvm.org/D54477
llvm-svn: 346782
diff --git a/llvm/test/tools/llvm-objcopy/basic-keep.test b/llvm/test/tools/llvm-objcopy/basic-keep.test
index 8f4acb0..79d7717 100644
--- a/llvm/test/tools/llvm-objcopy/basic-keep.test
+++ b/llvm/test/tools/llvm-objcopy/basic-keep.test
@@ -1,6 +1,6 @@
# RUN: yaml2obj %s > %t
-# RUN: llvm-objcopy -strip-non-alloc -keep=.test %t %t2
-# RUN: llvm-strip --strip-all -keep=.test %t -o %t3
+# RUN: llvm-objcopy -strip-non-alloc -keep-section=.test %t %t2
+# RUN: llvm-strip --strip-all -keep-section=.test %t -o %t3
# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
# RUN: cmp %t2 %t3
diff --git a/llvm/test/tools/llvm-objcopy/explicit-keep-remove.test b/llvm/test/tools/llvm-objcopy/explicit-keep-remove.test
index 5ebd2a5..fea708e 100644
--- a/llvm/test/tools/llvm-objcopy/explicit-keep-remove.test
+++ b/llvm/test/tools/llvm-objcopy/explicit-keep-remove.test
@@ -1,5 +1,5 @@
# RUN: yaml2obj %s > %t
-# RUN: llvm-objcopy -R=.test -keep=.test %t %t2
+# RUN: llvm-objcopy -R=.test -keep-section=.test %t %t2
# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
!ELF
diff --git a/llvm/test/tools/llvm-objcopy/keep-many.test b/llvm/test/tools/llvm-objcopy/keep-many.test
index 6627377..2abb19d 100644
--- a/llvm/test/tools/llvm-objcopy/keep-many.test
+++ b/llvm/test/tools/llvm-objcopy/keep-many.test
@@ -1,5 +1,5 @@
# RUN: yaml2obj %s > %t
-# RUN: llvm-objcopy -strip-non-alloc -keep=.test -keep=.test3 %t %t2
+# RUN: llvm-objcopy -strip-non-alloc -keep-section=.test -keep-section=.test3 %t %t2
# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s
!ELF
diff --git a/llvm/test/tools/llvm-objcopy/keep-only-keep.test b/llvm/test/tools/llvm-objcopy/keep-only-keep.test
index 75f7d72..7c546c8 100644
--- a/llvm/test/tools/llvm-objcopy/keep-only-keep.test
+++ b/llvm/test/tools/llvm-objcopy/keep-only-keep.test
@@ -1,6 +1,6 @@
# RUN: yaml2obj %s > %t
-# RUN: llvm-objcopy -keep=.test2 -only-keep=.test %t %t2
-# RUN: llvm-objcopy -j .test -keep=.test2 %t %t3
+# 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
diff --git a/llvm/test/tools/llvm-objcopy/strip-sections-keep.test b/llvm/test/tools/llvm-objcopy/strip-sections-keep.test
index dcf6968..f0031fae 100644
--- a/llvm/test/tools/llvm-objcopy/strip-sections-keep.test
+++ b/llvm/test/tools/llvm-objcopy/strip-sections-keep.test
@@ -1,5 +1,5 @@
# RUN: yaml2obj %s > %t
-# RUN: llvm-objcopy -strip-sections -keep=.shstrtab %t %t2
+# RUN: llvm-objcopy -strip-sections -keep-section=.shstrtab %t %t2
# RUN: od -Ax -t c %t2 | FileCheck %s
!ELF
diff --git a/llvm/test/tools/llvm-symbolizer/split-debug.test b/llvm/test/tools/llvm-symbolizer/split-debug.test
index 2d5b073..7474cd6 100644
--- a/llvm/test/tools/llvm-symbolizer/split-debug.test
+++ b/llvm/test/tools/llvm-symbolizer/split-debug.test
@@ -18,7 +18,7 @@
#Build as : clang -g -O2 addr.c
RUN: mkdir -p %t/.debug
-RUN: llvm-objcopy --keep=.debug_info %p/Inputs/addr.exe %t/.debug/addr
+RUN: llvm-objcopy --keep-section=.debug_info %p/Inputs/addr.exe %t/.debug/addr
RUN: llvm-objcopy --strip-debug --add-gnu-debuglink=%t/.debug/addr %p/Inputs/addr.exe %t/addr.exe
RUN: llvm-symbolizer -print-address -obj=%t/addr.exe < %p/Inputs/addr.inp | FileCheck %s