Index: lib/Target/Mips/MipsSubtarget.h
===================================================================
--- lib/Target/Mips/MipsSubtarget.h
+++ lib/Target/Mips/MipsSubtarget.h
@@ -295,7 +295,9 @@
   // really use them if in addition we are in mips16 mode
   static bool useConstantIslands();
 
-  unsigned stackAlignment() const { return hasMips64() ? 16 : 8; }
+  unsigned stackAlignment() const {
+    return isABI_N32() || isABI_N64() ? 16 : 8;
+  }
 
   // Grab relocation model
   Reloc::Model getRelocationModel() const;