arm: fix build

R=kaib, rsc
CC=golang-dev
https://golang.org/cl/627045

diff --git a/src/cmd/5g/gobj.c b/src/cmd/5g/gobj.c
index 0e8220007563dec2eba016cd9025a65e2efa4de9..c819be96e710f635e181bca24db8287469157953 100644 (file)
--- 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 dff4be70dbedae43a8734fba05778c7f13f80f76..6764f93347d0d73ee65f0e284d664683e5ef12aa 100644 (file)
--- 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