summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2009-11-16 17:40:03 -0800
committerRuss Cox <rsc@golang.org>2009-11-16 17:40:03 -0800
commit908289709ebd182016ff7cd317b4f1345920a378 (patch)
tree2ec968a84994e91d06b0c576b947d4d06a4e7e41 /src
parent72f21fcbaa7a4df0ab6805b1e9bc08ef48512dcf (diff)
downloadgolang-908289709ebd182016ff7cd317b4f1345920a378.tar.gz
6l: fix divide by zero in glibc linker.
repeats 8l change http://code.google.com/p/go/source/detail?r=7594e16b5cf9 Fixes issue 179. R=iant http://codereview.appspot.com/154145
Diffstat (limited to 'src')
-rw-r--r--src/cmd/6l/asm.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/cmd/6l/asm.c b/src/cmd/6l/asm.c
index e5aa42c71..146245c7b 100644
--- a/src/cmd/6l/asm.c
+++ b/src/cmd/6l/asm.c
@@ -320,15 +320,22 @@ doelf(void)
addstring(lookup(".interp", 0), linuxdynld);
/*
- * hash table - empty for now.
- * we should have to fill it out with an entry for every
- * symbol in .dynsym, but it seems to work not to,
- * which is fine with me.
+ * hash table.
+ * only entries that other objects need to find when
+ * linking us need to be in the table. right now that is
+ * no entries.
+ *
+ * must have at least 1 bucket, though, to avoid
+ * a divide by zero bug in some copies of the glibc
+ * dynamic loader.
*/
s = lookup(".hash", 0);
s->type = SDATA; // TODO: rodata
s->reachable = 1;
- s->value += 8; // two leading zeros
+ adduint32(s, 1); // nbucket
+ adduint32(s, 1); // nchain
+ adduint32(s, 0); // bucket 0
+ adduint32(s, 0); // chain 0
/* dynamic symbol table - first entry all zeros */
s = lookup(".dynsym", 0);