Peter Trommler
64c8f8b01c
Fix ghc-zeromq4-haskell on powerpc64 and powerpc64le. Make parallel builds a bit more reliable on PowerPC. OBS-URL: https://build.opensuse.org/request/show/430597 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=226
23 lines
967 B
Diff
23 lines
967 B
Diff
From ff48b3e3fd90e0328921f5e86460aba3ff217002 Mon Sep 17 00:00:00 2001
|
|
From: Peter Trommler <ptrommler@acm.org>
|
|
Date: Mon, 25 Jan 2016 20:32:44 +0100
|
|
Subject: [PATCH] PPC/CodeGen: fix lwa instruction generation
|
|
|
|
---
|
|
compiler/nativeGen/PPC/CodeGen.hs | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
Index: ghc-7.10.3/compiler/nativeGen/PPC/CodeGen.hs
|
|
===================================================================
|
|
--- ghc-7.10.3.orig/compiler/nativeGen/PPC/CodeGen.hs
|
|
+++ ghc-7.10.3/compiler/nativeGen/PPC/CodeGen.hs
|
|
@@ -464,7 +464,7 @@ getRegister' _ (CmmMachOp (MO_UU_Conv W3
|
|
return (Any II64 (\dst -> addr_code `snocOL` LD II32 dst addr))
|
|
|
|
getRegister' _ (CmmMachOp (MO_SS_Conv W32 W64) [CmmLoad mem _]) = do
|
|
- Amode addr addr_code <- getAmode D mem
|
|
+ Amode addr addr_code <- getAmode DS mem -- lwa is DS-form
|
|
return (Any II64 (\dst -> addr_code `snocOL` LA II32 dst addr))
|
|
|
|
getRegister' dflags (CmmMachOp mop [x]) -- unary MachOps
|