X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FLinker.c;h=28adf49140a15f27db32339b1ef247c4fd9453dd;hb=b4075d9d55eb335152a268fedf776e67e70bf275;hp=e5ad28139f6b2c13148f95d1cd73d446a5422d2c;hpb=1da969c52be2e56893625957162cf56dd1168ec9;p=ghc-hetmet.git

diff --git a/ghc/rts/Linker.c b/ghc/rts/Linker.c
index e5ad281..28adf49 100644
--- a/ghc/rts/Linker.c
+++ b/ghc/rts/Linker.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Linker.c,v 1.121 2003/06/09 13:17:40 matthewc Exp $
+ * $Id: Linker.c,v 1.125 2003/07/20 21:28:04 panne Exp $
  *
  * (c) The GHC Team, 2000-2003
  *
@@ -411,6 +411,7 @@ typedef struct _RtsSymbolVal {
       SymX(quotIntegerzh_fast)			\
       SymX(quotRemIntegerzh_fast)		\
       SymX(raisezh_fast)			\
+      SymX(raiseIOzh_fast)			\
       SymX(remIntegerzh_fast)			\
       SymX(resetNonBlockingFd)			\
       SymX(resumeThread)			\
@@ -460,6 +461,8 @@ typedef struct _RtsSymbolVal {
       SymX(stable_ptr_table)			\
       SymX(stackOverflow)			\
       SymX(stg_CAF_BLACKHOLE_info)		\
+      SymX(stg_BLACKHOLE_BQ_info)		\
+      SymX(awakenBlockedQueue)			\
       SymX(stg_CHARLIKE_closure)		\
       SymX(stg_EMPTY_MVAR_info)			\
       SymX(stg_IND_STATIC_info)			\
@@ -575,7 +578,7 @@ typedef struct _RtsSymbolVal {
 #endif
 
 /* entirely bogus claims about types of these symbols */
-#define Sym(vvv)  extern void vvv();
+#define Sym(vvv)  extern void vvv(void);
 #define SymX(vvv) /**/
 #define SymX_redirect(vvv,xxx) /**/
 RTS_SYMBOLS
@@ -2041,11 +2044,19 @@ ocResolve_PEi386 ( ObjectCode* oc )
 #define Elf_Sym     Elf32_Sym
 #define Elf_Rel     Elf32_Rel
 #define Elf_Rela    Elf32_Rela
+#ifndef ELF_ST_TYPE
 #define ELF_ST_TYPE ELF32_ST_TYPE
+#endif
+#ifndef ELF_ST_BIND
 #define ELF_ST_BIND ELF32_ST_BIND
+#endif
+#ifndef ELF_R_TYPE
 #define ELF_R_TYPE  ELF32_R_TYPE
+#endif
+#ifndef ELF_R_SYM
 #define ELF_R_SYM   ELF32_R_SYM
 #endif
+#endif
 
 
 /*