dwarfdump: Match the --uuid output with that of Darwin dwarfdump.
This option is widely used by scripts and there is no reason to break them.
rdar://problem/36032398
llvm-svn: 321901
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
index eb23ca8..cbcb32c 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
@@ -82,7 +82,8 @@
OS << "UUID: ";
memcpy(&UUID, LC.Ptr+sizeof(LC.C), sizeof(UUID));
OS.write_uuid(UUID);
- OS << ' ' << MachO->getFileFormatName();
+ Triple T = MachO->getArchTriple();
+ OS << " (" << T.getArchName() << ')';
OS << ' ' << MachO->getFileName() << '\n';
}
}
diff --git a/llvm/test/tools/llvm-dwarfdump/uuid.yaml b/llvm/test/tools/llvm-dwarfdump/uuid.yaml
index a1e8264..b36e3aa 100644
--- a/llvm/test/tools/llvm-dwarfdump/uuid.yaml
+++ b/llvm/test/tools/llvm-dwarfdump/uuid.yaml
@@ -1,11 +1,11 @@
# RUN: yaml2obj %s | llvm-dwarfdump -u - | FileCheck %s
# RUN: yaml2obj %s | llvm-dwarfdump --uuid - | FileCheck %s
-# CHECK: UUID: E5874E6F-946F-317B-B348-56FAEE59D8D1 Mach-O 64-bit x86-64 <stdin>
+# CHECK: UUID: E5874E6F-946F-317B-B348-56FAEE59D8D1 (x86_64h) <stdin>
--- !mach-o
FileHeader:
magic: 0xFEEDFACF
cputype: 0x01000007
- cpusubtype: 0x80000003
+ cpusubtype: 0x80000008
filetype: 0x00000002
ncmds: 14
sizeofcmds: 728
diff --git a/llvm/test/tools/llvm-dwarfdump/uuid32.yaml b/llvm/test/tools/llvm-dwarfdump/uuid32.yaml
index ae367b2..1144547 100644
--- a/llvm/test/tools/llvm-dwarfdump/uuid32.yaml
+++ b/llvm/test/tools/llvm-dwarfdump/uuid32.yaml
@@ -1,5 +1,5 @@
# RUN: yaml2obj %s | llvm-dwarfdump --uuid - | FileCheck %s
-# CHECK: UUID: 229E6146-A7AB-3BA0-8B17-DD5125D3AFEF Mach-O 32-bit i386 <stdin>
+# CHECK: UUID: 229E6146-A7AB-3BA0-8B17-DD5125D3AFEF (i386) <stdin>
--- !mach-o
FileHeader:
magic: 0xFEEDFACE