Revert: [mips] Correct section alignments and EntrySizes for .bss, .text, .data, .reginfo, .MIPS.options, and .MIPS.abiflags

This commit causes multiple lld tests to fail. Reverting while I investigate the issue.

llvm-svn: 212945

11 files changed, 216 insertions, 212 deletions

diff --git a/llvm/test/MC/Mips/elf_reginfo.s b/llvm/test/MC/Mips/elf_reginfo.s
index b88607a02d3..5e9ddf84d04 100644
--- a/llvm/test/MC/Mips/elf_reginfo.s
+++ b/llvm/test/MC/Mips/elf_reginfo.s
@@ -14,19 +14,13 @@
 # check for .MIPS.options
 # CHECK_64:      Sections [
 # CHECK_64:        Section {
-# CHECK_64-LABEL:    Name: .MIPS.options
+# CHECK_64:          Name: .MIPS.options
 # CHECK_64-NEXT:     Type: SHT_MIPS_OPTIONS
 # CHECK_64-NEXT:     Flags [ (0x8000002)
-# CHECK_64:          AddressAlignment: 8
-# CHECK_64:          EntrySize: 1
-# CHECK_64-LABEL:  }
 
 # check for .reginfo
 # CHECK_32:      Sections [
 # CHECK_32:        Section {
-# CHECK_32-LABEL:    Name: .reginfo
+# CHECK_32:          Name: .reginfo
 # CHECK_32-NEXT:     Type:  SHT_MIPS_REGINFO
 # CHECK_32-NEXT:     Flags [ (0x2)
-# CHECK_32:          AddressAlignment: 4
-# CHECK_32:          EntrySize: 24
-# CHECK_32-LABEL:  }
diff --git a/llvm/test/MC/Mips/mips32/abiflags.s b/llvm/test/MC/Mips/mips32/abiflags.s
index dd772c0ba5a..3f568648037 100644
--- a/llvm/test/MC/Mips/mips32/abiflags.s
+++ b/llvm/test/MC/Mips/mips32/abiflags.s
@@ -8,26 +8,27 @@
 # CHECK-ASM: .module fp=32
 
 # Checking if the Mips.abiflags were correctly emitted.
-# CHECK-OBJ:       Section {
-# CHECK-OBJ:         Index: 5
-# CHECK-OBJ-LABEL:   Name: .MIPS.abiflags (12)
-# CHECK-OBJ:         Type: SHT_MIPS_ABIFLAGS (0x7000002A)
-# CHECK-OBJ:          Flags [ (0x2)
-# CHECK-OBJ:           SHF_ALLOC (0x2)
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         Address: 0x0
-# CHECK-OBJ:         Size: 24
-# CHECK-OBJ:         Link: 0
-# CHECK-OBJ:         Info: 0
-# CHECK-OBJ:         AddressAlignment: 8
-# CHECK-OBJ:         EntrySize: 24
-# CHECK-OBJ:         Relocations [
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         SectionData (
-# CHECK-OBJ:           0000: 00002001 01010001 00000000 00000000  |.. .............|
-# CHECK-OBJ:           0010: 00000001 00000000                    |........|
-# CHECK-OBJ:         )
-# CHECK-OBJ-LABEL: }
+# CHECK-OBJ:  Section {
+# CHECK-OBJ:    Index: 5
+# CHECK-OBJ:    Name: .MIPS.abiflags (12)
+# CHECK-OBJ:    Type: SHT_MIPS_ABIFLAGS (0x7000002A)
+# CHECK-OBJ:     Flags [ (0x2)
+# CHECK-OBJ:      SHF_ALLOC (0x2)
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    Address: 0x0
+# CHECK-OBJ:    Offset: 0x50
+# CHECK-OBJ:    Size: 24
+# CHECK-OBJ:    Link: 0
+# CHECK-OBJ:    Info: 0
+# CHECK-OBJ:    AddressAlignment: 8
+# CHECK-OBJ:    EntrySize: 0
+# CHECK-OBJ:    Relocations [
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    SectionData (
+# CHECK-OBJ:      0000: 00002001 01010001 00000000 00000000  |.. .............|
+# CHECK-OBJ:      0010: 00000001 00000000                    |........|
+# CHECK-OBJ:    )
+# CHECK-OBJ:  }
 
         .module fp=32
 
diff --git a/llvm/test/MC/Mips/mips32r2/abiflags.s b/llvm/test/MC/Mips/mips32r2/abiflags.s
index e3bb15bddde..228ba57e8b8 100644
--- a/llvm/test/MC/Mips/mips32r2/abiflags.s
+++ b/llvm/test/MC/Mips/mips32r2/abiflags.s
@@ -9,26 +9,27 @@
 # CHECK-ASM: .set fp=64
 
 # Checking if the Mips.abiflags were correctly emitted.
-# CHECK-OBJ:       Section {
-# CHECK-OBJ:         Index: 5
-# CHECK-OBJ-LABEL:   Name: .MIPS.abiflags (12)
-# CHECK-OBJ:         Type: SHT_MIPS_ABIFLAGS (0x7000002A)
-# CHECK-OBJ:          Flags [ (0x2)
-# CHECK-OBJ:           SHF_ALLOC (0x2)
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         Address: 0x0
-# CHECK-OBJ:         Size: 24
-# CHECK-OBJ:         Link: 0
-# CHECK-OBJ:         Info: 0
-# CHECK-OBJ:         AddressAlignment: 8
-# CHECK-OBJ:         EntrySize: 24
-# CHECK-OBJ:         Relocations [
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         SectionData (
-# CHECK-OBJ:           0000: 00002002 01010001 00000000 00000000  |.. .............|
-# CHECK-OBJ:           0010: 00000001 00000000                    |........|
-# CHECK-OBJ:         )
-# CHECK-OBJ-LABEL: }
+# CHECK-OBJ:  Section {
+# CHECK-OBJ:    Index: 5
+# CHECK-OBJ:    Name: .MIPS.abiflags (12)
+# CHECK-OBJ:    Type: SHT_MIPS_ABIFLAGS (0x7000002A)
+# CHECK-OBJ:     Flags [ (0x2)
+# CHECK-OBJ:      SHF_ALLOC (0x2)
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    Address: 0x0
+# CHECK-OBJ:    Offset: 0x50
+# CHECK-OBJ:    Size: 24
+# CHECK-OBJ:    Link: 0
+# CHECK-OBJ:    Info: 0
+# CHECK-OBJ:    AddressAlignment: 8
+# CHECK-OBJ:    EntrySize: 0
+# CHECK-OBJ:    Relocations [
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    SectionData (
+# CHECK-OBJ:      0000: 00002002 01010001 00000000 00000000  |.. .............|
+# CHECK-OBJ:      0010: 00000001 00000000                    |........|
+# CHECK-OBJ:    )
+# CHECK-OBJ:  }
 
         .module fp=32
         .set fp=64
diff --git a/llvm/test/MC/Mips/mips64/abiflags.s b/llvm/test/MC/Mips/mips64/abiflags.s
index 38b7a454e8f..0b4bad09210 100644
--- a/llvm/test/MC/Mips/mips64/abiflags.s
+++ b/llvm/test/MC/Mips/mips64/abiflags.s
@@ -8,26 +8,27 @@
 # CHECK-ASM: .module fp=64
 
 # Checking if the Mips.abiflags were correctly emitted.
-# CHECK-OBJ:       Section {
-# CHECK-OBJ:         Index: 5
-# CHECK-OBJ-LABEL:   Name: .MIPS.abiflags (12)
-# CHECK-OBJ:         Type: SHT_MIPS_ABIFLAGS (0x7000002A)
-# CHECK-OBJ:          Flags [ (0x2)
-# CHECK-OBJ:           SHF_ALLOC (0x2)
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         Address: 0x0
-# CHECK-OBJ:         Size: 24
-# CHECK-OBJ:         Link: 0
-# CHECK-OBJ:         Info: 0
-# CHECK-OBJ:         AddressAlignment: 8
-# CHECK-OBJ:         EntrySize: 24
-# CHECK-OBJ:         Relocations [
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         SectionData (
-# CHECK-OBJ:           0000: 00004001 02020001 00000000 00000000  |..@.............|
-# CHECK-OBJ:           0010: 00000001 00000000                    |........|
-# CHECK-OBJ:         )
-# CHECK-OBJ-LABEL: }
+# CHECK-OBJ:  Section {
+# CHECK-OBJ:    Index: 5
+# CHECK-OBJ:    Name: .MIPS.abiflags (12)
+# CHECK-OBJ:    Type: SHT_MIPS_ABIFLAGS (0x7000002A)
+# CHECK-OBJ:     Flags [ (0x2)
+# CHECK-OBJ:      SHF_ALLOC (0x2)
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    Address: 0x0
+# CHECK-OBJ:    Offset: 0x50
+# CHECK-OBJ:    Size: 24
+# CHECK-OBJ:    Link: 0
+# CHECK-OBJ:    Info: 0
+# CHECK-OBJ:    AddressAlignment: 8
+# CHECK-OBJ:    EntrySize: 0
+# CHECK-OBJ:    Relocations [
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    SectionData (
+# CHECK-OBJ:      0000: 00004001 02020001 00000000 00000000  |..@.............|
+# CHECK-OBJ:      0010: 00000001 00000000                    |........|
+# CHECK-OBJ:    )
+# CHECK-OBJ:  }
 
         .module fp=64
 
diff --git a/llvm/test/MC/Mips/mips64r2/abiflags.s b/llvm/test/MC/Mips/mips64r2/abiflags.s
index 02a91ee4ab8..82afbbba935 100644
--- a/llvm/test/MC/Mips/mips64r2/abiflags.s
+++ b/llvm/test/MC/Mips/mips64r2/abiflags.s
@@ -8,26 +8,27 @@
 # CHECK-ASM: .module fp=64
 
 # Checking if the Mips.abiflags were correctly emitted.
-# CHECK-OBJ:       Section {
-# CHECK-OBJ:         Index: 5
-# CHECK-OBJ-LABEL:   Name: .MIPS.abiflags (12)
-# CHECK-OBJ:         Type: SHT_MIPS_ABIFLAGS (0x7000002A)
-# CHECK-OBJ:          Flags [ (0x2)
-# CHECK-OBJ:           SHF_ALLOC (0x2)
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         Address: 0x0
-# CHECK-OBJ:         Size: 24
-# CHECK-OBJ:         Link: 0
-# CHECK-OBJ:         Info: 0
-# CHECK-OBJ:         AddressAlignment: 8
-# CHECK-OBJ:         EntrySize: 24
-# CHECK-OBJ:         Relocations [
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         SectionData (
-# CHECK-OBJ:           0000: 00004002 02020001 00000000 00000000  |..@.............|
-# CHECK-OBJ:           0010: 00000001 00000000                    |........|
-# CHECK-OBJ:         )
-# CHECK-OBJ-LABEL: }
+# CHECK-OBJ:  Section {
+# CHECK-OBJ:    Index: 5
+# CHECK-OBJ:    Name: .MIPS.abiflags (12)
+# CHECK-OBJ:    Type: SHT_MIPS_ABIFLAGS (0x7000002A)
+# CHECK-OBJ:     Flags [ (0x2)
+# CHECK-OBJ:      SHF_ALLOC (0x2)
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    Address: 0x0
+# CHECK-OBJ:    Offset: 0x50
+# CHECK-OBJ:    Size: 24
+# CHECK-OBJ:    Link: 0
+# CHECK-OBJ:    Info: 0
+# CHECK-OBJ:    AddressAlignment: 8
+# CHECK-OBJ:    EntrySize: 0
+# CHECK-OBJ:    Relocations [
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    SectionData (
+# CHECK-OBJ:      0000: 00004002 02020001 00000000 00000000  |..@.............|
+# CHECK-OBJ:      0010: 00000001 00000000                    |........|
+# CHECK-OBJ:    )
+# CHECK-OBJ:  }
 
         .module fp=64
 
diff --git a/llvm/test/MC/Mips/mips_abi_flags_xx.s b/llvm/test/MC/Mips/mips_abi_flags_xx.s
index 9192d0c4800..b8416fc2454 100644
--- a/llvm/test/MC/Mips/mips_abi_flags_xx.s
+++ b/llvm/test/MC/Mips/mips_abi_flags_xx.s
@@ -8,26 +8,27 @@
 # CHECK-ASM: .module fp=xx
 
 # Checking if the Mips.abiflags were correctly emitted.
-# CHECK-OBJ:       Section {
-# CHECK-OBJ:         Index: 5
-# CHECK-OBJ-LABEL:   Name: .MIPS.abiflags (12)
-# CHECK-OBJ:         Type: SHT_MIPS_ABIFLAGS (0x7000002A)
-# CHECK-OBJ:          Flags [ (0x2)
-# CHECK-OBJ:           SHF_ALLOC (0x2)
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         Address: 0x0
-# CHECK-OBJ:         Size: 24
-# CHECK-OBJ:         Link: 0
-# CHECK-OBJ:         Info: 0
-# CHECK-OBJ:         AddressAlignment: 8
-# CHECK-OBJ:         EntrySize: 24
-# CHECK-OBJ:         Relocations [
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         SectionData (
-# CHECK-OBJ:           0000: 00002001 01010005 00000000 00000000  |.. .............|
-# CHECK-OBJ:           0010: 00000001 00000000                    |........|
-# CHECK-OBJ:         )
-# CHECK-OBJ-LABEL: }
+# CHECK-OBJ:  Section {
+# CHECK-OBJ:    Index: 5
+# CHECK-OBJ:    Name: .MIPS.abiflags (12)
+# CHECK-OBJ:    Type: SHT_MIPS_ABIFLAGS (0x7000002A)
+# CHECK-OBJ:     Flags [ (0x2)
+# CHECK-OBJ:      SHF_ALLOC (0x2)
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    Address: 0x0
+# CHECK-OBJ:    Offset: 0x50
+# CHECK-OBJ:    Size: 24
+# CHECK-OBJ:    Link: 0
+# CHECK-OBJ:    Info: 0
+# CHECK-OBJ:    AddressAlignment: 8
+# CHECK-OBJ:    EntrySize: 0
+# CHECK-OBJ:    Relocations [
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    SectionData (
+# CHECK-OBJ:      0000: 00002001 01010005 00000000 00000000  |.. .............|
+# CHECK-OBJ:      0010: 00000001 00000000                    |........|
+# CHECK-OBJ:    )
+# CHECK-OBJ:  }
 
         .module fp=xx
 
diff --git a/llvm/test/MC/Mips/mips_abi_flags_xx_set.s b/llvm/test/MC/Mips/mips_abi_flags_xx_set.s
index a548972db0d..0c2d9bb7e95 100644
--- a/llvm/test/MC/Mips/mips_abi_flags_xx_set.s
+++ b/llvm/test/MC/Mips/mips_abi_flags_xx_set.s
@@ -9,26 +9,27 @@
 # CHECK-ASM: .set    fp=64
 
 # Checking if the Mips.abiflags were correctly emitted.
-# CHECK-OBJ:       Section {
-# CHECK-OBJ:         Index: 5
-# CHECK-OBJ-LABEL:   Name: .MIPS.abiflags (12)
-# CHECK-OBJ:         Type: SHT_MIPS_ABIFLAGS (0x7000002A)
-# CHECK-OBJ:          Flags [ (0x2)
-# CHECK-OBJ:           SHF_ALLOC (0x2)
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         Address: 0x0
-# CHECK-OBJ:         Size: 24
-# CHECK-OBJ:         Link: 0
-# CHECK-OBJ:         Info: 0
-# CHECK-OBJ:         AddressAlignment: 8
-# CHECK-OBJ:         EntrySize: 24
-# CHECK-OBJ:         Relocations [
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         SectionData (
-# CHECK-OBJ:           0000: 00002001 01010005 00000000 00000000  |.. .............|
-# CHECK-OBJ:           0010: 00000001 00000000                    |........|
-# CHECK-OBJ:         )
-# CHECK-OBJ-LABEL: }
+# CHECK-OBJ:  Section {
+# CHECK-OBJ:    Index: 5
+# CHECK-OBJ:    Name: .MIPS.abiflags (12)
+# CHECK-OBJ:    Type: SHT_MIPS_ABIFLAGS (0x7000002A)
+# CHECK-OBJ:     Flags [ (0x2)
+# CHECK-OBJ:      SHF_ALLOC (0x2)
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    Address: 0x0
+# CHECK-OBJ:    Offset: 0x50
+# CHECK-OBJ:    Size: 24
+# CHECK-OBJ:    Link: 0
+# CHECK-OBJ:    Info: 0
+# CHECK-OBJ:    AddressAlignment: 8
+# CHECK-OBJ:    EntrySize: 0
+# CHECK-OBJ:    Relocations [
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    SectionData (
+# CHECK-OBJ:      0000: 00002001 01010005 00000000 00000000  |.. .............|
+# CHECK-OBJ:      0010: 00000001 00000000                    |........|
+# CHECK-OBJ:    )
+# CHECK-OBJ:  }
 
         .module fp=xx
         .set    fp=64
diff --git a/llvm/test/MC/Mips/msa/abiflags.s b/llvm/test/MC/Mips/msa/abiflags.s
index 136c035593e..7856447f009 100644
--- a/llvm/test/MC/Mips/msa/abiflags.s
+++ b/llvm/test/MC/Mips/msa/abiflags.s
@@ -9,26 +9,27 @@
 # CHECK-ASM: .set fp=64
 
 # Checking if the Mips.abiflags were correctly emitted.
-# CHECK-OBJ:       Section {
-# CHECK-OBJ:         Index: 5
-# CHECK-OBJ-LABEL:   Name: .MIPS.abiflags (12)
-# CHECK-OBJ:         Type: SHT_MIPS_ABIFLAGS (0x7000002A)
-# CHECK-OBJ:          Flags [ (0x2)
-# CHECK-OBJ:           SHF_ALLOC (0x2)
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         Address: 0x0
-# CHECK-OBJ:         Size: 24
-# CHECK-OBJ:         Link: 0
-# CHECK-OBJ:         Info: 0
-# CHECK-OBJ:         AddressAlignment: 8
-# CHECK-OBJ:         EntrySize: 24
-# CHECK-OBJ:         Relocations [
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         SectionData (
-# CHECK-OBJ:           0000: 00002002 01030001 00000000 00000200  |.. .............|
-# CHECK-OBJ:           0010: 00000001 00000000                    |........|
-# CHECK-OBJ:         )
-# CHECK-OBJ-LABEL: }
+# CHECK-OBJ:  Section {
+# CHECK-OBJ:    Index: 5
+# CHECK-OBJ:    Name: .MIPS.abiflags (12)
+# CHECK-OBJ:    Type: SHT_MIPS_ABIFLAGS (0x7000002A)
+# CHECK-OBJ:     Flags [ (0x2)
+# CHECK-OBJ:      SHF_ALLOC (0x2)
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    Address: 0x0
+# CHECK-OBJ:    Offset: 0x50
+# CHECK-OBJ:    Size: 24
+# CHECK-OBJ:    Link: 0
+# CHECK-OBJ:    Info: 0
+# CHECK-OBJ:    AddressAlignment: 8
+# CHECK-OBJ:    EntrySize: 0
+# CHECK-OBJ:    Relocations [
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    SectionData (
+# CHECK-OBJ:      0000: 00002002 01030001 00000000 00000200  |.. .............|
+# CHECK-OBJ:      0010: 00000001 00000000                    |........|
+# CHECK-OBJ:    )
+# CHECK-OBJ:  }
 
         .module fp=32
         .set fp=64
diff --git a/llvm/test/MC/Mips/nooddspreg-cmdarg.s b/llvm/test/MC/Mips/nooddspreg-cmdarg.s
index 52b040e96f1..993c630c13a 100644
--- a/llvm/test/MC/Mips/nooddspreg-cmdarg.s
+++ b/llvm/test/MC/Mips/nooddspreg-cmdarg.s
@@ -14,26 +14,27 @@
 # CHECK-ASM-NOT: .module nooddspreg
 
 # Checking if the Mips.abiflags were correctly emitted.
-# CHECK-OBJ:       Section {
-# CHECK-OBJ:         Index: 5
-# CHECK-OBJ-LABEL:   Name: .MIPS.abiflags (12)
-# CHECK-OBJ:         Type: SHT_MIPS_ABIFLAGS (0x7000002A)
-# CHECK-OBJ:          Flags [ (0x2)
-# CHECK-OBJ:           SHF_ALLOC (0x2)
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         Address: 0x0
-# CHECK-OBJ:         Size: 24
-# CHECK-OBJ:         Link: 0
-# CHECK-OBJ:         Info: 0
-# CHECK-OBJ:         AddressAlignment: 8
-# CHECK-OBJ:         EntrySize: 24
-# CHECK-OBJ:         Relocations [
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         SectionData (
-# CHECK-OBJ:           0000: 00002001 01020007 00000000 00000000  |.. .............|
-# CHECK-OBJ:           0010: 00000000 00000000                    |........|
-# CHECK-OBJ:         )
-# CHECK-OBJ-LABEL: }
+# CHECK-OBJ:  Section {
+# CHECK-OBJ:    Index: 5
+# CHECK-OBJ:    Name: .MIPS.abiflags (12)
+# CHECK-OBJ:    Type: SHT_MIPS_ABIFLAGS (0x7000002A)
+# CHECK-OBJ:     Flags [ (0x2)
+# CHECK-OBJ:      SHF_ALLOC (0x2)
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    Address: 0x0
+# CHECK-OBJ:    Offset: 0x50
+# CHECK-OBJ:    Size: 24
+# CHECK-OBJ:    Link: 0
+# CHECK-OBJ:    Info: 0
+# CHECK-OBJ:    AddressAlignment: 8
+# CHECK-OBJ:    EntrySize: 0
+# CHECK-OBJ:    Relocations [
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    SectionData (
+# CHECK-OBJ:      0000: 00002001 01020007 00000000 00000000  |.. .............|
+# CHECK-OBJ:      0010: 00000000 00000000                    |........|
+# CHECK-OBJ:    )
+# CHECK-OBJ:  }
 
 # INVALID: ERROR: -mno-odd-spreg requires the O32 ABI
 
diff --git a/llvm/test/MC/Mips/nooddspreg.s b/llvm/test/MC/Mips/nooddspreg.s
index f268ef48297..10cd1ac068f 100644
--- a/llvm/test/MC/Mips/nooddspreg.s
+++ b/llvm/test/MC/Mips/nooddspreg.s
@@ -14,26 +14,27 @@
 # CHECK-ASM: .module nooddspreg
 
 # Checking if the Mips.abiflags were correctly emitted.
-# CHECK-OBJ:       Section {
-# CHECK-OBJ:         Index: 5
-# CHECK-OBJ-LABEL:   Name: .MIPS.abiflags (12)
-# CHECK-OBJ:         Type: SHT_MIPS_ABIFLAGS (0x7000002A)
-# CHECK-OBJ:          Flags [ (0x2)
-# CHECK-OBJ:           SHF_ALLOC (0x2)
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         Address: 0x0
-# CHECK-OBJ:         Size: 24
-# CHECK-OBJ:         Link: 0
-# CHECK-OBJ:         Info: 0
-# CHECK-OBJ:         AddressAlignment: 8
-# CHECK-OBJ:         EntrySize: 24
-# CHECK-OBJ:         Relocations [
-# CHECK-OBJ:         ]
-# CHECK-OBJ:         SectionData (
-# CHECK-OBJ:           0000: 00002001 01020007 00000000 00000000  |.. .............|
-# CHECK-OBJ:           0010: 00000000 00000000                    |........|
-# CHECK-OBJ:         )
-# CHECK-OBJ-LABEL: }
+# CHECK-OBJ:  Section {
+# CHECK-OBJ:    Index: 5
+# CHECK-OBJ:    Name: .MIPS.abiflags (12)
+# CHECK-OBJ:    Type: SHT_MIPS_ABIFLAGS (0x7000002A)
+# CHECK-OBJ:     Flags [ (0x2)
+# CHECK-OBJ:      SHF_ALLOC (0x2)
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    Address: 0x0
+# CHECK-OBJ:    Offset: 0x50
+# CHECK-OBJ:    Size: 24
+# CHECK-OBJ:    Link: 0
+# CHECK-OBJ:    Info: 0
+# CHECK-OBJ:    AddressAlignment: 8
+# CHECK-OBJ:    EntrySize: 0
+# CHECK-OBJ:    Relocations [
+# CHECK-OBJ:    ]
+# CHECK-OBJ:    SectionData (
+# CHECK-OBJ:      0000: 00002001 01020007 00000000 00000000  |.. .............|
+# CHECK-OBJ:      0010: 00000000 00000000                    |........|
+# CHECK-OBJ:    )
+# CHECK-OBJ:  }
 
 # INVALID: '.module nooddspreg' requires the O32 ABI
 
diff --git a/llvm/test/MC/Mips/oddspreg.s b/llvm/test/MC/Mips/oddspreg.s
index 32ba9e0a3f9..a7b0c4b189e 100644
--- a/llvm/test/MC/Mips/oddspreg.s
+++ b/llvm/test/MC/Mips/oddspreg.s
@@ -36,30 +36,31 @@
 # CHECK-ASM: .module oddspreg
 
 # Checking if the Mips.abiflags were correctly emitted.
-# CHECK-OBJ-ALL:       Section {
-# CHECK-OBJ-ALL:         Index: 5
-# CHECK-OBJ-ALL-LABEL:   Name: .MIPS.abiflags ({{[0-9]+}})
-# CHECK-OBJ-ALL:         Type: SHT_MIPS_ABIFLAGS (0x7000002A)
-# CHECK-OBJ-ALL:          Flags [ (0x2)
-# CHECK-OBJ-ALL:           SHF_ALLOC (0x2)
-# CHECK-OBJ-ALL:         ]
-# CHECK-OBJ-ALL:         Address: 0x0
-# CHECK-OBJ-ALL:         Size: 24
-# CHECK-OBJ-ALL:         Link: 0
-# CHECK-OBJ-ALL:         Info: 0
-# CHECK-OBJ-ALL:         AddressAlignment: 8
-# CHECK-OBJ-ALL:         EntrySize: 24
-# CHECK-OBJ-ALL:         Relocations [
-# CHECK-OBJ-ALL:         ]
-# CHECK-OBJ-ALL:         SectionData (
-# CHECK-OBJ-O32:           0000: 00002001 01020006 00000000 00000000  |.. .............|
-# CHECK-OBJ-O32:           0010: 00000001 00000000                    |........|
-# CHECK-OBJ-N32:           0000: 00004001 02020001 00000000 00000000  |..@.............|
-# CHECK-OBJ-N32:           0010: 00000001 00000000                    |........|
-# CHECK-OBJ-N64:           0000: 00004001 02020001 00000000 00000000  |..@.............|
-# CHECK-OBJ-N64:           0010: 00000001 00000000                    |........|
-# CHECK-OBJ-ALL:         )
-# CHECK-OBJ-ALL-LABEL: }
+# CHECK-OBJ-ALL:  Section {
+# CHECK-OBJ-ALL:    Index: 5
+# CHECK-OBJ-ALL:    Name: .MIPS.abiflags ({{[0-9]+}})
+# CHECK-OBJ-ALL:    Type: SHT_MIPS_ABIFLAGS (0x7000002A)
+# CHECK-OBJ-ALL:     Flags [ (0x2)
+# CHECK-OBJ-ALL:      SHF_ALLOC (0x2)
+# CHECK-OBJ-ALL:    ]
+# CHECK-OBJ-ALL:    Address: 0x0
+# CHECK-OBJ-ALL:    Offset: 0x{{[0-9A-F]+}}
+# CHECK-OBJ-ALL:    Size: 24
+# CHECK-OBJ-ALL:    Link: 0
+# CHECK-OBJ-ALL:    Info: 0
+# CHECK-OBJ-ALL:    AddressAlignment: 8
+# CHECK-OBJ-ALL:    EntrySize: 0
+# CHECK-OBJ-ALL:    Relocations [
+# CHECK-OBJ-ALL:    ]
+# CHECK-OBJ-ALL:    SectionData (
+# CHECK-OBJ-O32:      0000: 00002001 01020006 00000000 00000000  |.. .............|
+# CHECK-OBJ-O32:      0010: 00000001 00000000                    |........|
+# CHECK-OBJ-N32:      0000: 00004001 02020001 00000000 00000000  |..@.............|
+# CHECK-OBJ-N32:      0010: 00000001 00000000                    |........|
+# CHECK-OBJ-N64:      0000: 00004001 02020001 00000000 00000000  |..@.............|
+# CHECK-OBJ-N64:      0010: 00000001 00000000                    |........|
+# CHECK-OBJ-ALL:    )
+# CHECK-OBJ-ALL:  }
 
         .module oddspreg
         add.s $f3, $f1, $f5