X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FnativeGen%2FMachMisc.lhs;h=a641a8a32791ddf497527a492b334df59aa4414e;hb=553e90d9a32ee1b1809430f260c401cc4169c6c7;hp=e58821036a47b346d448f98487a0e8f0113a845d;hpb=06e14415fa8aef5be7d01314d08fcd87873cd0da;p=ghc-hetmet.git

diff --git a/ghc/compiler/nativeGen/MachMisc.lhs b/ghc/compiler/nativeGen/MachMisc.lhs
index e588210..a641a8a 100644
--- a/ghc/compiler/nativeGen/MachMisc.lhs
+++ b/ghc/compiler/nativeGen/MachMisc.lhs
@@ -65,7 +65,7 @@ import FastString
 import GLAEXTS
 import TRACE		( trace )
 
-import Maybe		( catMaybes )
+import Maybes		( mapCatMaybes )
 \end{code}
 
 \begin{code}
@@ -94,7 +94,8 @@ where do we start putting the rest of them?
 \begin{code}
 eXTRA_STK_ARGS_HERE :: Int
 eXTRA_STK_ARGS_HERE
-  = IF_ARCH_alpha(0, IF_ARCH_i386(23{-6x4bytes-}, IF_ARCH_sparc(23, IF_ARCH_powerpc(24,???))))
+  = IF_ARCH_alpha(0, IF_ARCH_i386(23{-6x4bytes-}, IF_ARCH_sparc(23,
+    IF_ARCH_powerpc( IF_OS_darwin(24,8{-SVR4 ABI: Linux-}), ???))))
 \end{code}
 
 % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -116,7 +117,7 @@ save_cands    = [BaseReg,Sp,SpLim,Hp,HpLim]
 restore_cands = save_cands
 
 volatileSavesOrRestores do_saves vols
-   = catMaybes (map mkCode vols)
+   = mapCatMaybes mkCode vols
      where
         mkCode mid
            | case mid of { BaseReg -> True; _ -> False }