X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2FnativeGen%2FMachCodeGen.hs;h=081d3ef6c780b6d807e7936c8119ed82152ae338;hb=fee569a69a4ce8c8d05b8a1fb8069d804dbd2b9c;hp=65300a76cd17708df4f8310821e524e0b278aa6c;hpb=fd8d04119e849f9c713d3e697228846d93c5ca69;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/MachCodeGen.hs b/compiler/nativeGen/MachCodeGen.hs
index 65300a7..081d3ef 100644
--- a/compiler/nativeGen/MachCodeGen.hs
+++ b/compiler/nativeGen/MachCodeGen.hs
@@ -3896,7 +3896,8 @@ genSwitch expr ids
             op = OpAddr (AddrBaseIndex (EABaseReg tableReg)
                                        (EAIndex reg wORD_SIZE) (ImmInt 0))
 
-#if x86_64_TARGET_ARCH && darwin_TARGET_OS
+#if x86_64_TARGET_ARCH
+#if darwin_TARGET_OS
     -- on Mac OS X/x86_64, put the jump table in the text section
     -- to work around a limitation of the linker.
     -- ld64 is unable to handle the relocations for
@@ -3909,6 +3910,23 @@ genSwitch expr ids
                             LDATA Text (CmmDataLabel lbl : jumpTable)
                     ]
 #else
+    -- HACK: On x86_64 binutils<2.17 is only able to generate PC32
+    -- relocations, hence we only get 32-bit offsets in the jump
+    -- table. As these offsets are always negative we need to properly
+    -- sign extend them to 64-bit. This hack should be removed in
+    -- conjunction with the hack in PprMach.hs/pprDataItem once
+    -- binutils 2.17 is standard.
+            code = e_code `appOL` t_code `appOL` toOL [
+			    LDATA ReadOnlyData (CmmDataLabel lbl : jumpTable),
+			    MOVSxL I32
+				   (OpAddr (AddrBaseIndex (EABaseReg tableReg)
+							  (EAIndex reg wORD_SIZE) (ImmInt 0)))
+				   (OpReg reg),
+			    ADD wordRep (OpReg reg) (OpReg tableReg),
+			    JMP_TBL (OpReg tableReg) [ id | Just id <- ids ]
+		   ]
+#endif
+#else
             code = e_code `appOL` t_code `appOL` toOL [
                             LDATA ReadOnlyData (CmmDataLabel lbl : jumpTable),
                             ADD wordRep op (OpReg tableReg),