qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 05:54:40 -07:00
Code Releases Activity

make 5l ignore multiple defs, remove use of multiple

Browse Source 
defs from embed1 and gotest

R=rsc
http://go/go-review/1014009
This commit is contained in:
Kai Backman 2009-10-25 11:59:58 -07:00
parent 9e99383df5
commit dfeceddd3f
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cmd/5l/obj.c
View File

@ -432,9 +432,11 @@ ldobj1(Biobuf *f, int64 len, char *pn)
int v, o, r, skip; int v, o, r, skip;
uint32 sig; uint32 sig;
char *name; char *name;
int ntext;
int32 eof; int32 eof;
char src[1024]; char src[1024];
ntext = 0;
eof = Boffset(f) + len; eof = Boffset(f) + len;
di = S; di = S;
src[0] = 0; src[0] = 0;
@ -657,6 +659,13 @@ loop:
break; break;
case ATEXT: case ATEXT:
s = p->from.sym;
if(ntext++ == 0 && s->type != 0 && s->type != SXREF) {
/* redefinition, so file has probably been seen before */
if(debug['v'])
Bprint(&bso, "skipping: %s: redefinition: %s", pn, s->name);
return;
}
setarch(p); setarch(p);
setthumb(p); setthumb(p);
p->align = 4; p->align = 4;

8
src/cmd/gotest/gotest
View File

@ -22,6 +22,12 @@ nacl)
E="nacl" E="nacl"
esac esac
# TODO(kaib): proper emulator strategy
case x"$GOARCH" in
xarm)
E="qemu-arm -cpu cortex-a8"
esac
# Allow overrides # Allow overrides
GC=${_GC:-$GC} GC=${_GC:-$GC}
GL=${GL:-$LD} GL=${GL:-$LD}
@ -131,5 +137,5 @@ importpath=$(make -s importpath)
}>_testmain.go }>_testmain.go
$GC _testmain.go $GC _testmain.go
$GL _testmain.$O _test/$importpath.a $xofile $GL _testmain.$O
$E ./$O.out "$@" $E ./$O.out "$@"

2
test/interface/embed1.go
View File

@ -1,4 +1,4 @@
// $G $D/embed0.go && $G $D/$F.go && $L embed0.$A $F.$A && ./$A.out // $G $D/embed0.go && $G $D/$F.go && $L $F.$A && ./$A.out
// Copyright 2009 The Go Authors. All rights reserved. // Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style