aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/ld
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2010-12-08 13:53:07 -0500
committerRuss Cox <rsc@golang.org>2010-12-08 13:53:07 -0500
commit8132f1d016807c0cc89c02fa80efd11ee72bb6de (patch)
tree25c92de272240c043536826570bc44430c590f20 /src/cmd/ld
parent4d8d6d5cdaef1771ebe32a1a0799b5778c06fc74 (diff)
downloadgo-8132f1d016807c0cc89c02fa80efd11ee72bb6de.tar.xz
6l, 8l: minor changes & cleanup
R=ken2, ken3 CC=golang-dev https://golang.org/cl/3505041
Diffstat (limited to 'src/cmd/ld')
-rw-r--r--src/cmd/ld/dwarf.c7
-rw-r--r--src/cmd/ld/elf.h2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/cmd/ld/dwarf.c b/src/cmd/ld/dwarf.c
index 4c9be955ba..adffb890a7 100644
--- a/src/cmd/ld/dwarf.c
+++ b/src/cmd/ld/dwarf.c
@@ -1895,7 +1895,7 @@ writelines(void)
cput(DW_LNE_set_address);
addrput(pc);
}
- if (!s->reachable)
+ if(s->text == nil)
continue;
if (unitstart < 0) {
@@ -1910,6 +1910,9 @@ writelines(void)
if (s->version == 0)
newattr(dwfunc, DW_AT_external, DW_CLS_FLAG, 1, 0);
+ if(s->text->link == nil)
+ continue;
+
for(q = s->text; q != P; q = q->link) {
lh = searchhist(q->line);
if (lh == nil) {
@@ -2054,7 +2057,7 @@ writeframes(void)
for(cursym = textp; cursym != nil; cursym = cursym->next) {
s = cursym;
- if (!s->reachable)
+ if(s->text == nil)
continue;
fdeo = cpos();
diff --git a/src/cmd/ld/elf.h b/src/cmd/ld/elf.h
index 2ba6e53e61..df15cb1158 100644
--- a/src/cmd/ld/elf.h
+++ b/src/cmd/ld/elf.h
@@ -964,7 +964,7 @@ extern int numelfshdr;
extern int iself;
int elfwriteinterp(void);
void elfinterp(ElfShdr*, uint64, char*);
-void elfdynhash(int);
+void elfdynhash(void);
ElfPhdr* elfphload(Segment*);
ElfShdr* elfshbits(Section*);
void elfsetstring(char*, int);