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

[dsymutil] Support multiple input files on the command line

Browse Source 
llvm-svn: 243777
This commit is contained in:
Frederic Riss 2015-07-31 20:22:20 +00:00
parent 08a36a35c8
commit 45a9df0fef
3 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/tools/dsymutil/X86/multiple-inputs.test Normal file
View File

@ -0,0 +1,12 @@
REQUIRES: shell
RUN: cat %p/../Inputs/basic.macho.x86_64 > %t1
RUN: cat %p/../Inputs/basic-archive.macho.x86_64 > %t2
RUN: cat %p/../Inputs/basic-lto.macho.x86_64 > %t3
RUN: cat %p/../Inputs/basic-lto-dw4.macho.x86_64 > %t4
RUN: llvm-dsymutil -oso-prepend-path=%p/.. %t1 %t2 %t3 %t4
RUN: llvm-dwarfdump %t1.dwarf \
| FileCheck %S/basic-linking-x86.test --check-prefix=CHECK --check-prefix=BASIC
RUN: llvm-dwarfdump %t2.dwarf \
| FileCheck %S/basic-linking-x86.test --check-prefix=CHECK --check-prefix=ARCHIVE
RUN: llvm-dwarfdump %t3.dwarf | FileCheck %S/basic-lto-linking-x86.test
RUN: llvm-dwarfdump %t4.dwarf | FileCheck %S/basic-lto-dw4-linking-x86.test

1
test/tools/dsymutil/basic-linking.test
View File

@ -1,6 +1,7 @@
RUN: llvm-dsymutil -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 | FileCheck %s
RUN: llvm-dsymutil -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic-lto.macho.x86_64 | FileCheck %s --check-prefix=CHECK-LTO
RUN: llvm-dsymutil -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic-archive.macho.x86_64 | FileCheck %s --check-prefix=CHECK-ARCHIVE
RUN: llvm-dsymutil -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 %p/Inputs/basic-lto.macho.x86_64 %p/Inputs/basic-archive.macho.x86_64 | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-LTO --check-prefix=CHECK-ARCHIVE
This test check the basic Dwarf linking process through the debug dumps.

52
tools/dsymutil/dsymutil.cpp
View File

@ -31,8 +31,8 @@ OptionCategory DsymCategory("Specific Options");
static opt<bool> Help("h", desc("Alias for -help"), Hidden);
static opt<bool> Version("v", desc("Alias for -version"), Hidden);
static opt<std::string> InputFile(Positional, desc("<input file>"),
init("a.out"), cat(DsymCategory));
static list<std::string> InputFiles(Positional, OneOrMore,
desc("<input files>"), cat(DsymCategory));
static opt<std::string>
OutputFileOpt("o",
@ -90,9 +90,6 @@ int main(int argc, char **argv) {
return 0;
}
auto DebugMapPtrOrErr =
parseDebugMap(InputFile, OsoPrependPath, Verbose, InputIsYAMLDebugMap);
Options.Verbose = Verbose;
Options.NoOutput = NoOutput;
Options.NoODR = NoODR;
@ -102,27 +99,40 @@ int main(int argc, char **argv) {
llvm::InitializeAllTargets();
llvm::InitializeAllAsmPrinters();
if (auto EC = DebugMapPtrOrErr.getError()) {
llvm::errs() << "error: cannot parse the debug map for \"" << InputFile
<< "\": " << EC.message() << '\n';
if (InputFiles.size() > 1 && !OutputFileOpt.empty()) {
llvm::errs() << "error: cannot use -o with multiple inputs\n";
return 1;
}
if (Verbose || DumpDebugMap)
(*DebugMapPtrOrErr)->print(llvm::outs());
for (auto &InputFile : InputFiles) {
auto DebugMapPtrOrErr =
parseDebugMap(InputFile, OsoPrependPath, Verbose, InputIsYAMLDebugMap);
if (DumpDebugMap)
return 0;
if (auto EC = DebugMapPtrOrErr.getError()) {
llvm::errs() << "error: cannot parse the debug map for \"" << InputFile
<< "\": " << EC.message() << '\n';
return 1;
}
std::string OutputFile;
if (OutputFileOpt.empty()) {
if (InputFile == "-")
OutputFile = "a.out.dwarf";
else
OutputFile = InputFile + ".dwarf";
} else {
OutputFile = OutputFileOpt;
if (Verbose || DumpDebugMap)
(*DebugMapPtrOrErr)->print(llvm::outs());
if (DumpDebugMap)
continue;
std::string OutputFile;
if (OutputFileOpt.empty()) {
if (InputFile == "-")
OutputFile = "a.out.dwarf";
else
OutputFile = InputFile + ".dwarf";
} else {
OutputFile = OutputFileOpt;
}
if (!linkDwarf(OutputFile, **DebugMapPtrOrErr, Options))
return 1;
}
return !linkDwarf(OutputFile, **DebugMapPtrOrErr, Options);
return 0;
}