From 2bed45837718c70cee1336c4de9fab7708e7ea96 Mon Sep 17 00:00:00 2001 From: "wolfgang.thaller@gmx.net" Date: Thu, 12 Apr 2007 21:17:12 +0000 Subject: [PATCH] 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. --- rts/Linker.c | 9 --------- 1 file changed, 9 deletions(-) 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); - } } } } -- 1.7.10.4