From: Russ Cox <rsc@golang.org>
Date: Tue, 28 Sep 2010 19:18:02 +0000 (-0400)
Subject: 6l, 8l: elfsetstring is only for .shstrtab
X-Git-Tag: weekly.2010-09-29~24
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=2ccbf83b327a214a5b8d7e5f03c2d248e6d473e5;p=gostls13.git

6l, 8l: elfsetstring is only for .shstrtab

Was also recording for .dynstrtab which made the
table run out of space and would have caused confusion
if the ELF code tried to refer to any of the strings.

R=r
CC=golang-dev
https://golang.org/cl/2288041
---

diff --git a/src/cmd/6l/asm.c b/src/cmd/6l/asm.c
index 1502ad6602..8cd256ca92 100644
--- a/src/cmd/6l/asm.c
+++ b/src/cmd/6l/asm.c
@@ -138,7 +138,8 @@ addstring(Sym *s, char *str)
 	s->reachable = 1;
 	r = s->size;
 	n = strlen(str)+1;
-	elfsetstring(str, r);
+	if(strcmp(s->name, ".shstrtab") == 0)
+		elfsetstring(str, r);
 	while(n > 0) {
 		m = n;
 		if(m > sizeof(p->to.scon))
diff --git a/src/cmd/8l/asm.c b/src/cmd/8l/asm.c
index ec35d8d519..1dd24b5bea 100644
--- a/src/cmd/8l/asm.c
+++ b/src/cmd/8l/asm.c
@@ -129,7 +129,8 @@ addstring(Sym *s, char *str)
 	s->reachable = 1;
 	r = s->size;
 	n = strlen(str)+1;
-	elfsetstring(str, r);
+	if(strcmp(s->name, ".shstrtab") == 0)
+		elfsetstring(str, r);
 	while(n > 0) {
 		m = n;
 		if(m > sizeof(p->to.scon))