diff options
author | Kevin Enderby <enderby@apple.com> | 2014-06-19 22:03:18 +0000 |
---|---|---|
committer | Kevin Enderby <enderby@apple.com> | 2014-06-19 22:03:18 +0000 |
commit | c28016e4131bdd50c23510adb3a0254b7fb5adc6 (patch) | |
tree | a3189bf985158cb78e2ca2b9ac6613fb53febced /lib | |
parent | 0b5745abd8e46ac60cd16f949a2fd5a581fc8fd4 (diff) | |
download | llvm-c28016e4131bdd50c23510adb3a0254b7fb5adc6.tar.gz llvm-c28016e4131bdd50c23510adb3a0254b7fb5adc6.tar.bz2 llvm-c28016e4131bdd50c23510adb3a0254b7fb5adc6.tar.xz |
Change the output of llvm-nm and llvm-size for Mach-O universal files (aka
fat files) to print “ (for architecture XYZ)” for fat files with more than
one architecture to be like what the darwin tools do for fat files.
Also clean up the Mach-O printing of archive membernames in llvm-nm to use
the darwin form of "libx.a(foo.o)".
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211316 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Object/MachOUniversal.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/Object/MachOUniversal.cpp b/lib/Object/MachOUniversal.cpp index 05729ef746..887e2bd0a3 100644 --- a/lib/Object/MachOUniversal.cpp +++ b/lib/Object/MachOUniversal.cpp @@ -72,9 +72,7 @@ std::error_code MachOUniversalBinary::ObjectForArch::getAsObjectFile( if (Parent) { StringRef ParentData = Parent->getData(); StringRef ObjectData = ParentData.substr(Header.offset, Header.size); - std::string ObjectName = - Parent->getFileName().str() + ":" + - Triple::getArchTypeName(MachOObjectFile::getArch(Header.cputype)); + std::string ObjectName = Parent->getFileName().str(); MemoryBuffer *ObjBuffer = MemoryBuffer::getMemBuffer( ObjectData, ObjectName, false); ErrorOr<ObjectFile *> Obj = ObjectFile::createMachOObjectFile(ObjBuffer); @@ -91,9 +89,7 @@ std::error_code MachOUniversalBinary::ObjectForArch::getAsArchive( if (Parent) { StringRef ParentData = Parent->getData(); StringRef ObjectData = ParentData.substr(Header.offset, Header.size); - std::string ObjectName = - Parent->getFileName().str() + ":" + - Triple::getArchTypeName(MachOObjectFile::getArch(Header.cputype)); + std::string ObjectName = Parent->getFileName().str(); MemoryBuffer *ObjBuffer = MemoryBuffer::getMemBuffer( ObjectData, ObjectName, false); ErrorOr<Archive *> Obj = Archive::create(ObjBuffer); |