X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=a9c145b6e8e4150d7376affcf48553efb6a991cc;hb=3eca4027d5b3caaf6694d82e6dd0a094c1c57be5;hp=1a99f12d007ce22bebfaf4bfcc18fa6d3b7d05fc;hpb=4f4dd70fd10ab13e41cb0f541bbfee2330d149da;p=ghc-hetmet.git

diff --git a/rts/Linker.c b/rts/Linker.c
index 1a99f12..a9c145b 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -27,6 +27,7 @@
 #include "Schedule.h"
 #include "Sparks.h"
 #include "RtsTypeable.h"
+#include "Timer.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -703,6 +704,7 @@ typedef struct _RtsSymbolVal {
       SymX(stackOverflow)			\
       SymX(stg_CAF_BLACKHOLE_info)		\
       SymX(awakenBlockedQueue)			\
+      SymX(startTimer)                          \
       SymX(stg_CHARLIKE_closure)		\
       SymX(stg_MVAR_CLEAN_info)			\
       SymX(stg_MVAR_DIRTY_info)			\
@@ -2507,13 +2509,9 @@ ocResolve_PEi386 ( ObjectCode* oc )
                    + sym->Value);
          } else {
             copyName ( sym->Name, strtab, symbol, 1000-1 );
-            S = (UInt32) lookupLocalSymbol( oc, symbol );
-            if ((void*)S != NULL) goto foundit;
             S = (UInt32) lookupSymbol( symbol );
             if ((void*)S != NULL) goto foundit;
             zapTrailingAtSign ( symbol );
-            S = (UInt32) lookupLocalSymbol( oc, symbol );
-            if ((void*)S != NULL) goto foundit;
             S = (UInt32) lookupSymbol( symbol );
             if ((void*)S != NULL) goto foundit;
 	    /* Newline first because the interactive linker has printed "linking..." */