projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split part of the Task struct into a separate struct InCall
[ghc-hetmet.git]
/
rts
/
Linker.c
diff --git
a/rts/Linker.c
b/rts/Linker.c
index
91354a3
..
d84e4f7
100644
(file)
--- a/
rts/Linker.c
+++ b/
rts/Linker.c
@@
-89,6
+89,7
@@
# include <math.h>
#elif defined(darwin_HOST_OS)
# define OBJFORMAT_MACHO
# include <math.h>
#elif defined(darwin_HOST_OS)
# define OBJFORMAT_MACHO
+# include <regex.h>
# include <mach-o/loader.h>
# include <mach-o/nlist.h>
# include <mach-o/reloc.h>
# include <mach-o/loader.h>
# include <mach-o/nlist.h>
# include <mach-o/reloc.h>
@@
-977,8
+978,7
@@
typedef struct _RtsSymbolVal {
SymI_NeedsProto(__muldi3) \
SymI_NeedsProto(__ashldi3) \
SymI_NeedsProto(__ashrdi3) \
SymI_NeedsProto(__muldi3) \
SymI_NeedsProto(__ashldi3) \
SymI_NeedsProto(__ashrdi3) \
- SymI_NeedsProto(__lshrdi3) \
- SymI_NeedsProto(__eprintf)
+ SymI_NeedsProto(__lshrdi3)
#else
#define RTS_LIBGCC_SYMBOLS
#endif
#else
#define RTS_LIBGCC_SYMBOLS
#endif
@@
-1110,7
+1110,9
@@
void
initLinker( void )
{
RtsSymbolVal *sym;
initLinker( void )
{
RtsSymbolVal *sym;
+#if defined(OBJFORMAT_ELF) || defined(OBJFORMAT_MACHO)
int compileResult;
int compileResult;
+#endif
/* Make initLinker idempotent, so we can call it
before evey relevant operation; that means we
/* Make initLinker idempotent, so we can call it
before evey relevant operation; that means we
@@
-1119,7
+1121,7
@@
initLinker( void )
linker_init_done = 1;
}
linker_init_done = 1;
}
-#ifdef THREADED_RTS
+#if defined(THREADED_RTS) && (defined(OBJFORMAT_ELF) || defined(OBJFORMAT_MACHO))
initMutex(&dl_mutex);
#endif
stablehash = allocStrHashTable();
initMutex(&dl_mutex);
#endif
stablehash = allocStrHashTable();