maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[llvm-objcopy] Add -F|--target compatibility 

Summary:
This change adds support for the GNU --target flag, which sets both --input-target and --output-target.

GNU objcopy doesn't do any checking for whether both --target and --{input,output}-target are used, and so it allows both, e.g. "--target A --output-target B" is equivalent to "--input-target A --output-target B" since the later command line flag would override earlier ones. This may be error prone, so I chose to implement it as an error if both are used. I'm not sure if anyone is actually using both.

Reviewers: jakehehrlich, jhenderson, alexshap

Reviewed By: jakehehrlich, alexshap

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D53029

llvm-svn: 344321
This commit is contained in:
Jordan Rupprecht 2018-10-12 00:36:01 +00:00
parent 56b6660d2e
commit bb4588e9c1
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
llvm/test/tools/llvm-objcopy/input-output-target.test Normal file
View File

@ -0,0 +1,22 @@
# RUN: echo abcd > %t.txt
# Preserve input to verify it is not modified
# RUN: cp %t.txt %t-copy.txt
# -F <target> is equivalent to -I <target> -O <target>
# RUN: llvm-objcopy -F binary -B i386:x86-64 %t.txt %t.2.txt
# RUN: cmp %t-copy.txt %t.2.txt
# --target <target> is equivalent to --input-target <target> --output-target <target>
# RUN: llvm-objcopy --target binary -B i386:x86-64 %t.txt %t.3.txt
# RUN: cmp %t-copy.txt %t.3.txt
# TODO: check --target and --input-target/--output-target are incompatible
# RUN: not llvm-objcopy --target binary --input-target binary -B i386:x86-64 \
# RUN: %t.txt %t.4.txt 2>&1 \
# RUN: | FileCheck %s --check-prefix=BAD-FLAG
# RUN: not llvm-objcopy --target binary --output-target binary -B i386:x86-64 \
# RUN: %t.txt %t.4.txt 2>&1 \
# RUN: | FileCheck %s --check-prefix=BAD-FLAG
# BAD-FLAG: --target cannot be used with --input-target or --output-target.

14
llvm/tools/llvm-objcopy/CopyConfig.cpp
View File

@ -247,8 +247,18 @@ DriverConfig parseObjcopyOptions(ArrayRef<const char *> ArgsArr) {
CopyConfig Config;
Config.InputFilename = Positional[0];
Config.OutputFilename = Positional[Positional.size() == 1 ? 0 : 1];
Config.InputFormat = InputArgs.getLastArgValue(OBJCOPY_input_target);
Config.OutputFormat = InputArgs.getLastArgValue(OBJCOPY_output_target);
if (InputArgs.hasArg(OBJCOPY_target) &&
(InputArgs.hasArg(OBJCOPY_input_target) ||
InputArgs.hasArg(OBJCOPY_output_target)))
error("--target cannot be used with --input-target or --output-target");
if (InputArgs.hasArg(OBJCOPY_target)) {
Config.InputFormat = InputArgs.getLastArgValue(OBJCOPY_target);
Config.OutputFormat = InputArgs.getLastArgValue(OBJCOPY_target);
} else {
Config.InputFormat = InputArgs.getLastArgValue(OBJCOPY_input_target);
Config.OutputFormat = InputArgs.getLastArgValue(OBJCOPY_output_target);
}
if (Config.InputFormat == "binary") {
auto BinaryArch = InputArgs.getLastArgValue(OBJCOPY_binary_architecture);
if (BinaryArch.empty())

4
llvm/tools/llvm-objcopy/ObjcopyOpts.td
View File

@ -10,6 +10,10 @@ defm binary_architecture : Eq<"binary-architecture">,
HelpText<"Used when transforming an architecture-less format (such as binary) to another format">;
def B : JoinedOrSeparate<["-"], "B">,
Alias<binary_architecture>;
defm target : Eq<"target">,
HelpText<"Format of the input and output file">,
Values<"binary">;
def F : JoinedOrSeparate<[ "-" ], "F">, Alias<target>;
defm input_target : Eq<"input-target">,
HelpText<"Format of the input file">,
Values<"binary">;