Index: lib/Target/Mips/AsmParser/MipsAsmParser.cpp
===================================================================
--- lib/Target/Mips/AsmParser/MipsAsmParser.cpp
+++ lib/Target/Mips/AsmParser/MipsAsmParser.cpp
@@ -237,7 +237,7 @@
             ((STI.getFeatureBits() & Mips::FeatureN32) != 0) +
             ((STI.getFeatureBits() & Mips::FeatureN64) != 0)) == 1);
 
-    if (!isABI_O32() && !allowOddSPReg() != 0)
+    if (!isABI_O32() && !useOddSPReg() != 0)
       report_fatal_error("-mno-odd-spreg requires the O32 ABI");
   }
 
@@ -254,7 +254,7 @@
   bool isABI_O32() const { return STI.getFeatureBits() & Mips::FeatureO32; }
   bool isABI_FPXX() const { return false; } // TODO: add check for FeatureXX
 
-  bool allowOddSPReg() const {
+  bool useOddSPReg() const {
     return !(STI.getFeatureBits() & Mips::FeatureNoOddSPReg);
   }
 
@@ -572,7 +572,7 @@
     assert(N == 1 && "Invalid number of operands!");
     Inst.addOperand(MCOperand::CreateReg(getFGR32Reg()));
     // FIXME: We ought to do this for -integrated-as without -via-file-asm too.
-    if (!AsmParser.allowOddSPReg() && RegIdx.Index & 1)
+    if (!AsmParser.useOddSPReg() && RegIdx.Index & 1)
       AsmParser.Error(StartLoc, "-mno-odd-spreg prohibits the use of odd FPU "
                                 "registers");
   }
Index: lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h
===================================================================
--- lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h
+++ lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h
@@ -228,6 +228,7 @@
     setCPR1SizeFromPredicates(P);
     setASESetFromPredicates(P);
     setFpAbiFromPredicates(P);
+    OddSPReg = P.useOddSPReg();
   }
 };
 
Index: test/MC/Mips/mips32/abiflags.s
===================================================================
--- test/MC/Mips/mips32/abiflags.s
+++ test/MC/Mips/mips32/abiflags.s
@@ -26,7 +26,7 @@
 # CHECK-OBJ:    ]
 # CHECK-OBJ:    SectionData (
 # CHECK-OBJ:      0000: 00002001 01010001 00000000 00000000  |.. .............|
-# CHECK-OBJ:      0010: 00000000 00000000                    |........|
+# CHECK-OBJ:      0010: 00000001 00000000                    |........|
 # CHECK-OBJ:    )
 # CHECK-OBJ:  }
 
Index: test/MC/Mips/mips32r2/abiflags.s
===================================================================
--- test/MC/Mips/mips32r2/abiflags.s
+++ test/MC/Mips/mips32r2/abiflags.s
@@ -27,7 +27,7 @@
 # CHECK-OBJ:    ]
 # CHECK-OBJ:    SectionData (
 # CHECK-OBJ:      0000: 00002002 01010001 00000000 00000000  |.. .............|
-# CHECK-OBJ:      0010: 00000000 00000000                    |........|
+# CHECK-OBJ:      0010: 00000001 00000000                    |........|
 # CHECK-OBJ:    )
 # CHECK-OBJ:  }
 
Index: test/MC/Mips/mips64/abiflags.s
===================================================================
--- test/MC/Mips/mips64/abiflags.s
+++ test/MC/Mips/mips64/abiflags.s
@@ -26,7 +26,7 @@
 # CHECK-OBJ:    ]
 # CHECK-OBJ:    SectionData (
 # CHECK-OBJ:      0000: 00004001 02020001 00000000 00000000  |..@.............|
-# CHECK-OBJ:      0010: 00000000 00000000                    |........|
+# CHECK-OBJ:      0010: 00000001 00000000                    |........|
 # CHECK-OBJ:    )
 # CHECK-OBJ:  }
 
Index: test/MC/Mips/mips64r2/abiflags.s
===================================================================
--- test/MC/Mips/mips64r2/abiflags.s
+++ test/MC/Mips/mips64r2/abiflags.s
@@ -26,7 +26,7 @@
 # CHECK-OBJ:    ]
 # CHECK-OBJ:    SectionData (
 # CHECK-OBJ:      0000: 00004002 02020001 00000000 00000000  |..@.............|
-# CHECK-OBJ:      0010: 00000000 00000000                    |........|
+# CHECK-OBJ:      0010: 00000001 00000000                    |........|
 # CHECK-OBJ:    )
 # CHECK-OBJ:  }
 
Index: test/MC/Mips/mips_abi_flags_xx.s
===================================================================
--- test/MC/Mips/mips_abi_flags_xx.s
+++ test/MC/Mips/mips_abi_flags_xx.s
@@ -26,7 +26,7 @@
 # CHECK-OBJ:    ]
 # CHECK-OBJ:    SectionData (
 # CHECK-OBJ:      0000: 00002001 01010005 00000000 00000000  |.. .............|
-# CHECK-OBJ:      0010: 00000000 00000000                    |........|
+# CHECK-OBJ:      0010: 00000001 00000000                    |........|
 # CHECK-OBJ:    )
 # CHECK-OBJ:  }
 
Index: test/MC/Mips/mips_abi_flags_xx_set.s
===================================================================
--- test/MC/Mips/mips_abi_flags_xx_set.s
+++ test/MC/Mips/mips_abi_flags_xx_set.s
@@ -27,7 +27,7 @@
 # CHECK-OBJ:    ]
 # CHECK-OBJ:    SectionData (
 # CHECK-OBJ:      0000: 00002001 01010005 00000000 00000000  |.. .............|
-# CHECK-OBJ:      0010: 00000000 00000000                    |........|
+# CHECK-OBJ:      0010: 00000001 00000000                    |........|
 # CHECK-OBJ:    )
 # CHECK-OBJ:  }
 
Index: test/MC/Mips/msa/abiflags.s
===================================================================
--- test/MC/Mips/msa/abiflags.s
+++ test/MC/Mips/msa/abiflags.s
@@ -27,7 +27,7 @@
 # CHECK-OBJ:    ]
 # CHECK-OBJ:    SectionData (
 # CHECK-OBJ:      0000: 00002002 01030001 00000000 00000200  |.. .............|
-# CHECK-OBJ:      0010: 00000000 00000000                    |........|
+# CHECK-OBJ:      0010: 00000001 00000000                    |........|
 # CHECK-OBJ:    )
 # CHECK-OBJ:  }
 
Index: test/MC/Mips/oddspreg.s
===================================================================
--- test/MC/Mips/oddspreg.s
+++ test/MC/Mips/oddspreg.s
@@ -15,7 +15,21 @@
 # RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 | \
 # RUN:   FileCheck %s -check-prefix=CHECK-ASM
 #
-# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -filetype=obj -o - | \
+# Repeat the -filetype=obj tests but this time use an empty assembly file. The
+# output should be unchanged.
+# RUN: llvm-mc /dev/null -arch=mips64 -mcpu=mips64 -filetype=obj -o - | \
+# RUN:   llvm-readobj -sections -section-data -section-relocations - | \
+# RUN:     FileCheck %s -check-prefix=CHECK-OBJ-ALL -check-prefix=CHECK-OBJ-N64
+
+# RUN: llvm-mc /dev/null -arch=mips -mcpu=mips32 -mattr=+fp64 -filetype=obj -o - | \
+# RUN:   llvm-readobj -sections -section-data -section-relocations - | \
+# RUN:     FileCheck %s -check-prefix=CHECK-OBJ-ALL -check-prefix=CHECK-OBJ-O32
+#
+# RUN: llvm-mc /dev/null -arch=mips64 -mcpu=mips64 -mattr=-n64,+n32 -filetype=obj -o - | \
+# RUN:   llvm-readobj -sections -section-data -section-relocations - | \
+# RUN:     FileCheck %s -check-prefix=CHECK-OBJ-ALL -check-prefix=CHECK-OBJ-N32
+
+# RUN: llvm-mc /dev/null -arch=mips64 -mcpu=mips64 -filetype=obj -o - | \
 # RUN:   llvm-readobj -sections -section-data -section-relocations - | \
 # RUN:     FileCheck %s -check-prefix=CHECK-OBJ-ALL -check-prefix=CHECK-OBJ-N64