Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
G
golang
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
golang
Commits
dfeceddd
Commit
dfeceddd
authored
Oct 25, 2009
by
Kai Backman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make 5l ignore multiple defs, remove use of multiple
defs from embed1 and gotest R=rsc
http://go/go-review/1014009
parent
9e99383d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
2 deletions
+17
-2
obj.c
src/cmd/5l/obj.c
+9
-0
gotest
src/cmd/gotest/gotest
+7
-1
embed1.go
test/interface/embed1.go
+1
-1
No files found.
src/cmd/5l/obj.c
View file @
dfeceddd
...
...
@@ -432,9 +432,11 @@ ldobj1(Biobuf *f, int64 len, char *pn)
int
v
,
o
,
r
,
skip
;
uint32
sig
;
char
*
name
;
int
ntext
;
int32
eof
;
char
src
[
1024
];
ntext
=
0
;
eof
=
Boffset
(
f
)
+
len
;
di
=
S
;
src
[
0
]
=
0
;
...
...
@@ -657,6 +659,13 @@ loop:
break
;
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
);
setthumb
(
p
);
p
->
align
=
4
;
...
...
src/cmd/gotest/gotest
View file @
dfeceddd
...
...
@@ -22,6 +22,12 @@ nacl)
E
=
"nacl"
esac
# TODO(kaib): proper emulator strategy
case
x
"
$GOARCH
"
in
xarm
)
E
=
"qemu-arm -cpu cortex-a8"
esac
# Allow overrides
GC
=
${
_GC
:-
$GC
}
GL
=
${
GL
:-
$LD
}
...
...
@@ -131,5 +137,5 @@ importpath=$(make -s importpath)
}>
_testmain.go
$GC
_testmain.go
$GL
_testmain.
$O
_test/
$importpath
.a
$xofile
$GL
_testmain.
$O
$E
./
$O
.out
"
$@
"
test/interface/embed1.go
View file @
dfeceddd
// $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.
// Use of this source code is governed by a BSD-style
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment