Merge branch 'master' of http://darcs.haskell.org/ghc

ae9ef751 · Ian Lynagh · 95866481 · bd9c8356 · ae9ef751
Commit ae9ef751 authored Apr 06, 2011 by Ian Lynagh
--- a/compiler/nativeGen/X86/CodeGen.hs
+++ b/compiler/nativeGen/X86/CodeGen.hs
@@ -431,7 +431,7 @@ getRegister (CmmReg reg)
         size | not use_sse2 && isFloatSize sz = FF80
              | otherwise                      = sz
       --
-       return (Fixed sz (getRegisterReg use_sse2 reg) nilOL)
+       return (Fixed size (getRegisterReg use_sse2 reg) nilOL)
  

 getRegister tree@(CmmRegOff _ _)