From: simonpj <unknown>
Date: Mon, 14 Mar 2005 16:25:21 +0000 (+0000)
Subject: [project @ 2005-03-14 16:25:21 by simonpj]
X-Git-Tag: Initial_conversion_from_CVS_complete~914
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=824d7fa06fc3967a237866b699faab07fff3a6f6;p=ghc-hetmet.git

[project @ 2005-03-14 16:25:21 by simonpj]
Fix obscure_ccall
---

diff --git a/ghc/rts/Adjustor.c b/ghc/rts/Adjustor.c
index 13c66ca..3341c58 100644
--- a/ghc/rts/Adjustor.c
+++ b/ghc/rts/Adjustor.c
@@ -99,6 +99,11 @@ mallocBytesRWX(int len)
   return addr;
 }
 
+#ifdef LEADING_UNDERSCORE
+#define UNDERSCORE "_"
+#else 
+#define UNDERSCORE ""
+#endif
 #if defined(i386_HOST_ARCH)
 /* 
   Now here's something obscure for you:
@@ -118,8 +123,8 @@ mallocBytesRWX(int len)
   to return to it before tail jumping from the adjustor thunk.
 */
 __asm__ (
-   ".globl obscure_ccall_ret_code\n"
-   "obscure_ccall_ret_code:\n\t"
+   ".globl " UNDERSCORE "obscure_ccall_ret_code\n"
+   UNDERSCORE "obscure_ccall_ret_code:\n\t"
    "addl $0x4, %esp\n\t"
    "ret"
   );
@@ -128,8 +133,8 @@ extern void obscure_ccall_ret_code(void);
 
 #if defined(x86_64_TARGET_ARCH)
 __asm__ (
-   ".globl obscure_ccall_ret_code\n"
-   "obscure_ccall_ret_code:\n\t"
+   ".globl " UNDERSCORE "obscure_ccall_ret_code\n"
+   UNDERSCORE "obscure_ccall_ret_code:\n\t"
    "addq $0x8, %rsp\n\t"
    "ret"
   );