[llvm] r321901 - dwarfdump: Match the --uuid output with that of Darwin dwarfdump.

[Adrian Prantl via llvm-commits]

Author: adrian
Date: Fri Jan  5 13:44:17 2018
New Revision: 321901

URL: http://llvm.org/viewvc/llvm-project?rev=321901&view=rev
Log:
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

Modified:
    llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp
    llvm/trunk/test/tools/llvm-dwarfdump/uuid.yaml
    llvm/trunk/test/tools/llvm-dwarfdump/uuid32.yaml

Modified: llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp?rev=321901&r1=321900&r2=321901&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp (original)
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp Fri Jan  5 13:44:17 2018
@@ -82,7 +82,8 @@ static void dumpUUID(raw_ostream &OS, co
       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';
     }
   }

Modified: llvm/trunk/test/tools/llvm-dwarfdump/uuid.yaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwarfdump/uuid.yaml?rev=321901&r1=321900&r2=321901&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-dwarfdump/uuid.yaml (original)
+++ llvm/trunk/test/tools/llvm-dwarfdump/uuid.yaml Fri Jan  5 13:44:17 2018
@@ -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

Modified: llvm/trunk/test/tools/llvm-dwarfdump/uuid32.yaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwarfdump/uuid32.yaml?rev=321901&r1=321900&r2=321901&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-dwarfdump/uuid32.yaml (original)
+++ llvm/trunk/test/tools/llvm-dwarfdump/uuid32.yaml Fri Jan  5 13:44:17 2018
@@ -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