libmach: correct handling of .5 files with D_REGREG addresses

undo workaround in gc

Fixes #943.

R=kaib
CC=golang-dev
https://golang.org/cl/1889041

diff --git a/src/cmd/gc/range.c b/src/cmd/gc/range.c
index b57639b232564979a471e7684f16e12bab8548b8..dca3a54542c204da3241ef451b19cdfffdd239b8 100644 (file)
--- a/src/cmd/gc/range.c
+++ b/src/cmd/gc/range.c
@@ -115,9 +115,7 @@ walkrange(Node *n)
                v2 = n->list->next->n;
        hv2 = N;
 
-       // TODO(kaib): re-enable this optimization on arm once we are on par with 6g/8g
-       // see http://code.google.com/p/go/issues/detail?id=943
-       if(v2 == N && t->etype == TARRAY && thechar != '5') {
+       if(v2 == N && t->etype == TARRAY) {
                // will have just one reference to argument.
                // no need to make a potentially expensive copy.
                ha = a;

diff --git a/src/libmach/5obj.c b/src/libmach/5obj.c
index 034deea2c5fcf1628d30443a677849451c722f45..e539362b0b8f41e29572f31715d1ebd7e40fd5f5 100644 (file)
--- a/src/libmach/5obj.c
+++ b/src/libmach/5obj.c
@@ -123,6 +123,9 @@ addr(Biobuf *bp)
        case D_PSR:
        case D_FPCR:
                break;
+       case D_REGREG:
+               Bgetc(bp);
+               break;
        case D_CONST2:
                Bgetc(bp);
                Bgetc(bp);