projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fa8bedc
)
Darwin Linker: Do not add local symbols to lochash
author
wolfgang.thaller@gmx.net
<unknown>
Thu, 12 Apr 2007 21:17:12 +0000
(21:17 +0000)
committer
wolfgang.thaller@gmx.net
<unknown>
Thu, 12 Apr 2007 21:17:12 +0000
(21:17 +0000)
... so that GHCi doesn't complain about duplicate symbols when two C modules define the same static variable.
MERGE TO STABLE.
rts/Linker.c
patch
|
blob
|
history
diff --git
a/rts/Linker.c
b/rts/Linker.c
index
598af97
..
7cf66f4
100644
(file)
--- 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);
- }
}
}
}