Index: llvm/trunk/test/MC/MachO/ARM/darwin-ARM-reloc.s =================================================================== --- llvm/trunk/test/MC/MachO/ARM/darwin-ARM-reloc.s +++ llvm/trunk/test/MC/MachO/ARM/darwin-ARM-reloc.s @@ -47,7 +47,7 @@ @ CHECK: Alignment: 0 @ CHECK: RelocationOffset: 0x1A8 @ CHECK: RelocationCount: 2 -@ CHECK: Type: 0x0 +@ CHECK: Type: Regular (0x0) @ CHECK: Attributes [ (0x800004) @ CHECK: PureInstructions (0x800000) @ CHECK: SomeInstructions (0x4) @@ -68,7 +68,7 @@ @ CHECK: Alignment: 0 @ CHECK: RelocationOffset: 0x1B8 @ CHECK: RelocationCount: 2 -@ CHECK: Type: 0x0 +@ CHECK: Type: Regular (0x0) @ CHECK: Attributes [ (0x0) @ CHECK: ] @ CHECK: Reserved1: 0x0 @@ -87,7 +87,7 @@ @ CHECK: Alignment: 0 @ CHECK: RelocationOffset: 0x0 @ CHECK: RelocationCount: 0 -@ CHECK: Type: ExtReloc (0x2) +@ CHECK: Type: CStringLiterals (0x2) @ CHECK: Attributes [ (0x0) @ CHECK: ] @ CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/ARM/darwin-Thumb-reloc.s =================================================================== --- llvm/trunk/test/MC/MachO/ARM/darwin-Thumb-reloc.s +++ llvm/trunk/test/MC/MachO/ARM/darwin-Thumb-reloc.s @@ -48,7 +48,7 @@ @ CHECK: Alignment: 2 @ CHECK: RelocationOffset: 0x160 @ CHECK: RelocationCount: 3 -@ CHECK: Type: 0x0 +@ CHECK: Type: Regular (0x0) @ CHECK: Attributes [ (0x800004) @ CHECK: PureInstructions (0x800000) @ CHECK: SomeInstructions (0x4) @@ -69,7 +69,7 @@ @ CHECK: Alignment: 2 @ CHECK: RelocationOffset: 0x0 @ CHECK: RelocationCount: 0 -@ CHECK: Type: ExtReloc (0x2) +@ CHECK: Type: CStringLiterals (0x2) @ CHECK: Attributes [ (0x0) @ CHECK: ] @ CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/ARM/relax-thumb-ldr-literal.s =================================================================== --- llvm/trunk/test/MC/MachO/ARM/relax-thumb-ldr-literal.s +++ llvm/trunk/test/MC/MachO/ARM/relax-thumb-ldr-literal.s @@ -10,7 +10,7 @@ ldr r2, (_foo - 4) @ CHECK: RelocationCount: 0 -@ CHECK: Type: 0x0 +@ CHECK: Type: Regular (0x0) @ CHECK: Attributes [ (0x800004) @ CHECK: PureInstructions (0x800000) @ CHECK: SomeInstructions (0x4) Index: llvm/trunk/test/MC/MachO/absolute.s =================================================================== --- llvm/trunk/test/MC/MachO/absolute.s +++ llvm/trunk/test/MC/MachO/absolute.s @@ -43,7 +43,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800004) // CHECK: PureInstructions (0x800000) // CHECK: SomeInstructions (0x4) Index: llvm/trunk/test/MC/MachO/absolutize.s =================================================================== --- llvm/trunk/test/MC/MachO/absolutize.s +++ llvm/trunk/test/MC/MachO/absolutize.s @@ -72,7 +72,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x1AC // CHECK: RelocationCount: 3 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800004) // CHECK: PureInstructions (0x800000) // CHECK: SomeInstructions (0x4) @@ -95,7 +95,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x1C4 // CHECK: RelocationCount: 3 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/comm-1.s =================================================================== --- llvm/trunk/test/MC/MachO/comm-1.s +++ llvm/trunk/test/MC/MachO/comm-1.s @@ -32,7 +32,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] Index: llvm/trunk/test/MC/MachO/darwin-complex-difference.s =================================================================== --- llvm/trunk/test/MC/MachO/darwin-complex-difference.s +++ llvm/trunk/test/MC/MachO/darwin-complex-difference.s @@ -41,7 +41,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x148 // CHECK: RelocationCount: 4 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] Index: llvm/trunk/test/MC/MachO/darwin-x86_64-diff-relocs.s =================================================================== --- llvm/trunk/test/MC/MachO/darwin-x86_64-diff-relocs.s +++ llvm/trunk/test/MC/MachO/darwin-x86_64-diff-relocs.s @@ -149,7 +149,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x26C // CHECK: RelocationCount: 12 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800004) // CHECK: PureInstructions (0x800000) // CHECK: SomeInstructions (0x4) @@ -176,7 +176,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x2CC // CHECK: RelocationCount: 16 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x4) // CHECK: SomeInstructions (0x4) // CHECK: ] Index: llvm/trunk/test/MC/MachO/darwin-x86_64-nobase-relocs.s =================================================================== --- llvm/trunk/test/MC/MachO/darwin-x86_64-nobase-relocs.s +++ llvm/trunk/test/MC/MachO/darwin-x86_64-nobase-relocs.s @@ -41,7 +41,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800004) // CHECK: PureInstructions (0x800000) // CHECK: SomeInstructions (0x4) Index: llvm/trunk/test/MC/MachO/darwin-x86_64-reloc-offsets.s =================================================================== --- llvm/trunk/test/MC/MachO/darwin-x86_64-reloc-offsets.s +++ llvm/trunk/test/MC/MachO/darwin-x86_64-reloc-offsets.s @@ -140,7 +140,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x2E8 // CHECK: RelocationCount: 42 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800004) // CHECK: PureInstructions (0x800000) // CHECK: SomeInstructions (0x4) @@ -181,7 +181,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/data.s =================================================================== --- llvm/trunk/test/MC/MachO/data.s +++ llvm/trunk/test/MC/MachO/data.s @@ -41,7 +41,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -58,7 +58,7 @@ // CHECK: Alignment: 3 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/debug_frame.s =================================================================== --- llvm/trunk/test/MC/MachO/debug_frame.s +++ llvm/trunk/test/MC/MachO/debug_frame.s @@ -36,7 +36,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x180 // CHECK: RelocationCount: 2 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x20000) // CHECK: Debug (0x20000) // CHECK: ] Index: llvm/trunk/test/MC/MachO/diff-with-two-sections.s =================================================================== --- llvm/trunk/test/MC/MachO/diff-with-two-sections.s +++ llvm/trunk/test/MC/MachO/diff-with-two-sections.s @@ -32,7 +32,7 @@ // CHECK-NEXT: Alignment: 0 // CHECK-NEXT: RelocationOffset: 0x0 // CHECK-NEXT: RelocationCount: 0 -// CHECK-NEXT: Type: 0x0 +// CHECK-NEXT: Type: Regular (0x0) // CHECK-NEXT: Attributes [ (0x800000) // CHECK-NEXT: PureInstructions (0x800000) // CHECK-NEXT: ] @@ -51,7 +51,7 @@ // CHECK-NEXT: Alignment: 0 // CHECK-NEXT: RelocationOffset: 0x0 // CHECK-NEXT: RelocationCount: 0 -// CHECK-NEXT: Type: 0xB +// CHECK-NEXT: Type: Coalesced (0xB) // CHECK-NEXT: Attributes [ (0x680000) // CHECK-NEXT: LiveSupport (0x80000) // CHECK-NEXT: NoTOC (0x400000) Index: llvm/trunk/test/MC/MachO/direction_labels.s =================================================================== --- llvm/trunk/test/MC/MachO/direction_labels.s +++ llvm/trunk/test/MC/MachO/direction_labels.s @@ -36,7 +36,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800004) // CHECK: PureInstructions (0x800000) // CHECK: SomeInstructions (0x4) Index: llvm/trunk/test/MC/MachO/file.s =================================================================== --- llvm/trunk/test/MC/MachO/file.s +++ llvm/trunk/test/MC/MachO/file.s @@ -16,7 +16,7 @@ // CHECK-NEXT: Alignment: 0 // CHECK-NEXT: RelocationOffset: 0x0 // CHECK-NEXT: RelocationCount: 0 -// CHECK-NEXT: Type: 0x0 +// CHECK-NEXT: Type: Regular (0x0) // CHECK-NEXT: Attributes [ (0x20000) // CHECK-NEXT: Debug (0x20000) // CHECK-NEXT: ] Index: llvm/trunk/test/MC/MachO/indirect-symbols.s =================================================================== --- llvm/trunk/test/MC/MachO/indirect-symbols.s +++ llvm/trunk/test/MC/MachO/indirect-symbols.s @@ -45,7 +45,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -64,7 +64,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x8 +// CHECK: Type: SymbolStubs (0x8) // CHECK: Attributes [ (0x840000) // CHECK: PureInstructions (0x800000) // CHECK: SelfModifyingCode (0x40000) @@ -85,7 +85,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x6 +// CHECK: Type: NonLazySymbolPointers (0x6) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x3 Index: llvm/trunk/test/MC/MachO/jcc.s =================================================================== --- llvm/trunk/test/MC/MachO/jcc.s +++ llvm/trunk/test/MC/MachO/jcc.s @@ -90,7 +90,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800004) // CHECK: PureInstructions (0x800000) // CHECK: SomeInstructions (0x4) Index: llvm/trunk/test/MC/MachO/lcomm-attributes.s =================================================================== --- llvm/trunk/test/MC/MachO/lcomm-attributes.s +++ llvm/trunk/test/MC/MachO/lcomm-attributes.s @@ -39,7 +39,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -56,7 +56,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: LocReloc (0x1) +// CHECK: Type: ZeroFill (0x1) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/loc.s =================================================================== --- llvm/trunk/test/MC/MachO/loc.s +++ llvm/trunk/test/MC/MachO/loc.s @@ -14,7 +14,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x12C // CHECK: RelocationCount: 1 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x20000) // CHECK: Debug (0x20000) // CHECK: ] Index: llvm/trunk/test/MC/MachO/pcrel-to-other-section.s =================================================================== --- llvm/trunk/test/MC/MachO/pcrel-to-other-section.s +++ llvm/trunk/test/MC/MachO/pcrel-to-other-section.s @@ -29,7 +29,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800004) // CHECK: PureInstructions (0x800000) // CHECK: SomeInstructions (0x4) @@ -50,7 +50,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x15C // CHECK: RelocationCount: 1 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800004) // CHECK: PureInstructions (0x800000) // CHECK: SomeInstructions (0x4) Index: llvm/trunk/test/MC/MachO/relax-recompute-align.s =================================================================== --- llvm/trunk/test/MC/MachO/relax-recompute-align.s +++ llvm/trunk/test/MC/MachO/relax-recompute-align.s @@ -32,7 +32,7 @@ // CHECK-NEXT: Alignment: 4 // CHECK-NEXT: RelocationOffset: 0x0 // CHECK-NEXT: RelocationCount: 0 -// CHECK-NEXT: Type: 0x0 +// CHECK-NEXT: Type: Regular (0x0) // CHECK-NEXT: Attributes [ (0x800004) // CHECK-NEXT: PureInstructions (0x800000) // CHECK-NEXT: SomeInstructions (0x4) Index: llvm/trunk/test/MC/MachO/reloc-pcrel-offset.s =================================================================== --- llvm/trunk/test/MC/MachO/reloc-pcrel-offset.s +++ llvm/trunk/test/MC/MachO/reloc-pcrel-offset.s @@ -20,7 +20,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/section-align-1.s =================================================================== --- llvm/trunk/test/MC/MachO/section-align-1.s +++ llvm/trunk/test/MC/MachO/section-align-1.s @@ -30,7 +30,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] Index: llvm/trunk/test/MC/MachO/section-align-2.s =================================================================== --- llvm/trunk/test/MC/MachO/section-align-2.s +++ llvm/trunk/test/MC/MachO/section-align-2.s @@ -39,7 +39,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -56,7 +56,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -72,7 +72,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/section-flags.s =================================================================== --- llvm/trunk/test/MC/MachO/section-flags.s +++ llvm/trunk/test/MC/MachO/section-flags.s @@ -17,7 +17,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -36,7 +36,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x4) // CHECK: SomeInstructions (0x4) // CHECK: ] Index: llvm/trunk/test/MC/MachO/string-table.s =================================================================== --- llvm/trunk/test/MC/MachO/string-table.s +++ llvm/trunk/test/MC/MachO/string-table.s @@ -27,7 +27,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x11C // CHECK: RelocationCount: 2 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800004) // CHECK: PureInstructions (0x800000) // CHECK: SomeInstructions (0x4) Index: llvm/trunk/test/MC/MachO/symbol-diff.s =================================================================== --- llvm/trunk/test/MC/MachO/symbol-diff.s +++ llvm/trunk/test/MC/MachO/symbol-diff.s @@ -31,7 +31,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -51,7 +51,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x188 // CHECK: RelocationCount: 2 -// CHECK: Type: 0xB +// CHECK: Type: Coalesced (0xB) // CHECK: Attributes [ (0x680000) // CHECK: LiveSupport (0x80000) // CHECK: NoTOC (0x400000) Index: llvm/trunk/test/MC/MachO/symbol-flags.s =================================================================== --- llvm/trunk/test/MC/MachO/symbol-flags.s +++ llvm/trunk/test/MC/MachO/symbol-flags.s @@ -84,7 +84,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -101,7 +101,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/symbol-indirect.s =================================================================== --- llvm/trunk/test/MC/MachO/symbol-indirect.s +++ llvm/trunk/test/MC/MachO/symbol-indirect.s @@ -94,7 +94,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -111,7 +111,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x7 +// CHECK: Type: LazySymbolPointers (0x7) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -127,7 +127,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x6 +// CHECK: Type: NonLazySymbolPointers (0x6) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x5 Index: llvm/trunk/test/MC/MachO/symbols-1.s =================================================================== --- llvm/trunk/test/MC/MachO/symbols-1.s +++ llvm/trunk/test/MC/MachO/symbols-1.s @@ -42,7 +42,7 @@ // CHECK-X86_32: Alignment: 0 // CHECK-X86_32: RelocationOffset: 0x0 // CHECK-X86_32: RelocationCount: 0 -// CHECK-X86_32: Type: 0x0 +// CHECK-X86_32: Type: Regular (0x0) // CHECK-X86_32: Attributes [ (0x800000) // CHECK-X86_32: PureInstructions (0x800000) // CHECK-X86_32: ] @@ -206,7 +206,7 @@ // CHECK-X86_64: Alignment: 0 // CHECK-X86_64: RelocationOffset: 0x0 // CHECK-X86_64: RelocationCount: 0 -// CHECK-X86_64: Type: 0x0 +// CHECK-X86_64: Type: Regular (0x0) // CHECK-X86_64: Attributes [ (0x800000) // CHECK-X86_64: PureInstructions (0x800000) // CHECK-X86_64: ] Index: llvm/trunk/test/MC/MachO/tbss.s =================================================================== --- llvm/trunk/test/MC/MachO/tbss.s +++ llvm/trunk/test/MC/MachO/tbss.s @@ -29,7 +29,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -49,7 +49,7 @@ // CHECK: Alignment: 3 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x12 +// CHECK: Type: ThreadLocalZerofill (0x12) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/tdata.s =================================================================== --- llvm/trunk/test/MC/MachO/tdata.s +++ llvm/trunk/test/MC/MachO/tdata.s @@ -29,7 +29,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -49,7 +49,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x11 +// CHECK: Type: ThreadLocalRegular (0x11) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/thread_init_func.s =================================================================== --- llvm/trunk/test/MC/MachO/thread_init_func.s +++ llvm/trunk/test/MC/MachO/thread_init_func.s @@ -29,7 +29,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -49,7 +49,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x15 +// CHECK: Type: ThreadLocalInitFunctionPointers (0x15) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/tls.s =================================================================== --- llvm/trunk/test/MC/MachO/tls.s +++ llvm/trunk/test/MC/MachO/tls.s @@ -72,7 +72,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -92,7 +92,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x11 +// CHECK: Type: ThreadLocalRegular (0x11) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -112,7 +112,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x278 // CHECK: RelocationCount: 8 -// CHECK: Type: 0x13 +// CHECK: Type: ThreadLocalVariables (0x13) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -137,7 +137,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x12 +// CHECK: Type: ThreadLocalZerofill (0x12) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/tlv-reloc.s =================================================================== --- llvm/trunk/test/MC/MachO/tlv-reloc.s +++ llvm/trunk/test/MC/MachO/tlv-reloc.s @@ -47,7 +47,7 @@ // CHECK: Alignment: 4 // CHECK: RelocationOffset: 0x1E8 // CHECK: RelocationCount: 1 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800004) // CHECK: PureInstructions (0x800000) // CHECK: SomeInstructions (0x4) @@ -69,7 +69,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x11 +// CHECK: Type: ThreadLocalRegular (0x11) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -89,7 +89,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x1F0 // CHECK: RelocationCount: 2 -// CHECK: Type: 0x13 +// CHECK: Type: ThreadLocalVariables (0x13) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/tlv.s =================================================================== --- llvm/trunk/test/MC/MachO/tlv.s +++ llvm/trunk/test/MC/MachO/tlv.s @@ -33,7 +33,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -53,7 +53,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x13 +// CHECK: Type: ThreadLocalVariables (0x13) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/values.s =================================================================== --- llvm/trunk/test/MC/MachO/values.s +++ llvm/trunk/test/MC/MachO/values.s @@ -42,7 +42,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -59,7 +59,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/variable-exprs.s =================================================================== --- llvm/trunk/test/MC/MachO/variable-exprs.s +++ llvm/trunk/test/MC/MachO/variable-exprs.s @@ -71,7 +71,7 @@ // CHECK-I386: Alignment: 0 // CHECK-I386: RelocationOffset: 0x0 // CHECK-I386: RelocationCount: 0 -// CHECK-I386: Type: 0x0 +// CHECK-I386: Type: Regular (0x0) // CHECK-I386: Attributes [ (0x800004) // CHECK-I386: PureInstructions (0x800000) // CHECK-I386: SomeInstructions (0x4) @@ -92,7 +92,7 @@ // CHECK-I386: Alignment: 0 // CHECK-I386: RelocationOffset: 0x190 // CHECK-I386: RelocationCount: 9 -// CHECK-I386: Type: 0x0 +// CHECK-I386: Type: Regular (0x0) // CHECK-I386: Attributes [ (0x0) // CHECK-I386: ] // CHECK-I386: Reserved1: 0x0 @@ -278,7 +278,7 @@ // CHECK-X86_64: Alignment: 0 // CHECK-X86_64: RelocationOffset: 0x0 // CHECK-X86_64: RelocationCount: 0 -// CHECK-X86_64: Type: 0x0 +// CHECK-X86_64: Type: Regular (0x0) // CHECK-X86_64: Attributes [ (0x800004) // CHECK-X86_64: PureInstructions (0x800000) // CHECK-X86_64: SomeInstructions (0x4) @@ -300,7 +300,7 @@ // CHECK-X86_64: Alignment: 0 // CHECK-X86_64: RelocationOffset: 0x1BC // CHECK-X86_64: RelocationCount: 9 -// CHECK-X86_64: Type: 0x0 +// CHECK-X86_64: Type: Regular (0x0) // CHECK-X86_64: Attributes [ (0x0) // CHECK-X86_64: ] // CHECK-X86_64: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/weakdef.s =================================================================== --- llvm/trunk/test/MC/MachO/weakdef.s +++ llvm/trunk/test/MC/MachO/weakdef.s @@ -39,7 +39,7 @@ // CHECK-NEXT: Alignment: 0 // CHECK-NEXT: RelocationOffset: 0x0 // CHECK-NEXT: RelocationCount: 0 -// CHECK-NEXT: Type: 0x0 +// CHECK-NEXT: Type: Regular (0x0) // CHECK-NEXT: Attributes [ (0x800000) // CHECK-NEXT: PureInstructions (0x800000) // CHECK-NEXT: ] @@ -58,7 +58,7 @@ // CHECK-NEXT: Alignment: 0 // CHECK-NEXT: RelocationOffset: 0x19C // CHECK-NEXT: RelocationCount: 1 -// CHECK-NEXT: Type: 0xB +// CHECK-NEXT: Type: Coalesced (0xB) // CHECK-NEXT: Attributes [ (0x0) // CHECK-NEXT: ] // CHECK-NEXT: Reserved1: 0x0 @@ -77,7 +77,7 @@ // CHECK-NEXT: Alignment: 0 // CHECK-NEXT: RelocationOffset: 0x0 // CHECK-NEXT: RelocationCount: 0 -// CHECK-NEXT: Type: 0xB +// CHECK-NEXT: Type: Coalesced (0xB) // CHECK-NEXT: Attributes [ (0x0) // CHECK-NEXT: ] // CHECK-NEXT: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/x86_32-optimal_nop.s =================================================================== --- llvm/trunk/test/MC/MachO/x86_32-optimal_nop.s +++ llvm/trunk/test/MC/MachO/x86_32-optimal_nop.s @@ -182,7 +182,7 @@ // CHECK: Alignment: 4 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800004) // CHECK: PureInstructions (0x800000) // CHECK: SomeInstructions (0x4) @@ -224,7 +224,7 @@ // CHECK: Alignment: 4 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/x86_32-sections.s =================================================================== --- llvm/trunk/test/MC/MachO/x86_32-sections.s +++ llvm/trunk/test/MC/MachO/x86_32-sections.s @@ -70,7 +70,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -89,7 +89,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -107,7 +107,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -125,7 +125,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: ExtReloc (0x2) +// CHECK: Type: CStringLiterals (0x2) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -143,7 +143,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x3 +// CHECK: Type: 4ByteLiterals (0x3) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -161,7 +161,7 @@ // CHECK: Alignment: 3 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: SomeInstructions (0x4) +// CHECK: Type: 8ByteLiterals (0x4) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -179,7 +179,7 @@ // CHECK: Alignment: 4 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0xE +// CHECK: Type: 16ByteLiterals (0xE) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -197,7 +197,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -215,7 +215,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -233,7 +233,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x8 +// CHECK: Type: SymbolStubs (0x8) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -252,7 +252,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x8 +// CHECK: Type: SymbolStubs (0x8) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -271,7 +271,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -289,7 +289,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -307,7 +307,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x6 +// CHECK: Type: NonLazySymbolPointers (0x6) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -325,7 +325,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x7 +// CHECK: Type: LazySymbolPointers (0x7) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -343,7 +343,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -361,7 +361,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x9 +// CHECK: Type: ModInitFuncPointers (0x9) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -379,7 +379,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0xA +// CHECK: Type: ModTermFuncPointers (0xA) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -397,7 +397,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -415,7 +415,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -434,7 +434,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -453,7 +453,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -472,7 +472,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -491,7 +491,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -510,7 +510,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -529,7 +529,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -548,7 +548,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -567,7 +567,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x5 +// CHECK: Type: LiteralPointers (0x5) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -586,7 +586,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x5 +// CHECK: Type: LiteralPointers (0x5) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -605,7 +605,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -624,7 +624,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -643,7 +643,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -662,7 +662,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -681,7 +681,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -700,7 +700,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: ExtReloc (0x2) +// CHECK: Type: CStringLiterals (0x2) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -718,7 +718,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x8 +// CHECK: Type: SymbolStubs (0x8) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/x86_32-symbols.s =================================================================== --- llvm/trunk/test/MC/MachO/x86_32-symbols.s +++ llvm/trunk/test/MC/MachO/x86_32-symbols.s @@ -146,7 +146,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -165,7 +165,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -183,7 +183,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -201,7 +201,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: ExtReloc (0x2) +// CHECK: Type: CStringLiterals (0x2) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -219,7 +219,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x3 +// CHECK: Type: 4ByteLiterals (0x3) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -237,7 +237,7 @@ // CHECK: Alignment: 3 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: SomeInstructions (0x4) +// CHECK: Type: 8ByteLiterals (0x4) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -255,7 +255,7 @@ // CHECK: Alignment: 4 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0xE +// CHECK: Type: 16ByteLiterals (0xE) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -273,7 +273,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -291,7 +291,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -309,7 +309,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x8 +// CHECK: Type: SymbolStubs (0x8) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -328,7 +328,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x8 +// CHECK: Type: SymbolStubs (0x8) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -347,7 +347,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -365,7 +365,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -383,7 +383,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x6 +// CHECK: Type: NonLazySymbolPointers (0x6) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -401,7 +401,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x7 +// CHECK: Type: LazySymbolPointers (0x7) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -419,7 +419,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -437,7 +437,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x9 +// CHECK: Type: ModInitFuncPointers (0x9) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -455,7 +455,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0xA +// CHECK: Type: ModTermFuncPointers (0xA) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -473,7 +473,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -491,7 +491,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -510,7 +510,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -529,7 +529,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -548,7 +548,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -567,7 +567,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -586,7 +586,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -605,7 +605,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -624,7 +624,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -643,7 +643,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x5 +// CHECK: Type: LiteralPointers (0x5) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -662,7 +662,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x5 +// CHECK: Type: LiteralPointers (0x5) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -681,7 +681,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -700,7 +700,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -719,7 +719,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -738,7 +738,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -757,7 +757,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -776,7 +776,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: ExtReloc (0x2) +// CHECK: Type: CStringLiterals (0x2) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -794,7 +794,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x8 +// CHECK: Type: SymbolStubs (0x8) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/x86_64-sections.s =================================================================== --- llvm/trunk/test/MC/MachO/x86_64-sections.s +++ llvm/trunk/test/MC/MachO/x86_64-sections.s @@ -66,7 +66,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -86,7 +86,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -105,7 +105,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -124,7 +124,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: ExtReloc (0x2) +// CHECK: Type: CStringLiterals (0x2) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -143,7 +143,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x3 +// CHECK: Type: 4ByteLiterals (0x3) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -162,7 +162,7 @@ // CHECK: Alignment: 3 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: SomeInstructions (0x4) +// CHECK: Type: 8ByteLiterals (0x4) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -181,7 +181,7 @@ // CHECK: Alignment: 4 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0xE +// CHECK: Type: 16ByteLiterals (0xE) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -200,7 +200,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -219,7 +219,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -238,7 +238,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -257,7 +257,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -276,7 +276,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -295,7 +295,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x9 +// CHECK: Type: ModInitFuncPointers (0x9) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -314,7 +314,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0xA +// CHECK: Type: ModTermFuncPointers (0xA) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -333,7 +333,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -352,7 +352,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -372,7 +372,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -392,7 +392,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -412,7 +412,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -432,7 +432,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -452,7 +452,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -472,7 +472,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -492,7 +492,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -512,7 +512,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x5 +// CHECK: Type: LiteralPointers (0x5) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -532,7 +532,7 @@ // CHECK: Alignment: 2 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x5 +// CHECK: Type: LiteralPointers (0x5) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -552,7 +552,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -572,7 +572,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -592,7 +592,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -612,7 +612,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -632,7 +632,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x100000) // CHECK: NoDeadStrip (0x100000) // CHECK: ] @@ -652,7 +652,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: ExtReloc (0x2) +// CHECK: Type: CStringLiterals (0x2) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/zero-space.s =================================================================== --- llvm/trunk/test/MC/MachO/zero-space.s +++ llvm/trunk/test/MC/MachO/zero-space.s @@ -32,7 +32,7 @@ // CHECK-NEXT: Alignment: 0 // CHECK-NEXT: RelocationOffset: 0x0 // CHECK-NEXT: RelocationCount: 0 -// CHECK-NEXT: Type: 0x0 +// CHECK-NEXT: Type: Regular (0x0) // CHECK-NEXT: Attributes [ (0x800000) // CHECK-NEXT: PureInstructions (0x800000) // CHECK-NEXT: ] @@ -52,7 +52,7 @@ // CHECK-NEXT: Alignment: 6 // CHECK-NEXT: RelocationOffset: 0x0 // CHECK-NEXT: RelocationCount: 0 -// CHECK-NEXT: Type: 0x0 +// CHECK-NEXT: Type: Regular (0x0) // CHECK-NEXT: Attributes [ (0x0) // CHECK-NEXT: ] // CHECK-NEXT: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/zerofill-1.s =================================================================== --- llvm/trunk/test/MC/MachO/zerofill-1.s +++ llvm/trunk/test/MC/MachO/zerofill-1.s @@ -33,7 +33,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -53,7 +53,7 @@ // CHECK: Alignment: 1 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: LocReloc (0x1) +// CHECK: Type: ZeroFill (0x1) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 @@ -69,7 +69,7 @@ // CHECK: Alignment: 3 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/zerofill-2.s =================================================================== --- llvm/trunk/test/MC/MachO/zerofill-2.s +++ llvm/trunk/test/MC/MachO/zerofill-2.s @@ -30,7 +30,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -50,7 +50,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: LocReloc (0x1) +// CHECK: Type: ZeroFill (0x1) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/zerofill-3.s =================================================================== --- llvm/trunk/test/MC/MachO/zerofill-3.s +++ llvm/trunk/test/MC/MachO/zerofill-3.s @@ -44,7 +44,7 @@ // CHECK: Alignment: 0 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -63,7 +63,7 @@ // CHECK: Alignment: 4 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: LocReloc (0x1) +// CHECK: Type: ZeroFill (0x1) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/MachO/zerofill-5.s =================================================================== --- llvm/trunk/test/MC/MachO/zerofill-5.s +++ llvm/trunk/test/MC/MachO/zerofill-5.s @@ -32,7 +32,7 @@ // CHECK: Alignment: 3 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0x0 +// CHECK: Type: Regular (0x0) // CHECK: Attributes [ (0x800000) // CHECK: PureInstructions (0x800000) // CHECK: ] @@ -53,7 +53,7 @@ // CHECK: Alignment: 3 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: LocReloc (0x1) +// CHECK: Type: ZeroFill (0x1) // CHECK: Attributes [ (0x0) // CHECK: ] // CHECK: Reserved1: 0x0 Index: llvm/trunk/test/MC/X86/cfi_def_cfa-crash.s =================================================================== --- llvm/trunk/test/MC/X86/cfi_def_cfa-crash.s +++ llvm/trunk/test/MC/X86/cfi_def_cfa-crash.s @@ -78,7 +78,7 @@ // CHECK: Alignment: 3 // CHECK: RelocationOffset: 0x0 // CHECK: RelocationCount: 0 -// CHECK: Type: 0xB +// CHECK: Type: Coalesced (0xB) // CHECK: Attributes [ (0x680000) // CHECK: LiveSupport (0x80000) // CHECK: NoTOC (0x400000) Index: llvm/trunk/test/tools/dsymutil/X86/dsym-companion.test =================================================================== --- llvm/trunk/test/tools/dsymutil/X86/dsym-companion.test +++ llvm/trunk/test/tools/dsymutil/X86/dsym-companion.test @@ -39,7 +39,7 @@ CHECK: Alignment: 4 CHECK: RelocationOffset: 0x0 CHECK: RelocationCount: 0 -CHECK: Type: 0x0 +CHECK: Type: Regular (0x0) CHECK: Attributes [ (0x800004) CHECK: PureInstructions (0x800000) CHECK: SomeInstructions (0x4) @@ -57,7 +57,7 @@ CHECK: Alignment: 2 CHECK: RelocationOffset: 0x0 CHECK: RelocationCount: 0 -CHECK: Type: 0x0 +CHECK: Type: Regular (0x0) CHECK: Attributes [ (0x0) CHECK: ] CHECK: Reserved1: 0x0 @@ -72,7 +72,7 @@ CHECK32: Alignment: 2 CHECK32: RelocationOffset: 0x0 CHECK32: RelocationCount: 0 -CHECK32: Type: 0x6 +CHECK32: Type: NonLazySymbolPointers (0x6) CHECK32: Attributes [ (0x0) CHECK32: ] CHECK32: Reserved1: 0x0 @@ -88,7 +88,7 @@ CHECK: Alignment: 2 CHECK: RelocationOffset: 0x0 CHECK: RelocationCount: 0 -CHECK: Type: 0x0 +CHECK: Type: Regular (0x0) CHECK: Attributes [ (0x0) CHECK: ] CHECK: Reserved1: 0x0 @@ -104,7 +104,7 @@ CHECK: Alignment: 2 CHECK: RelocationOffset: 0x0 CHECK: RelocationCount: 0 -CHECK: Type: LocReloc (0x1) +CHECK: Type: ZeroFill (0x1) CHECK: Attributes [ (0x0) CHECK: ] CHECK: Reserved1: 0x0 @@ -120,7 +120,7 @@ CHECK: Alignment: 2 CHECK: RelocationOffset: 0x0 CHECK: RelocationCount: 0 -CHECK: Type: LocReloc (0x1) +CHECK: Type: ZeroFill (0x1) CHECK: Attributes [ (0x0) CHECK: ] CHECK: Reserved1: 0x0 @@ -135,7 +135,7 @@ CHECK64: Alignment: 0 CHECK64: RelocationOffset: 0x0 CHECK64: RelocationCount: 0 -CHECK64: Type: 0x0 +CHECK64: Type: Regular (0x0) CHECK64: Attributes [ (0x0) CHECK64: ] CHECK64: Reserved1: 0x0 @@ -150,7 +150,7 @@ CHECK64: Alignment: 0 CHECK64: RelocationOffset: 0x0 CHECK64: RelocationCount: 0 -CHECK64: Type: 0x0 +CHECK64: Type: Regular (0x0) CHECK64: Attributes [ (0x0) CHECK64: ] CHECK64: Reserved1: 0x0 @@ -165,7 +165,7 @@ CHECK64: Alignment: 0 CHECK64: RelocationOffset: 0x0 CHECK64: RelocationCount: 0 -CHECK64: Type: 0x0 +CHECK64: Type: Regular (0x0) CHECK64: Attributes [ (0x0) CHECK64: ] CHECK64: Reserved1: 0x0 @@ -180,7 +180,7 @@ CHECK64: Alignment: 0 CHECK64: RelocationOffset: 0x0 CHECK64: RelocationCount: 0 -CHECK64: Type: 0x0 +CHECK64: Type: Regular (0x0) CHECK64: Attributes [ (0x0) CHECK64: ] CHECK64: Reserved1: 0x0 @@ -195,7 +195,7 @@ CHECK64: Alignment: 0 CHECK64: RelocationOffset: 0x0 CHECK64: RelocationCount: 0 -CHECK64: Type: 0x0 +CHECK64: Type: Regular (0x0) CHECK64: Attributes [ (0x0) CHECK64: ] CHECK64: Reserved1: 0x0 @@ -213,7 +213,7 @@ CHECK: Alignment: 0 CHECK: RelocationOffset: 0x0 CHECK: RelocationCount: 0 -CHECK: Type: 0x0 +CHECK: Type: Regular (0x0) CHECK: Attributes [ (0x0) CHECK: ] CHECK: Reserved1: 0x0 @@ -231,7 +231,7 @@ CHECK: Alignment: 0 CHECK: RelocationOffset: 0x0 CHECK: RelocationCount: 0 -CHECK: Type: 0x0 +CHECK: Type: Regular (0x0) CHECK: Attributes [ (0x0) CHECK: ] CHECK: Reserved1: 0x0 Index: llvm/trunk/test/tools/llvm-readobj/macho-sections.test =================================================================== --- llvm/trunk/test/tools/llvm-readobj/macho-sections.test +++ llvm/trunk/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 Index: llvm/trunk/test/tools/llvm-readobj/macho-universal-x86_64.i386.test =================================================================== --- llvm/trunk/test/tools/llvm-readobj/macho-universal-x86_64.i386.test +++ llvm/trunk/test/tools/llvm-readobj/macho-universal-x86_64.i386.test @@ -66,7 +66,7 @@ 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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 Index: llvm/trunk/test/tools/llvm-readobj/sections-ext.test =================================================================== --- llvm/trunk/test/tools/llvm-readobj/sections-ext.test +++ llvm/trunk/test/tools/llvm-readobj/sections-ext.test @@ -186,7 +186,7 @@ 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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 Index: llvm/trunk/test/tools/llvm-readobj/sections.test =================================================================== --- llvm/trunk/test/tools/llvm-readobj/sections.test +++ llvm/trunk/test/tools/llvm-readobj/sections.test @@ -137,7 +137,7 @@ 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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 Index: llvm/trunk/tools/llvm-readobj/MachODumper.cpp =================================================================== --- llvm/trunk/tools/llvm-readobj/MachODumper.cpp +++ llvm/trunk/tools/llvm-readobj/MachODumper.cpp @@ -214,6 +214,31 @@ LLVM_READOBJ_ENUM_ENT(MachO, MH_APP_EXTENSION_SAFE), }; +static const EnumEntry MachOSectionTypes[] = { + { "Regular" , MachO::S_REGULAR }, + { "ZeroFill" , MachO::S_ZEROFILL }, + { "CStringLiterals" , MachO::S_CSTRING_LITERALS }, + { "4ByteLiterals" , MachO::S_4BYTE_LITERALS }, + { "8ByteLiterals" , MachO::S_8BYTE_LITERALS }, + { "LiteralPointers" , MachO::S_LITERAL_POINTERS }, + { "NonLazySymbolPointers" , MachO::S_NON_LAZY_SYMBOL_POINTERS }, + { "LazySymbolPointers" , MachO::S_LAZY_SYMBOL_POINTERS }, + { "SymbolStubs" , MachO::S_SYMBOL_STUBS }, + { "ModInitFuncPointers" , MachO::S_MOD_INIT_FUNC_POINTERS }, + { "ModTermFuncPointers" , MachO::S_MOD_TERM_FUNC_POINTERS }, + { "Coalesced" , MachO::S_COALESCED }, + { "GBZeroFill" , MachO::S_GB_ZEROFILL }, + { "Interposing" , MachO::S_INTERPOSING }, + { "16ByteLiterals" , MachO::S_16BYTE_LITERALS }, + { "DTraceDOF" , MachO::S_DTRACE_DOF }, + { "LazyDylibSymbolPointers" , MachO::S_LAZY_DYLIB_SYMBOL_POINTERS }, + { "ThreadLocalRegular" , MachO::S_THREAD_LOCAL_REGULAR }, + { "ThreadLocalZerofill" , MachO::S_THREAD_LOCAL_ZEROFILL }, + { "ThreadLocalVariables" , MachO::S_THREAD_LOCAL_VARIABLES }, + { "ThreadLocalVariablePointers" , MachO::S_THREAD_LOCAL_VARIABLE_POINTERS }, + { "ThreadLocalInitFunctionPointers", MachO::S_THREAD_LOCAL_INIT_FUNCTION_POINTERS } +}; + static const EnumEntry MachOSectionAttributes[] = { { "LocReloc" , 1 << 0 /*S_ATTR_LOC_RELOC */ }, { "ExtReloc" , 1 << 1 /*S_ATTR_EXT_RELOC */ }, @@ -456,7 +481,7 @@ W.printHex("RelocationOffset", MOSection.RelocationTableOffset); W.printNumber("RelocationCount", MOSection.NumRelocationTableEntries); W.printEnum("Type", MOSection.Flags & 0xFF, - makeArrayRef(MachOSectionAttributes)); + makeArrayRef(MachOSectionTypes)); W.printFlags("Attributes", MOSection.Flags >> 8, makeArrayRef(MachOSectionAttributes)); W.printHex("Reserved1", MOSection.Reserved1);