X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=3cd7fef6034b7f82ba22075d63d686b9901c759c;hb=fbd486fcff518cc1bd2561a2afcdcd9dbf994d5c;hp=141d20b56e91c4c287964bf103e7b1a150c95dbc;hpb=47808bdc0bae8e5ba2910c85ea6c0699af01e97c;p=ghc-hetmet.git diff --git a/rts/Linker.c b/rts/Linker.c index 141d20b..3cd7fef 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -269,6 +269,7 @@ typedef struct _RtsSymbolVal { SymI_HasProto(unlockFile) \ SymI_HasProto(signal_handlers) \ SymI_HasProto(stg_sig_install) \ + SymI_HasProto(rtsTimerSignal) \ SymI_NeedsProto(nocldstop) #endif @@ -888,8 +889,7 @@ typedef struct _RtsSymbolVal { SymI_HasProto(rts_unlock) \ SymI_HasProto(rts_unsafeGetMyCapability) \ SymI_HasProto(rtsSupportsBoundThreads) \ - SymI_HasProto(rtsTimerSignal) \ - SymI_HasProto(rts_isProfiled) \ + SymI_HasProto(rts_isProfiled) \ SymI_HasProto(setProgArgv) \ SymI_HasProto(startupHaskell) \ SymI_HasProto(shutdownHaskell) \ @@ -4675,15 +4675,15 @@ static int relocateSection( IF_DEBUG(linker, debugBelch(" : type = %d\n", symbol->n_type)); IF_DEBUG(linker, debugBelch(" : sect = %d\n", symbol->n_sect)); IF_DEBUG(linker, debugBelch(" : desc = %d\n", symbol->n_desc)); - IF_DEBUG(linker, debugBelch(" : value = %d\n", symbol->n_value)); + IF_DEBUG(linker, debugBelch(" : value = %p\n", (void *)symbol->n_value)); if ((symbol->n_type & N_TYPE) == N_SECT) { value = relocateAddress(oc, nSections, sections, symbol->n_value); - IF_DEBUG(linker, debugBelch("relocateSection, defined external symbol %s, relocated address %p\n", nm, value)); + IF_DEBUG(linker, debugBelch("relocateSection, defined external symbol %s, relocated address %p\n", nm, (void *)value)); } else { value = (uint64_t) lookupSymbol(nm); - IF_DEBUG(linker, debugBelch("relocateSection: external symbol %s, address %p\n", nm, value)); + IF_DEBUG(linker, debugBelch("relocateSection: external symbol %s, address %p\n", nm, (void *)value)); } } else @@ -4693,7 +4693,7 @@ static int relocateSection( + (uint64_t) image; } - IF_DEBUG(linker, debugBelch("relocateSection: value = %p\n", value)); + IF_DEBUG(linker, debugBelch("relocateSection: value = %p\n", (void *)value)); if (type == X86_64_RELOC_BRANCH) {