X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FnativeGen%2FX86%2FRegs.hs;h=64d835b2ebe1bff7d5b3a75b94fcb224d1088f5f;hp=9f62c25f0a8e6de3d98f660645fd3714b948b6e9;hb=a2a67cd520b9841114d69a87a423dabcb3b4368e;hpb=2d498de3fd7a8f60621c601e419fe7cb14788b1c

diff --git a/compiler/nativeGen/X86/Regs.hs b/compiler/nativeGen/X86/Regs.hs
index 9f62c25..64d835b 100644
--- a/compiler/nativeGen/X86/Regs.hs
+++ b/compiler/nativeGen/X86/Regs.hs
@@ -54,7 +54,7 @@ where
 -- HACK: go for the max
 #endif
 
-#include "../includes/MachRegs.h"
+#include "../includes/stg/MachRegs.h"
 
 import Reg
 import RegClass
@@ -65,7 +65,6 @@ import Cmm
 import CLabel           ( CLabel )
 import Pretty
 import Outputable	( panic )
-import qualified Outputable
 import FastTypes
 import FastBool
 
@@ -108,10 +107,10 @@ virtualRegSqueeze cls vr
 		VirtualRegD{}		-> _ILIT(1)
 		VirtualRegF{}		-> _ILIT(0)
 
+{-# INLINE realRegSqueeze #-}
 realRegSqueeze :: RegClass -> RealReg -> FastInt
 
 #if defined(i386_TARGET_ARCH)
-{-# INLINE realRegSqueeze #-}
 realRegSqueeze cls rr
  = case cls of
  	RcInteger