[llvm-readobj][MachO] Fix section type printing

Summary:
Currently, llvm-readobj mistakenly decodes section type as section attribute.

This patch fixes the bug and affected tests.

Reviewers: JDevlieghere, jhenderson, rupprecht, alexshap, echristo

Reviewed By: jhenderson, rupprecht, alexshap, echristo

Subscribers: javed.absar, rupprecht, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D66075

llvm-svn: 368974

4 files changed, 366 insertions, 52 deletions

diff --git a/llvm/test/tools/llvm-readobj/macho-sections.test b/llvm/test/tools/llvm-readobj/macho-sections.test
new file mode 100644
index 00000000000..37c6567164b
--- /dev/null
+++ b/llvm/test/tools/llvm-readobj/macho-sections.test
@@ -0,0 +1,314 @@
+## Show that llvm-readobj prints MachO all section types properly.
+# RUN: yaml2obj %s > %t
+# RUN: llvm-readobj --sections %t | FileCheck %s
+
+# CHECK:  Type: Regular (0x0)
+# CHECK:  Type: ZeroFill (0x1)
+# CHECK:  Type: CStringLiterals (0x2)
+# CHECK:  Type: 4ByteLiterals (0x3)
+# CHECK:  Type: 8ByteLiterals (0x4)
+# CHECK:  Type: LiteralPointers (0x5)
+# CHECK:  Type: NonLazySymbolPointers (0x6)
+# CHECK:  Type: LazySymbolPointers (0x7)
+# CHECK:  Type: SymbolStubs (0x8)
+# CHECK:  Type: ModInitFuncPointers (0x9)
+# CHECK:  Type: ModTermFuncPointers (0xA)
+# CHECK:  Type: Coalesced (0xB)
+# CHECK:  Type: GBZeroFill (0xC)
+# CHECK:  Type: Interposing (0xD)
+# CHECK:  Type: 16ByteLiterals (0xE)
+# CHECK:  Type: DTraceDOF (0xF)
+# CHECK:  Type: LazyDylibSymbolPointers (0x10)
+# CHECK:  Type: ThreadLocalRegular (0x11)
+# CHECK:  Type: ThreadLocalZerofill (0x12)
+# CHECK:  Type: ThreadLocalVariables (0x13)
+# CHECK:  Type: ThreadLocalVariablePointers (0x14)
+# CHECK:  Type: ThreadLocalInitFunctionPointers (0x15)
+
+--- !mach-o
+FileHeader:
+  magic:           0xFEEDFACF
+  cputype:         0x01000007
+  cpusubtype:      0x80000003
+  filetype:        0x00000002
+  ncmds:           1
+  sizeofcmds:      1832
+  flags:           0x00002000
+  reserved:        0x00000000
+LoadCommands:
+  - cmd:             LC_SEGMENT_64
+    cmdsize:         1832
+    segname:         ''
+    vmaddr:          0x0000000000001000
+    vmsize:          4096
+    fileoff:         0
+    filesize:        4096
+    maxprot:         7
+    initprot:        7
+    nsects:          22
+    flags:           0
+    Sections:
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x00000000
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x00000001
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x00000002
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x00000003
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x00000004
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x00000005
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x00000006
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x00000007
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x00000008
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x00000009
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x0000000a
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x0000000b
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x0000000c
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x0000000d
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x0000000e
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x0000000f
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x00000010
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x00000011
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x00000012
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x00000013
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x00000014
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
+      - sectname:        ''
+        segname:         ''
+        addr:            0x000000000000000
+        size:            0
+        offset:          0x00000000
+        align:           0
+        reloff:          0x00000000
+        nreloc:          0
+        flags:           0x00000015
+        reserved1:       0x00000000
+        reserved2:       0x00000000
+        reserved3:       0x00000000
diff --git a/llvm/test/tools/llvm-readobj/macho-universal-x86_64.i386.test b/llvm/test/tools/llvm-readobj/macho-universal-x86_64.i386.test
index dc03ab367b1..d91a43bd7a8 100644
--- a/llvm/test/tools/llvm-readobj/macho-universal-x86_64.i386.test
+++ b/llvm/test/tools/llvm-readobj/macho-universal-x86_64.i386.test
@@ -66,7 +66,7 @@ MULTISECTIONS:     Offset: 3936
 MULTISECTIONS:     Alignment: 4
 MULTISECTIONS:     RelocationOffset: 0x0
 MULTISECTIONS:     RelocationCount: 0
-MULTISECTIONS:     Type: 0x0
+MULTISECTIONS:     Type: Regular (0x0)
 MULTISECTIONS:     Attributes [ (0x800004)
 MULTISECTIONS:       PureInstructions (0x800000)
 MULTISECTIONS:       SomeInstructions (0x4)
@@ -84,7 +84,7 @@ MULTISECTIONS:     Offset: 3954
 MULTISECTIONS:     Alignment: 0
 MULTISECTIONS:     RelocationOffset: 0x0
 MULTISECTIONS:     RelocationCount: 0
-MULTISECTIONS:     Type: 0x0
+MULTISECTIONS:     Type: Regular (0x0)
 MULTISECTIONS:     Attributes [ (0x0)
 MULTISECTIONS:     ]
 MULTISECTIONS:     Reserved1: 0x0
@@ -100,7 +100,7 @@ MULTISECTIONS:     Offset: 4032
 MULTISECTIONS:     Alignment: 3
 MULTISECTIONS:     RelocationOffset: 0x0
 MULTISECTIONS:     RelocationCount: 0
-MULTISECTIONS:     Type: 0x0
+MULTISECTIONS:     Type: Regular (0x0)
 MULTISECTIONS:     Attributes [ (0x0)
 MULTISECTIONS:     ]
 MULTISECTIONS:     Reserved1: 0x0
@@ -122,7 +122,7 @@ MULTISECTIONS:     Offset: 4000
 MULTISECTIONS:     Alignment: 4
 MULTISECTIONS:     RelocationOffset: 0x0
 MULTISECTIONS:     RelocationCount: 0
-MULTISECTIONS:     Type: 0x0
+MULTISECTIONS:     Type: Regular (0x0)
 MULTISECTIONS:     Attributes [ (0x800004)
 MULTISECTIONS:       PureInstructions (0x800000)
 MULTISECTIONS:       SomeInstructions (0x4)
@@ -140,7 +140,7 @@ MULTISECTIONS:     Offset: 4021
 MULTISECTIONS:     Alignment: 0
 MULTISECTIONS:     RelocationOffset: 0x0
 MULTISECTIONS:     RelocationCount: 0
-MULTISECTIONS:     Type: 0x0
+MULTISECTIONS:     Type: Regular (0x0)
 MULTISECTIONS:     Attributes [ (0x0)
 MULTISECTIONS:     ]
 MULTISECTIONS:     Reserved1: 0x0
@@ -198,7 +198,7 @@ MULTISECTIONS-ARCHIVE:     Offset: 528
 MULTISECTIONS-ARCHIVE:     Alignment: 4
 MULTISECTIONS-ARCHIVE:     RelocationOffset: 0x2B8
 MULTISECTIONS-ARCHIVE:     RelocationCount: 2
-MULTISECTIONS-ARCHIVE:     Type: 0x0
+MULTISECTIONS-ARCHIVE:     Type: Regular (0x0)
 MULTISECTIONS-ARCHIVE:     Attributes [ (0x800004)
 MULTISECTIONS-ARCHIVE:       PureInstructions (0x800000)
 MULTISECTIONS-ARCHIVE:       SomeInstructions (0x4)
@@ -216,7 +216,7 @@ MULTISECTIONS-ARCHIVE:     Offset: 587
 MULTISECTIONS-ARCHIVE:     Alignment: 0
 MULTISECTIONS-ARCHIVE:     RelocationOffset: 0x0
 MULTISECTIONS-ARCHIVE:     RelocationCount: 0
-MULTISECTIONS-ARCHIVE:     Type: ExtReloc (0x2)
+MULTISECTIONS-ARCHIVE:     Type: CStringLiterals (0x2)
 MULTISECTIONS-ARCHIVE:     Attributes [ (0x0)
 MULTISECTIONS-ARCHIVE:     ]
 MULTISECTIONS-ARCHIVE:     Reserved1: 0x0
@@ -232,7 +232,7 @@ MULTISECTIONS-ARCHIVE:     Offset: 600
 MULTISECTIONS-ARCHIVE:     Alignment: 3
 MULTISECTIONS-ARCHIVE:     RelocationOffset: 0x2C8
 MULTISECTIONS-ARCHIVE:     RelocationCount: 1
-MULTISECTIONS-ARCHIVE:     Type: 0x0
+MULTISECTIONS-ARCHIVE:     Type: Regular (0x0)
 MULTISECTIONS-ARCHIVE:     Attributes [ (0x20000)
 MULTISECTIONS-ARCHIVE:       Debug (0x20000)
 MULTISECTIONS-ARCHIVE:     ]
@@ -249,7 +249,7 @@ MULTISECTIONS-ARCHIVE:     Offset: 632
 MULTISECTIONS-ARCHIVE:     Alignment: 3
 MULTISECTIONS-ARCHIVE:     RelocationOffset: 0x0
 MULTISECTIONS-ARCHIVE:     RelocationCount: 0
-MULTISECTIONS-ARCHIVE:     Type: 0xB
+MULTISECTIONS-ARCHIVE:     Type: Coalesced (0xB)
 MULTISECTIONS-ARCHIVE:     Attributes [ (0x680000)
 MULTISECTIONS-ARCHIVE:       LiveSupport (0x80000)
 MULTISECTIONS-ARCHIVE:       NoTOC (0x400000)
@@ -275,7 +275,7 @@ MULTISECTIONS-ARCHIVE:     Offset: 324
 MULTISECTIONS-ARCHIVE:     Alignment: 4
 MULTISECTIONS-ARCHIVE:     RelocationOffset: 0x0
 MULTISECTIONS-ARCHIVE:     RelocationCount: 0
-MULTISECTIONS-ARCHIVE:     Type: 0x0
+MULTISECTIONS-ARCHIVE:     Type: Regular (0x0)
 MULTISECTIONS-ARCHIVE:     Attributes [ (0x800004)
 MULTISECTIONS-ARCHIVE:       PureInstructions (0x800000)
 MULTISECTIONS-ARCHIVE:       SomeInstructions (0x4)
@@ -293,7 +293,7 @@ MULTISECTIONS-ARCHIVE:     Offset: 332
 MULTISECTIONS-ARCHIVE:     Alignment: 2
 MULTISECTIONS-ARCHIVE:     RelocationOffset: 0x0
 MULTISECTIONS-ARCHIVE:     RelocationCount: 0
-MULTISECTIONS-ARCHIVE:     Type: 0x0
+MULTISECTIONS-ARCHIVE:     Type: Regular (0x0)
 MULTISECTIONS-ARCHIVE:     Attributes [ (0x0)
 MULTISECTIONS-ARCHIVE:     ]
 MULTISECTIONS-ARCHIVE:     Reserved1: 0x0
diff --git a/llvm/test/tools/llvm-readobj/sections-ext.test b/llvm/test/tools/llvm-readobj/sections-ext.test
index 2691c221112..f64294c2ed3 100644
--- a/llvm/test/tools/llvm-readobj/sections-ext.test
+++ b/llvm/test/tools/llvm-readobj/sections-ext.test
@@ -186,7 +186,7 @@ MACHO-I386-NEXT:     Offset: 324
 MACHO-I386-NEXT:     Alignment: 4
 MACHO-I386-NEXT:     RelocationOffset: 0x174
 MACHO-I386-NEXT:     RelocationCount: 4
-MACHO-I386-NEXT:     Type: 0x0
+MACHO-I386-NEXT:     Type: Regular (0x0)
 MACHO-I386-NEXT:     Attributes [ (0x800004)
 MACHO-I386-NEXT:       PureInstructions (0x800000)
 MACHO-I386-NEXT:       SomeInstructions (0x4)
@@ -230,7 +230,7 @@ MACHO-X86-64-NEXT:    Offset: 368
 MACHO-X86-64-NEXT:    Alignment: 4
 MACHO-X86-64-NEXT:    RelocationOffset: 0x194
 MACHO-X86-64-NEXT:    RelocationCount: 3
-MACHO-X86-64-NEXT:    Type: 0x0
+MACHO-X86-64-NEXT:    Type: Regular (0x0)
 MACHO-X86-64-NEXT:    Attributes [ (0x800004)
 MACHO-X86-64-NEXT:      PureInstructions (0x800000)
 MACHO-X86-64-NEXT:      SomeInstructions (0x4)
@@ -270,7 +270,7 @@ MACHO-X86-64-NEXT:    Offset: 390
 MACHO-X86-64-NEXT:    Alignment: 0
 MACHO-X86-64-NEXT:    RelocationOffset: 0x0
 MACHO-X86-64-NEXT:    RelocationCount: 0
-MACHO-X86-64-NEXT:    Type: ExtReloc (0x2)
+MACHO-X86-64-NEXT:    Type: CStringLiterals (0x2)
 MACHO-X86-64-NEXT:    Attributes [ (0x0)
 MACHO-X86-64-NEXT:    ]
 MACHO-X86-64-NEXT:    Reserved1: 0x0
@@ -306,7 +306,7 @@ MACHO-PPC-NEXT:     Offset: 528
 MACHO-PPC-NEXT:     Alignment: 2
 MACHO-PPC-NEXT:     RelocationOffset: 0x27C
 MACHO-PPC-NEXT:     RelocationCount: 5
-MACHO-PPC-NEXT:     Type: 0x0
+MACHO-PPC-NEXT:     Type: Regular (0x0)
 MACHO-PPC-NEXT:     Attributes [ (0x800004)
 MACHO-PPC-NEXT:       PureInstructions (0x800000)
 MACHO-PPC-NEXT:       SomeInstructions (0x4)
@@ -379,7 +379,7 @@ MACHO-PPC-NEXT:     Offset: 592
 MACHO-PPC-NEXT:     Alignment: 5
 MACHO-PPC-NEXT:     RelocationOffset: 0x2A4
 MACHO-PPC-NEXT:     RelocationCount: 4
-MACHO-PPC-NEXT:     Type: 0x8
+MACHO-PPC-NEXT:     Type: SymbolStubs (0x8)
 MACHO-PPC-NEXT:     Attributes [ (0x800004)
 MACHO-PPC-NEXT:       PureInstructions (0x800000)
 MACHO-PPC-NEXT:       SomeInstructions (0x4)
@@ -433,7 +433,7 @@ MACHO-PPC-NEXT:     Offset: 624
 MACHO-PPC-NEXT:     Alignment: 2
 MACHO-PPC-NEXT:     RelocationOffset: 0x0
 MACHO-PPC-NEXT:     RelocationCount: 0
-MACHO-PPC-NEXT:     Type: 0x0
+MACHO-PPC-NEXT:     Type: Regular (0x0)
 MACHO-PPC-NEXT:     Attributes [ (0x0)
 MACHO-PPC-NEXT:     ]
 MACHO-PPC-NEXT:     Reserved1: 0x0
@@ -466,7 +466,7 @@ MACHO-PPC-NEXT:     Offset: 628
 MACHO-PPC-NEXT:     Alignment: 2
 MACHO-PPC-NEXT:     RelocationOffset: 0x0
 MACHO-PPC-NEXT:     RelocationCount: 0
-MACHO-PPC-NEXT:     Type: 0x6
+MACHO-PPC-NEXT:     Type: NonLazySymbolPointers (0x6)
 MACHO-PPC-NEXT:     Attributes [ (0x0)
 MACHO-PPC-NEXT:     ]
 MACHO-PPC-NEXT:     Reserved1: 0x1
@@ -489,7 +489,7 @@ MACHO-PPC-NEXT:     Offset: 632
 MACHO-PPC-NEXT:     Alignment: 2
 MACHO-PPC-NEXT:     RelocationOffset: 0x2C4
 MACHO-PPC-NEXT:     RelocationCount: 1
-MACHO-PPC-NEXT:     Type: 0x7
+MACHO-PPC-NEXT:     Type: LazySymbolPointers (0x7)
 MACHO-PPC-NEXT:     Attributes [ (0x0)
 MACHO-PPC-NEXT:     ]
 MACHO-PPC-NEXT:     Reserved1: 0x2
@@ -523,7 +523,7 @@ MACHO-PPC64-NEXT:     Offset: 608
 MACHO-PPC64-NEXT:     Alignment: 2
 MACHO-PPC64-NEXT:     RelocationOffset: 0x2D4
 MACHO-PPC64-NEXT:     RelocationCount: 5
-MACHO-PPC64-NEXT:     Type: 0x0
+MACHO-PPC64-NEXT:     Type: Regular (0x0)
 MACHO-PPC64-NEXT:     Attributes [ (0x800004)
 MACHO-PPC64-NEXT:       PureInstructions (0x800000)
 MACHO-PPC64-NEXT:       SomeInstructions (0x4)
@@ -597,7 +597,7 @@ MACHO-PPC64-NEXT:     Offset: 672
 MACHO-PPC64-NEXT:     Alignment: 5
 MACHO-PPC64-NEXT:     RelocationOffset: 0x2FC
 MACHO-PPC64-NEXT:     RelocationCount: 4
-MACHO-PPC64-NEXT:     Type: 0x8
+MACHO-PPC64-NEXT:     Type: SymbolStubs (0x8)
 MACHO-PPC64-NEXT:     Attributes [ (0x800004)
 MACHO-PPC64-NEXT:       PureInstructions (0x800000)
 MACHO-PPC64-NEXT:       SomeInstructions (0x4)
@@ -652,7 +652,7 @@ MACHO-PPC64-NEXT:     Offset: 704
 MACHO-PPC64-NEXT:     Alignment: 2
 MACHO-PPC64-NEXT:     RelocationOffset: 0x0
 MACHO-PPC64-NEXT:     RelocationCount: 0
-MACHO-PPC64-NEXT:     Type: 0x0
+MACHO-PPC64-NEXT:     Type: Regular (0x0)
 MACHO-PPC64-NEXT:     Attributes [ (0x0)
 MACHO-PPC64-NEXT:     ]
 MACHO-PPC64-NEXT:     Reserved1: 0x0
@@ -686,7 +686,7 @@ MACHO-PPC64-NEXT:     Offset: 708
 MACHO-PPC64-NEXT:     Alignment: 2
 MACHO-PPC64-NEXT:     RelocationOffset: 0x0
 MACHO-PPC64-NEXT:     RelocationCount: 0
-MACHO-PPC64-NEXT:     Type: 0x6
+MACHO-PPC64-NEXT:     Type: NonLazySymbolPointers (0x6)
 MACHO-PPC64-NEXT:     Attributes [ (0x0)
 MACHO-PPC64-NEXT:     ]
 MACHO-PPC64-NEXT:     Reserved1: 0x1
@@ -710,7 +710,7 @@ MACHO-PPC64-NEXT:     Offset: 716
 MACHO-PPC64-NEXT:     Alignment: 2
 MACHO-PPC64-NEXT:     RelocationOffset: 0x31C
 MACHO-PPC64-NEXT:     RelocationCount: 1
-MACHO-PPC64-NEXT:     Type: 0x7
+MACHO-PPC64-NEXT:     Type: LazySymbolPointers (0x7)
 MACHO-PPC64-NEXT:     Attributes [ (0x0)
 MACHO-PPC64-NEXT:     ]
 MACHO-PPC64-NEXT:     Reserved1: 0x2
@@ -744,7 +744,7 @@ MACHO-ARM-NEXT:     Offset: 664
 MACHO-ARM-NEXT:     Alignment: 2
 MACHO-ARM-NEXT:     RelocationOffset: 0x2E0
 MACHO-ARM-NEXT:     RelocationCount: 9
-MACHO-ARM-NEXT:     Type: 0x0
+MACHO-ARM-NEXT:     Type: Regular (0x0)
 MACHO-ARM-NEXT:     Attributes [ (0x800004)
 MACHO-ARM-NEXT:       PureInstructions (0x800000)
 MACHO-ARM-NEXT:       SomeInstructions (0x4)
@@ -855,7 +855,7 @@ MACHO-ARM-NEXT:     Offset: 724
 MACHO-ARM-NEXT:     Alignment: 0
 MACHO-ARM-NEXT:     RelocationOffset: 0x0
 MACHO-ARM-NEXT:     RelocationCount: 0
-MACHO-ARM-NEXT:     Type: 0xB
+MACHO-ARM-NEXT:     Type: Coalesced (0xB)
 MACHO-ARM-NEXT:     Attributes [ (0x800000)
 MACHO-ARM-NEXT:       PureInstructions (0x800000)
 MACHO-ARM-NEXT:     ]
@@ -878,7 +878,7 @@ MACHO-ARM-NEXT:     Offset: 724
 MACHO-ARM-NEXT:     Alignment: 0
 MACHO-ARM-NEXT:     RelocationOffset: 0x0
 MACHO-ARM-NEXT:     RelocationCount: 0
-MACHO-ARM-NEXT:     Type: 0xB
+MACHO-ARM-NEXT:     Type: Coalesced (0xB)
 MACHO-ARM-NEXT:     Attributes [ (0x0)
 MACHO-ARM-NEXT:     ]
 MACHO-ARM-NEXT:     Reserved1: 0x0
@@ -900,7 +900,7 @@ MACHO-ARM-NEXT:     Offset: 724
 MACHO-ARM-NEXT:     Alignment: 0
 MACHO-ARM-NEXT:     RelocationOffset: 0x0
 MACHO-ARM-NEXT:     RelocationCount: 0
-MACHO-ARM-NEXT:     Type: 0x8
+MACHO-ARM-NEXT:     Type: SymbolStubs (0x8)
 MACHO-ARM-NEXT:     Attributes [ (0x0)
 MACHO-ARM-NEXT:     ]
 MACHO-ARM-NEXT:     Reserved1: 0x0
@@ -922,7 +922,7 @@ MACHO-ARM-NEXT:     Offset: 724
 MACHO-ARM-NEXT:     Alignment: 0
 MACHO-ARM-NEXT:     RelocationOffset: 0x0
 MACHO-ARM-NEXT:     RelocationCount: 0
-MACHO-ARM-NEXT:     Type: 0x0
+MACHO-ARM-NEXT:     Type: Regular (0x0)
 MACHO-ARM-NEXT:     Attributes [ (0x800000)
 MACHO-ARM-NEXT:       PureInstructions (0x800000)
 MACHO-ARM-NEXT:     ]
@@ -945,7 +945,7 @@ MACHO-ARM-NEXT:     Offset: 724
 MACHO-ARM-NEXT:     Alignment: 2
 MACHO-ARM-NEXT:     RelocationOffset: 0x0
 MACHO-ARM-NEXT:     RelocationCount: 0
-MACHO-ARM-NEXT:     Type: 0x0
+MACHO-ARM-NEXT:     Type: Regular (0x0)
 MACHO-ARM-NEXT:     Attributes [ (0x0)
 MACHO-ARM-NEXT:     ]
 MACHO-ARM-NEXT:     Reserved1: 0x0
@@ -978,7 +978,7 @@ MACHO-ARM-NEXT:     Offset: 728
 MACHO-ARM-NEXT:     Alignment: 2
 MACHO-ARM-NEXT:     RelocationOffset: 0x0
 MACHO-ARM-NEXT:     RelocationCount: 0
-MACHO-ARM-NEXT:     Type: 0x6
+MACHO-ARM-NEXT:     Type: NonLazySymbolPointers (0x6)
 MACHO-ARM-NEXT:     Attributes [ (0x0)
 MACHO-ARM-NEXT:     ]
 MACHO-ARM-NEXT:     Reserved1: 0x0
diff --git a/llvm/test/tools/llvm-readobj/sections.test b/llvm/test/tools/llvm-readobj/sections.test
index 5eab22be1a3..1ad4e98b2de 100644
--- a/llvm/test/tools/llvm-readobj/sections.test
+++ b/llvm/test/tools/llvm-readobj/sections.test
@@ -137,7 +137,7 @@ MACHO-I386-NEXT:     Offset: 324
 MACHO-I386-NEXT:     Alignment: 4
 MACHO-I386-NEXT:     RelocationOffset: 0x174
 MACHO-I386-NEXT:     RelocationCount: 4
-MACHO-I386-NEXT:     Type: 0x0
+MACHO-I386-NEXT:     Type: Regular (0x0)
 MACHO-I386-NEXT:     Attributes [ (0x800004)
 MACHO-I386-NEXT:       PureInstructions (0x800000)
 MACHO-I386-NEXT:       SomeInstructions (0x4)
@@ -155,7 +155,7 @@ MACHO-I386-NEXT:     Offset: 358
 MACHO-I386-NEXT:     Alignment: 0
 MACHO-I386-NEXT:     RelocationOffset: 0x0
 MACHO-I386-NEXT:     RelocationCount: 0
-MACHO-I386-NEXT:     Type: ExtReloc (0x2)
+MACHO-I386-NEXT:     Type: CStringLiterals (0x2)
 MACHO-I386-NEXT:     Attributes [ (0x0)
 MACHO-I386-NEXT:     ]
 MACHO-I386-NEXT:     Reserved1: 0x0
@@ -174,7 +174,7 @@ MACHO-X86-64-NEXT:    Offset: 368
 MACHO-X86-64-NEXT:    Alignment: 4
 MACHO-X86-64-NEXT:    RelocationOffset: 0x194
 MACHO-X86-64-NEXT:    RelocationCount: 3
-MACHO-X86-64-NEXT:    Type: 0x0
+MACHO-X86-64-NEXT:    Type: Regular (0x0)
 MACHO-X86-64-NEXT:    Attributes [ (0x800004)
 MACHO-X86-64-NEXT:      PureInstructions (0x800000)
 MACHO-X86-64-NEXT:      SomeInstructions (0x4)
@@ -193,7 +193,7 @@ MACHO-X86-64-NEXT:    Offset: 390
 MACHO-X86-64-NEXT:    Alignment: 0
 MACHO-X86-64-NEXT:    RelocationOffset: 0x0
 MACHO-X86-64-NEXT:    RelocationCount: 0
-MACHO-X86-64-NEXT:    Type: ExtReloc (0x2)
+MACHO-X86-64-NEXT:    Type: CStringLiterals (0x2)
 MACHO-X86-64-NEXT:    Attributes [ (0x0)
 MACHO-X86-64-NEXT:    ]
 MACHO-X86-64-NEXT:    Reserved1: 0x0
@@ -213,7 +213,7 @@ MACHO-PPC-NEXT:     Offset: 528
 MACHO-PPC-NEXT:     Alignment: 2
 MACHO-PPC-NEXT:     RelocationOffset: 0x27C
 MACHO-PPC-NEXT:     RelocationCount: 5
-MACHO-PPC-NEXT:     Type: 0x0
+MACHO-PPC-NEXT:     Type: Regular (0x0)
 MACHO-PPC-NEXT:     Attributes [ (0x800004)
 MACHO-PPC-NEXT:       PureInstructions (0x800000)
 MACHO-PPC-NEXT:       SomeInstructions (0x4)
@@ -231,7 +231,7 @@ MACHO-PPC-NEXT:     Offset: 592
 MACHO-PPC-NEXT:     Alignment: 5
 MACHO-PPC-NEXT:     RelocationOffset: 0x2A4
 MACHO-PPC-NEXT:     RelocationCount: 4
-MACHO-PPC-NEXT:     Type: 0x8
+MACHO-PPC-NEXT:     Type: SymbolStubs (0x8)
 MACHO-PPC-NEXT:     Attributes [ (0x800004)
 MACHO-PPC-NEXT:       PureInstructions (0x800000)
 MACHO-PPC-NEXT:       SomeInstructions (0x4)
@@ -249,7 +249,7 @@ MACHO-PPC-NEXT:     Offset: 624
 MACHO-PPC-NEXT:     Alignment: 2
 MACHO-PPC-NEXT:     RelocationOffset: 0x0
 MACHO-PPC-NEXT:     RelocationCount: 0
-MACHO-PPC-NEXT:     Type: 0x0
+MACHO-PPC-NEXT:     Type: Regular (0x0)
 MACHO-PPC-NEXT:     Attributes [ (0x0)
 MACHO-PPC-NEXT:     ]
 MACHO-PPC-NEXT:     Reserved1: 0x0
@@ -265,7 +265,7 @@ MACHO-PPC-NEXT:     Offset: 628
 MACHO-PPC-NEXT:     Alignment: 2
 MACHO-PPC-NEXT:     RelocationOffset: 0x0
 MACHO-PPC-NEXT:     RelocationCount: 0
-MACHO-PPC-NEXT:     Type: 0x6
+MACHO-PPC-NEXT:     Type: NonLazySymbolPointers (0x6)
 MACHO-PPC-NEXT:     Attributes [ (0x0)
 MACHO-PPC-NEXT:     ]
 MACHO-PPC-NEXT:     Reserved1: 0x1
@@ -281,7 +281,7 @@ MACHO-PPC-NEXT:     Offset: 632
 MACHO-PPC-NEXT:     Alignment: 2
 MACHO-PPC-NEXT:     RelocationOffset: 0x2C4
 MACHO-PPC-NEXT:     RelocationCount: 1
-MACHO-PPC-NEXT:     Type: 0x7
+MACHO-PPC-NEXT:     Type: LazySymbolPointers (0x7)
 MACHO-PPC-NEXT:     Attributes [ (0x0)
 MACHO-PPC-NEXT:     ]
 MACHO-PPC-NEXT:     Reserved1: 0x2
@@ -300,7 +300,7 @@ MACHO-PPC64-NEXT:     Offset: 608
 MACHO-PPC64-NEXT:     Alignment: 2
 MACHO-PPC64-NEXT:     RelocationOffset: 0x2D4
 MACHO-PPC64-NEXT:     RelocationCount: 5
-MACHO-PPC64-NEXT:     Type: 0x0
+MACHO-PPC64-NEXT:     Type: Regular (0x0)
 MACHO-PPC64-NEXT:     Attributes [ (0x800004)
 MACHO-PPC64-NEXT:       PureInstructions (0x800000)
 MACHO-PPC64-NEXT:       SomeInstructions (0x4)
@@ -319,7 +319,7 @@ MACHO-PPC64-NEXT:     Offset: 672
 MACHO-PPC64-NEXT:     Alignment: 5
 MACHO-PPC64-NEXT:     RelocationOffset: 0x2FC
 MACHO-PPC64-NEXT:     RelocationCount: 4
-MACHO-PPC64-NEXT:     Type: 0x8
+MACHO-PPC64-NEXT:     Type: SymbolStubs (0x8)
 MACHO-PPC64-NEXT:     Attributes [ (0x800004)
 MACHO-PPC64-NEXT:       PureInstructions (0x800000)
 MACHO-PPC64-NEXT:       SomeInstructions (0x4)
@@ -338,7 +338,7 @@ MACHO-PPC64-NEXT:     Offset: 704
 MACHO-PPC64-NEXT:     Alignment: 2
 MACHO-PPC64-NEXT:     RelocationOffset: 0x0
 MACHO-PPC64-NEXT:     RelocationCount: 0
-MACHO-PPC64-NEXT:     Type: 0x0
+MACHO-PPC64-NEXT:     Type: Regular (0x0)
 MACHO-PPC64-NEXT:     Attributes [ (0x0)
 MACHO-PPC64-NEXT:     ]
 MACHO-PPC64-NEXT:     Reserved1: 0x0
@@ -355,7 +355,7 @@ MACHO-PPC64-NEXT:     Offset: 708
 MACHO-PPC64-NEXT:     Alignment: 2
 MACHO-PPC64-NEXT:     RelocationOffset: 0x0
 MACHO-PPC64-NEXT:     RelocationCount: 0
-MACHO-PPC64-NEXT:     Type: 0x6
+MACHO-PPC64-NEXT:     Type: NonLazySymbolPointers (0x6)
 MACHO-PPC64-NEXT:     Attributes [ (0x0)
 MACHO-PPC64-NEXT:     ]
 MACHO-PPC64-NEXT:     Reserved1: 0x1
@@ -372,7 +372,7 @@ MACHO-PPC64-NEXT:     Offset: 716
 MACHO-PPC64-NEXT:     Alignment: 2
 MACHO-PPC64-NEXT:     RelocationOffset: 0x31C
 MACHO-PPC64-NEXT:     RelocationCount: 1
-MACHO-PPC64-NEXT:     Type: 0x7
+MACHO-PPC64-NEXT:     Type: LazySymbolPointers (0x7)
 MACHO-PPC64-NEXT:     Attributes [ (0x0)
 MACHO-PPC64-NEXT:     ]
 MACHO-PPC64-NEXT:     Reserved1: 0x2
@@ -392,7 +392,7 @@ MACHO-ARM-NEXT:    Offset: 664
 MACHO-ARM-NEXT:    Alignment: 2
 MACHO-ARM-NEXT:    RelocationOffset: 0x2E0
 MACHO-ARM-NEXT:    RelocationCount: 9
-MACHO-ARM-NEXT:    Type: 0x0
+MACHO-ARM-NEXT:    Type: Regular (0x0)
 MACHO-ARM-NEXT:    Attributes [ (0x800004)
 MACHO-ARM-NEXT:      PureInstructions (0x800000)
 MACHO-ARM-NEXT:      SomeInstructions (0x4)
@@ -410,7 +410,7 @@ MACHO-ARM-NEXT:    Offset: 724
 MACHO-ARM-NEXT:    Alignment: 0
 MACHO-ARM-NEXT:    RelocationOffset: 0x0
 MACHO-ARM-NEXT:    RelocationCount: 0
-MACHO-ARM-NEXT:    Type: 0xB
+MACHO-ARM-NEXT:    Type: Coalesced (0xB)
 MACHO-ARM-NEXT:    Attributes [ (0x800000)
 MACHO-ARM-NEXT:      PureInstructions (0x800000)
 MACHO-ARM-NEXT:    ]
@@ -427,7 +427,7 @@ MACHO-ARM-NEXT:    Offset: 724
 MACHO-ARM-NEXT:    Alignment: 0
 MACHO-ARM-NEXT:    RelocationOffset: 0x0
 MACHO-ARM-NEXT:    RelocationCount: 0
-MACHO-ARM-NEXT:    Type: 0xB
+MACHO-ARM-NEXT:    Type: Coalesced (0xB)
 MACHO-ARM-NEXT:    Attributes [ (0x0)
 MACHO-ARM-NEXT:    ]
 MACHO-ARM-NEXT:    Reserved1: 0x0
@@ -443,7 +443,7 @@ MACHO-ARM-NEXT:    Offset: 724
 MACHO-ARM-NEXT:    Alignment: 0
 MACHO-ARM-NEXT:    RelocationOffset: 0x0
 MACHO-ARM-NEXT:    RelocationCount: 0
-MACHO-ARM-NEXT:    Type: 0x8
+MACHO-ARM-NEXT:    Type: SymbolStubs (0x8)
 MACHO-ARM-NEXT:    Attributes [ (0x0)
 MACHO-ARM-NEXT:    ]
 MACHO-ARM-NEXT:    Reserved1: 0x0
@@ -459,7 +459,7 @@ MACHO-ARM-NEXT:    Offset: 724
 MACHO-ARM-NEXT:    Alignment: 0
 MACHO-ARM-NEXT:    RelocationOffset: 0x0
 MACHO-ARM-NEXT:    RelocationCount: 0
-MACHO-ARM-NEXT:    Type: 0x0
+MACHO-ARM-NEXT:    Type: Regular (0x0)
 MACHO-ARM-NEXT:    Attributes [ (0x800000)
 MACHO-ARM-NEXT:      PureInstructions (0x800000)
 MACHO-ARM-NEXT:    ]
@@ -476,7 +476,7 @@ MACHO-ARM-NEXT:    Offset: 724
 MACHO-ARM-NEXT:    Alignment: 2
 MACHO-ARM-NEXT:    RelocationOffset: 0x0
 MACHO-ARM-NEXT:    RelocationCount: 0
-MACHO-ARM-NEXT:    Type: 0x0
+MACHO-ARM-NEXT:    Type: Regular (0x0)
 MACHO-ARM-NEXT:    Attributes [ (0x0)
 MACHO-ARM-NEXT:    ]
 MACHO-ARM-NEXT:    Reserved1: 0x0
@@ -492,7 +492,7 @@ MACHO-ARM-NEXT:    Offset: 728
 MACHO-ARM-NEXT:    Alignment: 2
 MACHO-ARM-NEXT:    RelocationOffset: 0x0
 MACHO-ARM-NEXT:    RelocationCount: 0
-MACHO-ARM-NEXT:    Type: 0x6
+MACHO-ARM-NEXT:    Type: NonLazySymbolPointers (0x6)
 MACHO-ARM-NEXT:    Attributes [ (0x0)
 MACHO-ARM-NEXT:    ]
 MACHO-ARM-NEXT:    Reserved1: 0x0