X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=d41ede6e1055cb4b7fa1b8e5b270da998ef47ddd;hb=97a8fe8780307e95829034117efa98d2e27109cd;hp=3b2dd1e6a6bfc631e53175fd71cc8c554716218a;hpb=69db8adf9c151d9e997a95b09b14e2b0c740c6be;p=ghc-hetmet.git diff --git a/rts/Linker.c b/rts/Linker.c index 3b2dd1e..d41ede6 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -26,7 +26,7 @@ #include "RtsUtils.h" #include "Schedule.h" #include "Sparks.h" -#include "RtsTypeable.h" +#include "RtsGlobals.h" #include "Timer.h" #include "Trace.h" @@ -205,7 +205,7 @@ static void machoInitSymbolsWithoutUnderscore( void ); #define MMAP_32BIT_BASE_DEFAULT 0x40000000 #endif -static void *mmap_32bit_base = MMAP_32BIT_BASE_DEFAULT; +static void *mmap_32bit_base = (void *)MMAP_32BIT_BASE_DEFAULT; #endif /* MAP_ANONYMOUS is MAP_ANON on some systems, e.g. OpenBSD */ @@ -224,6 +224,7 @@ typedef struct _RtsSymbolVal { #if !defined(PAR) #define Maybe_Stable_Names SymI_HasProto(mkWeakzh_fast) \ + SymI_HasProto(mkWeakForeignEnvzh_fast) \ SymI_HasProto(makeStableNamezh_fast) \ SymI_HasProto(finalizzeWeakzh_fast) #else @@ -492,7 +493,9 @@ typedef struct _RtsSymbolVal { #if !defined(mingw32_HOST_OS) #define RTS_USER_SIGNALS_SYMBOLS \ - SymI_HasProto(setIOManagerPipe) + SymI_HasProto(setIOManagerPipe) \ + SymI_NeedsProto(blockUserSignals) \ + SymI_NeedsProto(unblockUserSignals) #else #define RTS_USER_SIGNALS_SYMBOLS \ SymI_HasProto(sendIOManagerEvent) \ @@ -606,6 +609,7 @@ typedef struct _RtsSymbolVal { SymI_HasProto(barf) \ SymI_HasProto(debugBelch) \ SymI_HasProto(errorBelch) \ + SymI_HasProto(sysErrorBelch) \ SymI_HasProto(asyncExceptionsBlockedzh_fast) \ SymI_HasProto(blockAsyncExceptionszh_fast) \ SymI_HasProto(catchzh_fast) \ @@ -636,6 +640,7 @@ typedef struct _RtsSymbolVal { SymI_HasProto(freeHaskellFunctionPtr) \ SymI_HasProto(freeStablePtr) \ SymI_HasProto(getOrSetTypeableStore) \ + SymI_HasProto(getOrSetSignalHandlerStore) \ SymI_HasProto(gcdIntegerzh_fast) \ SymI_HasProto(gcdIntegerIntzh_fast) \ SymI_HasProto(gcdIntzh_fast) \ @@ -652,6 +657,7 @@ typedef struct _RtsSymbolVal { SymI_HasProto(hs_free_stable_ptr) \ SymI_HasProto(hs_free_fun_ptr) \ SymI_HasProto(hs_hpc_rootModule) \ + SymI_HasProto(hs_hpc_module) \ SymI_HasProto(initLinker) \ SymI_HasProto(unpackClosurezh_fast) \ SymI_HasProto(getApStackValzh_fast) \ @@ -689,6 +695,7 @@ typedef struct _RtsSymbolVal { SymI_HasProto(noDuplicatezh_fast) \ SymI_HasProto(atomicModifyMutVarzh_fast) \ SymI_HasProto(newPinnedByteArrayzh_fast) \ + SymI_HasProto(newAlignedPinnedByteArrayzh_fast) \ SymI_HasProto(newSpark) \ SymI_HasProto(orIntegerzh_fast) \ SymI_HasProto(performGC) \ @@ -855,6 +862,7 @@ typedef struct _RtsSymbolVal { SymI_NeedsProto(rts_stop_on_exception) \ SymI_HasProto(stopTimer) \ SymI_HasProto(n_capabilities) \ + SymI_HasProto(traceCcszh_fast) \ RTS_USER_SIGNALS_SYMBOLS #ifdef SUPPORT_LONG_LONGS @@ -1047,6 +1055,16 @@ initLinker( void ) mmap_32bit_base = (void*)RtsFlags.MiscFlags.linkerMemBase; } #endif + +#if defined(mingw32_HOST_OS) + /* + * These two libraries cause problems when added to the static link, + * but are necessary for resolving symbols in GHCi, hence we load + * them manually here. + */ + addDLL("msvcrt"); + addDLL("kernel32"); +#endif } /* ----------------------------------------------------------------------------- @@ -1302,6 +1320,7 @@ mmapForLinker (size_t bytes, nat flags, int fd) void *map_addr = NULL; void *result; int pagesize, size; + static nat fixed = 0; pagesize = getpagesize(); size = ROUND_UP(bytes, pagesize); @@ -1315,10 +1334,11 @@ mmap_again: #endif result = mmap(map_addr, size, PROT_EXEC|PROT_READ|PROT_WRITE, - MAP_PRIVATE|TRY_MAP_32BIT|flags, fd, 0); + MAP_PRIVATE|TRY_MAP_32BIT|fixed|flags, fd, 0); if (result == MAP_FAILED) { - sysErrorBelch("mmap"); + sysErrorBelch("mmap %lu bytes at %p",(lnat)size,map_addr); + errorBelch("Try specifying an address with +RTS -xm -RTS"); stg_exit(EXIT_FAILURE); } @@ -1329,8 +1349,16 @@ mmap_again: } else { if ((W_)result > 0x80000000) { // oops, we were given memory over 2Gb - // ... try allocating memory somewhere else?; - barf("loadObj: failed to mmap() memory below 2Gb; asked for %lu bytes at %p, got %p. Try specifying an address with +RTS -xm -RTS", size, map_addr, result); +#if defined(freebsd_HOST_OS) + // Some platforms require MAP_FIXED. This is normally + // a bad idea, because MAP_FIXED will overwrite + // existing mappings. + munmap(result,size); + fixed = MAP_FIXED; + goto mmap_again; +#else + barf("loadObj: failed to mmap() memory below 2Gb; asked for %lu bytes at %p. Try specifying an address with +RTS -xm -RTS", size, map_addr, result); +#endif } else { // hmm, we were given memory somewhere else, but it's // still under 2Gb so we can use it. Next time, ask @@ -1464,7 +1492,6 @@ loadObj( char *path ) close(fd); #else /* !USE_MMAP */ - /* load the image into memory */ f = fopen(path, "rb"); if (!f) @@ -1492,10 +1519,12 @@ loadObj( char *path ) oc->image = stgMallocBytes(oc->fileSize, "loadObj(image)"); # endif - n = fread ( oc->image, 1, oc->fileSize, f ); - if (n != oc->fileSize) - barf("loadObj: error whilst reading `%s'", path); - + { + int n; + n = fread ( oc->image, 1, oc->fileSize, f ); + if (n != oc->fileSize) + barf("loadObj: error whilst reading `%s'", path); + } fclose(f); #endif /* USE_MMAP */ @@ -1732,7 +1761,7 @@ static int ocAllocateSymbolExtras( ObjectCode* oc, int count, int first ) if( m > n ) // we need to allocate more pages { oc->symbol_extras = mmapForLinker(sizeof(SymbolExtra) * count, - MAP_ANONYMOUS, 0); + MAP_ANONYMOUS, -1); } else { @@ -2639,8 +2668,7 @@ ocResolve_PEi386 ( ObjectCode* oc ) copyName ( sym->Name, strtab, symbol, 1000-1 ); 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); + errorBelch("%s: unknown symbol `%s'", oc->fileName, symbol); return 0; foundit:; } @@ -4081,7 +4109,9 @@ static int relocateSection( char *thingPtr = image + sect->offset + reloc->r_address; uint64_t thing; - uint64_t value; + /* We shouldn't need to initialise this, but gcc on OS X 64 bit + complains that it may be used uninitialized if we don't */ + uint64_t value = 0; uint64_t baseValue; int type = reloc->r_type; @@ -4673,7 +4703,7 @@ static void machoInitSymbolsWithoutUnderscore() void **p = symbolsWithoutUnderscore; __asm__ volatile(".globl _symbolsWithoutUnderscore\n.data\n_symbolsWithoutUnderscore:"); -#undef Sym +#undef SymI_NeedsProto #define SymI_NeedsProto(x) \ __asm__ volatile(".long " # x); @@ -4681,13 +4711,13 @@ static void machoInitSymbolsWithoutUnderscore() __asm__ volatile(".text"); -#undef Sym +#undef SymI_NeedsProto #define SymI_NeedsProto(x) \ ghciInsertStrHashTable("(GHCi built-in symbols)", symhash, #x, *p++); RTS_MACHO_NOUNDERLINE_SYMBOLS -#undef Sym +#undef SymI_NeedsProto } #endif