X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=54251ac0db6cb021ceaf619d65e3a59aba47ef78;hb=fec956d14d1cbad5a28a1cad7c7d5c0859136f69;hp=93fca03743423bc43b0d6728abc2e96a6962a639;hpb=069495a32aacd7a1f0d543eea81a49c2776c6ede;p=ghc-hetmet.git

diff --git a/rts/Linker.c b/rts/Linker.c
index 93fca03..54251ac 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -25,7 +25,6 @@
 #include "LinkerInternals.h"
 #include "RtsUtils.h"
 #include "Schedule.h"
-#include "Storage.h"
 #include "Sparks.h"
 #include "RtsTypeable.h"
 
@@ -488,6 +487,7 @@ typedef struct _RtsSymbolVal {
       SymX(catchzh_fast)			\
       SymX(catchRetryzh_fast)			\
       SymX(catchSTMzh_fast)			\
+      SymX(checkzh_fast)                        \
       SymX(closure_flags)                       \
       SymX(cmp_thread)				\
       SymX(cmpIntegerzh_fast)	        	\
@@ -797,6 +797,7 @@ static RtsSymbolVal rtsSyms[] = {
       RTS_POSIX_ONLY_SYMBOLS
       RTS_MINGW_ONLY_SYMBOLS
       RTS_CYGWIN_ONLY_SYMBOLS
+      RTS_DARWIN_ONLY_SYMBOLS
       RTS_LIBGCC_SYMBOLS
 #if defined(darwin_HOST_OS) && defined(i386_HOST_ARCH)
       // dyld stub code contains references to this,
@@ -2492,14 +2493,14 @@ ocResolve_PEi386 ( ObjectCode* oc )
                    + sym->Value);
          } else {
             copyName ( sym->Name, strtab, symbol, 1000-1 );
-            (void*)S = lookupLocalSymbol( oc, symbol );
+            S = (UInt32) lookupLocalSymbol( oc, symbol );
             if ((void*)S != NULL) goto foundit;
-            (void*)S = lookupSymbol( symbol );
+            S = (UInt32) lookupSymbol( symbol );
             if ((void*)S != NULL) goto foundit;
             zapTrailingAtSign ( symbol );
-            (void*)S = lookupLocalSymbol( oc, symbol );
+            S = (UInt32) lookupLocalSymbol( oc, symbol );
             if ((void*)S != NULL) goto foundit;
-            (void*)S = lookupSymbol( symbol );
+            S = (UInt32) lookupSymbol( symbol );
             if ((void*)S != NULL) goto foundit;
 	    /* Newline first because the interactive linker has printed "linking..." */
             errorBelch("\n%s: unknown symbol `%s'", oc->fileName, symbol);