X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=c212c0fef2fe1d7e737eeaede28f4eba43ab5a57;hb=eb64777602e77588cb781865f742fa23fad06d08;hp=3b7324de7c35e8df46c47982f975349bd98f6bdc;hpb=4d7f33a5ea53c2bf5900785dc3946c13c04430c1;p=ghc-hetmet.git

diff --git a/rts/Linker.c b/rts/Linker.c
index 3b7324d..c212c0f 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -256,6 +256,12 @@ typedef struct _RtsSymbolVal {
 #define RTS_MINGW_EXTRA_SYMS
 #endif
 
+#if HAVE_GETTIMEOFDAY
+#define RTS_MINGW_GETTIMEOFDAY_SYM Sym(gettimeofday)
+#else
+#define RTS_MINGW_GETTIMEOFDAY_SYM /**/
+#endif
+
 /* These are statically linked from the mingw libraries into the ghc
    executable, so we have to employ this hack. */
 #define RTS_MINGW_ONLY_SYMBOLS                  \
@@ -339,6 +345,7 @@ typedef struct _RtsSymbolVal {
       Sym(readdir)                              \
       Sym(rewinddir)                            \
       RTS_MINGW_EXTRA_SYMS                      \
+      RTS_MINGW_GETTIMEOFDAY_SYM		\
       Sym(closedir)
 #endif
 
@@ -470,12 +477,12 @@ typedef struct _RtsSymbolVal {
       SymX(__encodeDouble)			\
       SymX(__encodeFloat)			\
       SymX(addDLL)               		\
-      SymX(__gmpn_gcd_1)			\
-      SymX(__gmpz_cmp)				\
-      SymX(__gmpz_cmp_si)			\
-      SymX(__gmpz_cmp_ui)			\
-      SymX(__gmpz_get_si)			\
-      SymX(__gmpz_get_ui)			\
+      SymExtern(__gmpn_gcd_1)			\
+      SymExtern(__gmpz_cmp)			\
+      SymExtern(__gmpz_cmp_si)			\
+      SymExtern(__gmpz_cmp_ui)			\
+      SymExtern(__gmpz_get_si)			\
+      SymExtern(__gmpz_get_ui)			\
       SymX(__int_encodeDouble)			\
       SymX(__int_encodeFloat)			\
       SymX(andIntegerzh_fast)			\
@@ -516,6 +523,7 @@ typedef struct _RtsSymbolVal {
       SymX(genSymZh)				\
       SymX(genericRaise)			\
       SymX(getProgArgv)				\
+      SymX(getFullProgArgv)				\
       SymX(getStablePtr)			\
       SymX(hs_init)				\
       SymX(hs_exit)				\
@@ -524,6 +532,7 @@ typedef struct _RtsSymbolVal {
       SymX(hs_perform_gc)			\
       SymX(hs_free_stable_ptr)			\
       SymX(hs_free_fun_ptr)			\
+      SymX(hs_hpc_rootModule)		        \
       SymX(initLinker)				\
       SymX(unpackClosurezh_fast)                \
       SymX(getApStackValzh_fast)                \
@@ -590,32 +599,38 @@ typedef struct _RtsSymbolVal {
       SymX(rts_getDouble)			\
       SymX(rts_getFloat)			\
       SymX(rts_getInt)				\
+      SymX(rts_getInt8)				\
+      SymX(rts_getInt16)			\
       SymX(rts_getInt32)			\
+      SymX(rts_getInt64)			\
       SymX(rts_getPtr)				\
       SymX(rts_getFunPtr)			\
       SymX(rts_getStablePtr)			\
       SymX(rts_getThreadId)			\
       SymX(rts_getWord)				\
+      SymX(rts_getWord8)			\
+      SymX(rts_getWord16)			\
       SymX(rts_getWord32)			\
+      SymX(rts_getWord64)			\
       SymX(rts_lock)				\
       SymX(rts_mkBool)				\
       SymX(rts_mkChar)				\
       SymX(rts_mkDouble)			\
       SymX(rts_mkFloat)				\
       SymX(rts_mkInt)				\
+      SymX(rts_mkInt8)				\
       SymX(rts_mkInt16)				\
       SymX(rts_mkInt32)				\
       SymX(rts_mkInt64)				\
-      SymX(rts_mkInt8)				\
       SymX(rts_mkPtr)				\
       SymX(rts_mkFunPtr)			\
       SymX(rts_mkStablePtr)			\
       SymX(rts_mkString)			\
       SymX(rts_mkWord)				\
+      SymX(rts_mkWord8)				\
       SymX(rts_mkWord16)			\
       SymX(rts_mkWord32)			\
       SymX(rts_mkWord64)			\
-      SymX(rts_mkWord8)				\
       SymX(rts_unlock)				\
       SymX(rtsSupportsBoundThreads)		\
       SymX(__hscore_get_saved_termios)		\
@@ -710,8 +725,9 @@ typedef struct _RtsSymbolVal {
       SymX(getAllocations)                      \
       SymX(revertCAFs)                          \
       SymX(RtsFlags)                            \
-      Sym(breakPointIOAction)			\
-      Sym(rts_setStepFlag)			\
+      SymX(rts_breakpoint_io_action)		\
+      SymX(rts_stop_next_breakpoint)		\
+      SymX(rts_stop_on_exception)		\
       RTS_USER_SIGNALS_SYMBOLS
 
 #ifdef SUPPORT_LONG_LONGS
@@ -757,6 +773,11 @@ typedef struct _RtsSymbolVal {
 
 /* entirely bogus claims about types of these symbols */
 #define Sym(vvv)  extern void vvv(void);
+#if defined(__PIC__) && defined(mingw32_TARGET_OS)
+#define SymExtern(vvv)  extern void _imp__ ## vvv (void);
+#else
+#define SymExtern(vvv)  SymX(vvv)
+#endif
 #define SymX(vvv) /**/
 #define SymX_redirect(vvv,xxx) /**/
 RTS_SYMBOLS
@@ -770,6 +791,7 @@ RTS_LIBGCC_SYMBOLS
 #undef Sym
 #undef SymX
 #undef SymX_redirect
+#undef SymExtern
 
 #ifdef LEADING_UNDERSCORE
 #define MAYBE_LEADING_UNDERSCORE_STR(s) ("_" s)
@@ -780,6 +802,8 @@ RTS_LIBGCC_SYMBOLS
 #define Sym(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \
                     (void*)(&(vvv)) },
 #define SymX(vvv) Sym(vvv)
+#define SymExtern(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \
+	    (void*)DLL_IMPORT_DATA_REF(vvv) },
 
 // SymX_redirect allows us to redirect references to one symbol to
 // another symbol.  See newCAF/newDynCAF for an example.
@@ -2517,13 +2541,16 @@ ocResolve_PEi386 ( ObjectCode* oc )
 #endif
 
 #if !defined(openbsd_HOST_OS)
-#include <elf.h>
+#  include <elf.h>
+#  ifndef R_X86_64_PC64     /* If elf.h doesn't define it */
+#    define R_X86_64_PC64 24
+#  endif
 #else
 /* openbsd elf has things in different places, with diff names */
-#include <elf_abi.h>
-#include <machine/reloc.h>
-#define R_386_32    RELOC_32
-#define R_386_PC32  RELOC_PC32
+#  include <elf_abi.h>
+#  include <machine/reloc.h>
+#  define R_386_32    RELOC_32
+#  define R_386_PC32  RELOC_PC32
 #endif
 
 /*
@@ -3467,6 +3494,13 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
 	  break;
       }
 
+      case R_X86_64_PC64:
+      {
+	  StgInt64 off = value - P;
+	  *(Elf64_Word *)P = (Elf64_Word)off;
+	  break;
+      }
+
       case R_X86_64_32:
 	  if (value >= 0x7fffffffL) {
 	      barf("R_X86_64_32 relocation out of range: %s = %p\n",