summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDean Prichard <dean.prichard@gmail.com>2010-03-23 18:13:20 -0700
committerDean Prichard <dean.prichard@gmail.com>2010-03-23 18:13:20 -0700
commitdfc9e0dbf410821e315765f4a76e67a1d391a637 (patch)
tree931d63c9c5f1f6ca49b94ee25b93f90f3c791c7b
parentc3c21eabcccb144eec41abb61dabe8765e50605d (diff)
downloadgo-dfc9e0dbf410821e315765f4a76e67a1d391a637.tar.gz
arm: fix build
R=kaib, rsc CC=golang-dev http://codereview.appspot.com/627045 Committer: Russ Cox <rsc@golang.org>
-rw-r--r--src/cmd/5g/gobj.c4
-rw-r--r--test/golden-arm.out5
2 files changed, 4 insertions, 5 deletions
diff --git a/src/cmd/5g/gobj.c b/src/cmd/5g/gobj.c
index 0e8220007..c819be96e 100644
--- a/src/cmd/5g/gobj.c
+++ b/src/cmd/5g/gobj.c
@@ -498,12 +498,12 @@ gdatacomplex(Node *nam, Mpcplx *cval)
w = types[w]->width;
p = gins(ADATA, nam, N);
- p->from.scale = w;
+ p->reg = w;
p->to.type = D_FCONST;
p->to.dval = mpgetflt(&cval->real);
p = gins(ADATA, nam, N);
- p->from.scale = w;
+ p->reg = w;
p->from.offset += w;
p->to.type = D_FCONST;
p->to.dval = mpgetflt(&cval->imag);
diff --git a/test/golden-arm.out b/test/golden-arm.out
index dff4be70d..6764f9334 100644
--- a/test/golden-arm.out
+++ b/test/golden-arm.out
@@ -59,7 +59,7 @@ do break
broke
=========== fixedbugs/bug081.go
-fixedbugs/bug081.go:9: fatal error: typecheck loop
+fixedbugs/bug081.go:9: typechecking loop
=========== fixedbugs/bug093.go
M
@@ -80,11 +80,10 @@ panic PC=xxx
[1] Segmentation fault "${@}"
=========== fixedbugs/bug154.go
-??none??: $GOROOT/pkg/linux_arm/strconv.a: failed to load: os.ERANGE
+[1] Segmentation fault "${@}"
BUG: should not panic
=========== fixedbugs/bug206.go
-??none??: $GOROOT/pkg/linux_arm/strconv.a: failed to load: os.ERANGE
BUG: bug206
=========== helloworld.go