diff options
| author | Kevin Enderby <enderby@apple.com> | 2016-05-31 20:35:34 +0000 |
|---|---|---|
| committer | Kevin Enderby <enderby@apple.com> | 2016-05-31 20:35:34 +0000 |
| commit | 9acb109930dd2584438f0d985a964ac3924faf0e (patch) | |
| tree | e89a92630b53f358afe577b135a911fb57f315bd /llvm/test/Object/Inputs | |
| parent | 87ea3b05b9d1cc1f7512b53b191f265a93b1ec01 (diff) | |
| download | bcm5719-llvm-9acb109930dd2584438f0d985a964ac3924faf0e.tar.gz bcm5719-llvm-9acb109930dd2584438f0d985a964ac3924faf0e.zip | |
Change llvm-objdump, llvm-nm and llvm-size when reporting an object file error
when the object is from a slice of a Mach-O Universal Binary use something like
"foo.o (for architecture i386)" as part of the error message when expected.
Also fixed places in these tools that were ignoring object file errors from
MachOUniversalBinary::getAsObjectFile() when the code moved on to see if
the slice was an archive.
To do this MachOUniversalBinary::getAsObjectFile() and
MachOUniversalBinary::getObjectForArch() were changed from returning
ErrorOr<...> to Expected<...> then that was threaded up to its users.
Converting these interfaces to Expected<> from ErrorOr<> does involve
touching a number of places. To contain the changes for now the use of
errorToErrorCode() is still used in two places yet to be fully converted.
llvm-svn: 271332
Diffstat (limited to 'llvm/test/Object/Inputs')
| -rw-r--r-- | llvm/test/Object/Inputs/macho-universal-archive-bad1.x86_64.i386 | bin | 0 -> 6132 bytes |
| -rw-r--r-- | llvm/test/Object/Inputs/macho-universal-archive-bad2.x86_64.i386 | bin | 0 -> 1672 bytes |
| -rw-r--r-- | llvm/test/Object/Inputs/macho-universal-bad1.x86_64.i386 | bin | 0 -> 12728 bytes |
| -rw-r--r-- | llvm/test/Object/Inputs/macho-universal-bad2.x86_64.i386 | bin | 0 -> 8256 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/llvm/test/Object/Inputs/macho-universal-archive-bad1.x86_64.i386 b/llvm/test/Object/Inputs/macho-universal-archive-bad1.x86_64.i386 Binary files differnew file mode 100644 index 00000000000..30ab297b090 --- /dev/null +++ b/llvm/test/Object/Inputs/macho-universal-archive-bad1.x86_64.i386 diff --git a/llvm/test/Object/Inputs/macho-universal-archive-bad2.x86_64.i386 b/llvm/test/Object/Inputs/macho-universal-archive-bad2.x86_64.i386 Binary files differnew file mode 100644 index 00000000000..763dbbc01ca --- /dev/null +++ b/llvm/test/Object/Inputs/macho-universal-archive-bad2.x86_64.i386 diff --git a/llvm/test/Object/Inputs/macho-universal-bad1.x86_64.i386 b/llvm/test/Object/Inputs/macho-universal-bad1.x86_64.i386 Binary files differnew file mode 100644 index 00000000000..7fe21dc324a --- /dev/null +++ b/llvm/test/Object/Inputs/macho-universal-bad1.x86_64.i386 diff --git a/llvm/test/Object/Inputs/macho-universal-bad2.x86_64.i386 b/llvm/test/Object/Inputs/macho-universal-bad2.x86_64.i386 Binary files differnew file mode 100644 index 00000000000..ec83c38fe60 --- /dev/null +++ b/llvm/test/Object/Inputs/macho-universal-bad2.x86_64.i386 |
