[llvm] r194423 - [mips] Partially revert r193641. Stack alignment should not be determined by

[Akira Hatanaka]

Author: ahatanak
Date: Mon Nov 11 15:49:03 2013
New Revision: 194423

URL: http://llvm.org/viewvc/llvm-project?rev=194423&view=rev
Log:
[mips] Partially revert r193641. Stack alignment should not be determined by
the floating point register mode.
 

Modified:
    llvm/trunk/lib/Target/Mips/MipsSubtarget.h
    llvm/trunk/test/CodeGen/Mips/stack-alignment.ll

Modified: llvm/trunk/lib/Target/Mips/MipsSubtarget.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsSubtarget.h?rev=194423&r1=194422&r2=194423&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsSubtarget.h (original)
+++ llvm/trunk/lib/Target/Mips/MipsSubtarget.h Mon Nov 11 15:49:03 2013
@@ -217,7 +217,7 @@ public:
 //
 static bool useConstantIslands();
 
-  unsigned stackAlignment() const { return isFP64bit() ? 16 : 8; }
+  unsigned stackAlignment() const { return hasMips64() ? 16 : 8; }
 
   // Grab MipsRegInfo object
   const MipsReginfo &getMReginfo() const { return MRI; }

Modified: llvm/trunk/test/CodeGen/Mips/stack-alignment.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/stack-alignment.ll?rev=194423&r1=194422&r2=194423&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Mips/stack-alignment.ll (original)
+++ llvm/trunk/test/CodeGen/Mips/stack-alignment.ll Mon Nov 11 15:49:03 2013
@@ -1,9 +1,8 @@
 ; RUN: llc -march=mipsel < %s | FileCheck %s -check-prefix=32
-; RUN: llc -march=mipsel -mattr=+fp64 < %s | FileCheck %s -check-prefix=32-FP64
+; RUN: llc -march=mipsel -mattr=+fp64 < %s | FileCheck %s -check-prefix=32
 ; RUN: llc -march=mips64el -mcpu=mips64 < %s | FileCheck %s -check-prefix=64
 
 ; 32:      addiu  $sp, $sp, -8
-; 32-FP64: addiu  $sp, $sp, -16
 ; 64:      addiu  $sp, $sp, -16
 
 define i32 @foo1() #0 {