X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=4ce525f80e8fbad6a741ce6a363fe9ff0563feb4;hb=02d8f553485ffe1b8bb8f131f9cf6a6ba0823b46;hp=a2b69f93ddf94f7d60f0f0cf2b50eb6ea8b27360;hpb=9ccda9a0f26fa0f2f1db3d61d7d93ae32ca3c8b7;p=ghc-hetmet.git

diff --git a/rts/Linker.c b/rts/Linker.c
index a2b69f9..4ce525f 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -63,12 +63,12 @@
 #include <sys/wait.h>
 #endif
 
-#if defined(ia64_HOST_ARCH) || defined(linux_HOST_OS) || defined(freebsd_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
+#if defined(ia64_HOST_ARCH) || defined(linux_HOST_OS) || defined(freebsd_HOST_OS) || defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
 #define USE_MMAP
 #include <fcntl.h>
 #include <sys/mman.h>
 
-#if defined(linux_HOST_OS) || defined(freebsd_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
+#if defined(linux_HOST_OS) || defined(freebsd_HOST_OS) || defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -76,7 +76,7 @@
 
 #endif
 
-#if defined(linux_HOST_OS) || defined(solaris2_HOST_OS) || defined(freebsd_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
+#if defined(linux_HOST_OS) || defined(solaris2_HOST_OS) || defined(freebsd_HOST_OS) || defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
 #  define OBJFORMAT_ELF
 #elif defined(cygwin32_HOST_OS) || defined (mingw32_HOST_OS)
 #  define OBJFORMAT_PEi386
@@ -505,10 +505,13 @@ typedef struct _RtsSymbolVal {
 #if !defined(mingw32_HOST_OS)
 #define RTS_USER_SIGNALS_SYMBOLS \
    SymI_HasProto(setIOManagerPipe) \
+   SymI_HasProto(ioManagerWakeup) \
+   SymI_HasProto(ioManagerSync) \
    SymI_HasProto(blockUserSignals) \
    SymI_HasProto(unblockUserSignals)
 #else
 #define RTS_USER_SIGNALS_SYMBOLS     \
+   SymI_HasProto(ioManagerWakeup) \
    SymI_HasProto(sendIOManagerEvent) \
    SymI_HasProto(readIOManagerEvent) \
    SymI_HasProto(getIOManagerEvent)  \
@@ -736,7 +739,11 @@ typedef struct _RtsSymbolVal {
       SymI_HasProto(forkOS_createThread)		\
       SymI_HasProto(freeHaskellFunctionPtr)		\
       SymI_HasProto(getOrSetTypeableStore)		\
-      SymI_HasProto(getOrSetSignalHandlerStore)		\
+      SymI_HasProto(getOrSetGHCConcSignalHandlerStore)		\
+      SymI_HasProto(getOrSetGHCConcPendingEventsStore)		\
+      SymI_HasProto(getOrSetGHCConcPendingDelaysStore)		\
+      SymI_HasProto(getOrSetGHCConcIOManagerThreadStore)	\
+      SymI_HasProto(getOrSetGHCConcProddingStore)		\
       SymI_HasProto(genSymZh)				\
       SymI_HasProto(genericRaise)			\
       SymI_HasProto(getProgArgv)			\
@@ -1403,7 +1410,7 @@ mmap_again:
        } else {
            if ((W_)result > 0x80000000) {
                // oops, we were given memory over 2Gb
-#if defined(freebsd_HOST_OS)
+#if defined(freebsd_HOST_OS) || defined(dragonfly_HOST_OS)
                // Some platforms require MAP_FIXED.  This is normally
                // a bad idea, because MAP_FIXED will overwrite
                // existing mappings.
@@ -4173,9 +4180,16 @@ static int relocateSection(
                         i++;
                     }
  #endif
-                    else
-		        continue;  // ignore the others
-
+                    else 
+                    {
+		        barf ("Don't know how to handle this Mach-O "
+		              "scattered relocation entry: "
+                              "object file %s; entry type %ld; "
+                              "address %#lx\n", 
+                              oc->fileName, scat->r_type, scat->r_address);
+                        return 0;
+                     }
+                     
 #ifdef powerpc_HOST_ARCH
                     if(scat->r_type == GENERIC_RELOC_VANILLA
                         || scat->r_type == PPC_RELOC_SECTDIFF)
@@ -4203,11 +4217,28 @@ static int relocateSection(
                     }
 #endif
 		}
+		else
+		{
+            	    barf("Can't handle Mach-O scattered relocation entry "
+            	         "with this r_length tag: "
+                         "object file %s; entry type %ld; "
+                         "r_length tag %ld; address %#lx\n", 
+                         oc->fileName, scat->r_type, scat->r_length,
+                         scat->r_address);
+                    return 0;
+		}
 	    }
-
-	    continue; // FIXME: I hope it's OK to ignore all the others.
+	    else /* scat->r_pcrel */
+	    {
+	        barf("Don't know how to handle *PC-relative* Mach-O "
+	             "scattered relocation entry: "
+                     "object file %s; entry type %ld; address %#lx\n", 
+                     oc->fileName, scat->r_type, scat->r_address);
+               return 0;
+            }
+      
 	}
-	else
+	else /* !(relocs[i].r_address & R_SCATTERED) */
 	{
 	    struct relocation_info *reloc = &relocs[i];
 	    if(reloc->r_pcrel && !reloc->r_extern)
@@ -4252,6 +4283,14 @@ static int relocateSection(
 		    word = (word & 0x03FFFFFC) | ((word & 0x02000000) ? 0xFC000000 : 0);
 		}
 #endif
+                else
+                {
+                    barf("Can't handle this Mach-O relocation entry "
+		         "(not scattered): "
+                         "object file %s; entry type %ld; address %#lx\n", 
+                         oc->fileName, reloc->r_type, reloc->r_address);
+                    return 0;
+                }
 
 		if(!reloc->r_extern)
 		{
@@ -4343,8 +4382,16 @@ static int relocateSection(
 		}
 #endif
             }
-	    barf("\nunknown relocation %d",reloc->r_type);
-	    return 0;
+            else
+            {
+ 	         barf("Can't handle Mach-O relocation entry (not scattered) "
+                      "with this r_length tag: "
+                      "object file %s; entry type %ld; "
+                      "r_length tag %ld; address %#lx\n", 
+                      oc->fileName, reloc->r_type, reloc->r_length,
+                      reloc->r_address);
+	         return 0;
+	    }
 	}
 #endif
     }