X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FX86%2FCodeGen.hs;h=86ecbf99a52a6c3d5a9c8279b3186619f190c6b4;hb=7a29845e5ed105fcbd6ccadb8061bae2c124f817;hp=e606e2cf76e0149c4cc4e8c9f43a9e6e7a740e1c;hpb=41147ad2a9ca84ebe66386b3b0043cb7b48ddcd8;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/X86/CodeGen.hs b/compiler/nativeGen/X86/CodeGen.hs
index e606e2c..86ecbf9 100644
--- a/compiler/nativeGen/X86/CodeGen.hs
+++ b/compiler/nativeGen/X86/CodeGen.hs
@@ -1587,12 +1587,24 @@ genCCall target dest_regs args = do
             | otherwise
 #endif
             = concatOL push_codes
+	
+	  -- Deallocate parameters after call for ccall;
+	  -- but not for stdcall (callee does it)
+	  --
+	  -- We have to pop any stack padding we added
+	  -- on Darwin even if we are doing stdcall, though (#5052)
+	pop_size | cconv /= StdCallConv = tot_arg_size
+	         | otherwise
+#if darwin_TARGET_OS
+                 = arg_pad_size
+#else
+                 = 0
+#endif
+	
 	call = callinsns `appOL`
                toOL (
-			-- Deallocate parameters after call for ccall;
-			-- but not for stdcall (callee does it)
-                  (if cconv == StdCallConv || tot_arg_size==0 then [] else 
-		   [ADD II32 (OpImm (ImmInt tot_arg_size)) (OpReg esp)])
+                  (if pop_size==0 then [] else 
+		   [ADD II32 (OpImm (ImmInt pop_size)) (OpReg esp)])
                   ++
                   [DELTA (delta + tot_arg_size)]
                )