From: wolfgang.thaller@gmx.net <unknown>
Date: Thu, 12 Apr 2007 21:17:12 +0000 (+0000)
Subject: Darwin Linker: Do not add local symbols to lochash
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=2bed45837718c70cee1336c4de9fab7708e7ea96

Darwin Linker: Do not add local symbols to lochash
... so that GHCi doesn't complain about duplicate symbols when two C modules define the same static variable.

MERGE TO STABLE.
---

diff --git a/rts/Linker.c b/rts/Linker.c
index 598af97..7cf66f4 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -4191,15 +4191,6 @@ static int ocGetNames_MachO(ObjectCode* oc)
                             oc->symbols[curSymbol++] = nm;
                     }
                 }
-                else
-                {
-                    char *nm = image + symLC->stroff + nlist[i].n_un.n_strx;
-                    ghciInsertStrHashTable(oc->fileName, oc->lochash, nm,
-                                            image
-                                            + sections[nlist[i].n_sect-1].offset
-                                            - sections[nlist[i].n_sect-1].addr
-                                            + nlist[i].n_value);
-                }
             }
         }
     }