X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FRegs.hs;h=5239520708a81d7bd5e30d732fa5b8dacb998d52;hb=4fb7d5bac50c9fe5572dcb1ba4146e3c68cebadb;hp=97ecee6f510a0ba7cda54359e03021bef42352f7;hpb=a12e845684c10955bc594cdb20d1f13fae14873d;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/Regs.hs b/compiler/nativeGen/Regs.hs
index 97ecee6..5239520 100644
--- a/compiler/nativeGen/Regs.hs
+++ b/compiler/nativeGen/Regs.hs
@@ -58,28 +58,23 @@ module Regs (
 	allFPArgRegs,
 	fits16Bits,
 	makeImmediate,
-	freg,
+	fReg,
 	sp, r3, r4, r27, r28, f1, f20, f21,
 
-#elif i386_TARGET_ARCH
+#elif i386_TARGET_ARCH || x86_64_TARGET_ARCH
 	EABase(..), EAIndex(..), addrModeRegs,
 	
 	eax, ebx, ecx, edx, esi, edi, ebp, esp,
 	fake0, fake1, fake2, fake3, fake4, fake5,
-
-#elif i386_64_TARGET_ARCH
-	EABase(..), EAIndex(..), addrModeRegs, 
-
-	ripRel,
-	allFPArgRegs,
-	
 	rax, rbx, rcx, rdx, rsi, rdi, rbp, rsp,
-	eax, ebx, ecx, edx, esi, edi, ebp, esp,
 	r8, r9, r10, r11, r12, r13, r14, r15,
   	xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7,
   	xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15,
 	xmm,
 
+	ripRel,
+	allFPArgRegs,
+
 #elif sparc_TARGET_ARCH
 	fpRel,
 	fits13Bits,