From: wolfgang <unknown>
Date: Mon, 10 Jan 2005 23:00:53 +0000 (+0000)
Subject: [project @ 2005-01-10 23:00:53 by wolfgang]
X-Git-Tag: Initial_conversion_from_CVS_complete~1272
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=55c604790106d8c8b4a470feefe55e19bbfe7477

[project @ 2005-01-10 23:00:53 by wolfgang]
Fix for AIX-like ABIs.
---

diff --git a/ghc/rts/AdjustorAsm.S b/ghc/rts/AdjustorAsm.S
index 7a4dcbf..fc56beb 100644
--- a/ghc/rts/AdjustorAsm.S
+++ b/ghc/rts/AdjustorAsm.S
@@ -124,8 +124,17 @@ adjustorCode:
 
     LOAD    r3, HPTR_OFF(r2)
 
-    LOAD    r0, WPTR_OFF(r2)
+    LOAD    r12, WPTR_OFF(r2)
+#if defined(darwin_TARGET_OS)
+    mtctr   r12
+#else
+    LOAD    r0, 0(r12)
+        /* The function we're calling will never be a nested function,
+           so we don't load r11. 
+        */
     mtctr   r0
+    LOAD    r2, WS(r12)
+#endif
     bctrl
 
     LOAD    r1, 0(r1)