X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=107db26e1e7b45cc2f2bfe107a3e7a5f002b217e;hb=3cdb0ada5aecbcbe940bacf577c02c41bc65c629;hp=933f4dd5d5aac84c73383ab3ea83a7fada3ca301;hpb=52589e05f86d593bc3e6ea3f1a0b8f6ceae94fe6;p=ghc-hetmet.git

diff --git a/rts/Linker.c b/rts/Linker.c
index 933f4dd..107db26 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -21,11 +21,12 @@
 #include "RtsFlags.h"
 #include "HsFFI.h"
 #include "Hash.h"
+#include "Storage.h"
+#include "Stable.h"
 #include "Linker.h"
 #include "LinkerInternals.h"
 #include "RtsUtils.h"
 #include "Schedule.h"
-#include "Storage.h"
 #include "Sparks.h"
 #include "RtsTypeable.h"
 
@@ -488,6 +489,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)	        	\
@@ -941,11 +943,6 @@ static int linker_init_done = 0 ;
 static void *dl_prog_handle;
 #endif
 
-/* dlopen(NULL,..) doesn't work so we grab libc explicitly */
-#if defined(openbsd_HOST_OS)
-static void *dl_libc_handle;
-#endif
-
 void
 initLinker( void )
 {
@@ -975,9 +972,6 @@ initLinker( void )
     dl_prog_handle = RTLD_DEFAULT;
 #   else
     dl_prog_handle = dlopen(NULL, RTLD_LAZY);
-#   if defined(openbsd_HOST_OS)
-    dl_libc_handle = dlopen("libc.so", RTLD_LAZY);
-#   endif
 #   endif /* RTLD_DEFAULT */
 #   endif
 }
@@ -1128,10 +1122,7 @@ lookupSymbol( char *lbl )
 
     if (val == NULL) {
 #       if defined(OBJFORMAT_ELF)
-#	if defined(openbsd_HOST_OS)
-	val = dlsym(dl_prog_handle, lbl);
-	return (val != NULL) ? val : dlsym(dl_libc_handle,lbl);
-#	elif defined(x86_64_HOST_ARCH)
+#	if defined(x86_64_HOST_ARCH)
 	val = dlsym(dl_prog_handle, lbl);
 	if (val >= (void *)0x80000000) {
 	    void *new_val;
@@ -1141,7 +1132,7 @@ lookupSymbol( char *lbl )
 	} else {
 	    return val;
 	}
-#	else /* not openbsd */
+#	else
 	return dlsym(dl_prog_handle, lbl);
 #	endif
 #       elif defined(OBJFORMAT_MACHO)
@@ -2503,14 +2494,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);