RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 02:33:06 +01:00
Code Issues Projects Releases Wiki Activity

[llvm-strip] Add support for '--' for delimiting options from input files

Browse Source 
This will allow to use llvm-strip with file names that begin with dashes.

Reviewed By: jhenderson

Differential Revision: https://reviews.llvm.org/D102825
This commit is contained in:
Sergey Dmitriev 2021-05-20 02:29:32 -07:00
parent eb198d6426
commit 7095312ff1
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/tools/llvm-objcopy/dash-dash.test
View File

@ -1,20 +1,37 @@
## Create a clean temporary directory and cd to it to use relative paths.
# RUN: rm -rf %t && mkdir %t && cd %t
## Check that llvm-objcopy correctly treats paths after '--' as file paths,
## Check that tools correctly treat paths after '--' as file paths,
## even if they start with dashes.
# RUN: yaml2obj %s -o test-obj
# RUN: llvm-objcopy --only-section=.test test-obj -- --only-section
# RUN: llvm-objcopy --only-section=.test test-obj out-obj1
# RUN: cmp -- out-obj1 --only-section
# RUN: cp -- test-obj --strip-symbol
# RUN: cp -- test-obj strip-obj1
# RUN: llvm-strip --remove-section=.test strip-obj1 -- --strip-symbol
# RUN: cp -- test-obj no-dash-dash1
# RUN: llvm-strip --remove-section=.test no-dash-dash1
# RUN: cmp -- no-dash-dash1 strip-obj1
# RUN: cmp -- no-dash-dash1 --strip-symbol
## Check the case when '--' is specified with input files but no options.
# RUN: llvm-objcopy -- test-obj --add-section
# RUN: llvm-objcopy test-obj out-obj2
# RUN: cmp -- out-obj2 --add-section
# RUN: cp -- test-obj --keep-symbol
# RUN: cp -- test-obj strip-obj2
# RUN: llvm-strip -- strip-obj2 --keep-symbol
# RUN: cp -- test-obj no-dash-dash2
# RUN: llvm-strip no-dash-dash2
# RUN: cmp -- no-dash-dash2 strip-obj2
# RUN: cmp -- no-dash-dash2 --keep-symbol
## Check the case when '--' is specified with options but no input files.
# RUN: not llvm-objcopy --only-section=.test -- 2>&1 | FileCheck %s --check-prefixes=CHECK-NO-INPUT
# RUN: not llvm-strip --remove-section=.test -- 2>&1 | FileCheck %s --check-prefixes=CHECK-NO-INPUT
# CHECK-NO-INPUT: error: no input file specified

1
test/tools/llvm-objcopy/tool-help-message.test
View File

@ -9,6 +9,7 @@
# RUN: llvm-strip -h | FileCheck --check-prefix=STRIP-USAGE %s --match-full-lines
# RUN: llvm-strip --help | FileCheck --check-prefix=STRIP-USAGE %s --match-full-lines
# RUN: not llvm-strip 2>&1 | FileCheck --check-prefix=STRIP-USAGE %s --match-full-lines
# RUN: not llvm-strip -- 2>&1 | FileCheck --check-prefix=STRIP-USAGE %s --match-full-lines
# RUN: not llvm-strip -abcabc 2>&1 | FileCheck --check-prefix=UNKNOWN-ARG %s
# RUN: not llvm-strip --abcabc 2>&1 | FileCheck --check-prefix=UNKNOWN-ARG %s
# RUN: not llvm-strip --strip-debug 2>&1 | FileCheck %s --check-prefix=NO-INPUT-FILES

12
tools/llvm-objcopy/ConfigManager.cpp
View File

@ -1235,14 +1235,21 @@ parseBitcodeStripOptions(ArrayRef<const char *> ArgsArr) {
// help flag is set then ParseStripOptions will print the help messege and
// exit.
Expected<DriverConfig>
parseStripOptions(ArrayRef<const char *> ArgsArr,
parseStripOptions(ArrayRef<const char *> RawArgsArr,
llvm::function_ref<Error(Error)> ErrorCallback) {
const char *const *DashDash =
std::find_if(RawArgsArr.begin(), RawArgsArr.end(),
[](StringRef Str) { return Str == "--"; });
ArrayRef<const char *> ArgsArr = makeArrayRef(RawArgsArr.begin(), DashDash);
if (DashDash != RawArgsArr.end())
DashDash = std::next(DashDash);
StripOptTable T;
unsigned MissingArgumentIndex, MissingArgumentCount;
llvm::opt::InputArgList InputArgs =
T.ParseArgs(ArgsArr, MissingArgumentIndex, MissingArgumentCount);
if (InputArgs.size() == 0) {
if (InputArgs.size() == 0 && DashDash == RawArgsArr.end()) {
printHelp(T, errs(), ToolType::Strip);
exit(1);
}
@ -1264,6 +1271,7 @@ parseStripOptions(ArrayRef<const char *> ArgsArr,
Arg->getAsString(InputArgs).c_str());
for (auto Arg : InputArgs.filtered(STRIP_INPUT))
Positional.push_back(Arg->getValue());
std::copy(DashDash, RawArgsArr.end(), std::back_inserter(Positional));
if (Positional.empty())
return createStringError(errc::invalid_argument, "no input file specified");