aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Pike <r@golang.org>2015-02-20 19:31:37 -0800
committerRob Pike <r@golang.org>2015-02-21 03:33:09 +0000
commit1996f276d260327f414c432a7d1db631c067ae87 (patch)
tree5be1dc81dc67acaeb54fe862437b4ee810e415bf
parent7ed429d99c67aa32acd57dc333ec84eebf697f1e (diff)
downloadgo-1996f276d260327f414c432a7d1db631c067ae87.tar.gz
go-1996f276d260327f414c432a7d1db631c067ae87.zip
[dev.cc] cmd/asm: fix build: broken end to end test
This time for sure. Change-Id: I77ed6b70d82a6f4ba371afba2f53c8b146ac110f Reviewed-on: https://go-review.googlesource.com/5530 Reviewed-by: Rob Pike <r@golang.org>
-rw-r--r--src/cmd/asm/internal/asm/testdata/arm.out13
-rw-r--r--src/cmd/asm/internal/asm/testdata/arm.s3
2 files changed, 7 insertions, 9 deletions
diff --git a/src/cmd/asm/internal/asm/testdata/arm.out b/src/cmd/asm/internal/asm/testdata/arm.out
index af0b4638e5..88309bd5a4 100644
--- a/src/cmd/asm/internal/asm/testdata/arm.out
+++ b/src/cmd/asm/internal/asm/testdata/arm.out
@@ -45,10 +45,9 @@
197 00045 (testdata/arm.s:197) ADDD.S F1,F2,F3
198 00046 (testdata/arm.s:198) ADDD.S $0.5,F2,F3
204 00047 (testdata/arm.s:204) CMPD.S F1,F2
-228 00048 (testdata/arm.s:228) MRC ,$8301712627
-237 00049 (testdata/arm.s:237) MULL R1,R2,(R3, R4)
-249 00050 (testdata/arm.s:249) MULAWT R1,R2,R3, R4
-257 00051 (testdata/arm.s:257) PLD 0(R1),
-258 00052 (testdata/arm.s:258) PLD 4(R1),
-267 00053 (testdata/arm.s:267) RET ,
-276 00054 (testdata/arm.s:276) END ,
+238 00048 (testdata/arm.s:238) MULL R1,R2,(R3, R4)
+250 00049 (testdata/arm.s:250) MULAWT R1,R2,R3, R4
+258 00050 (testdata/arm.s:258) PLD 0(R1),
+259 00051 (testdata/arm.s:259) PLD 4(R1),
+268 00052 (testdata/arm.s:268) RET ,
+277 00053 (testdata/arm.s:277) END ,
diff --git a/src/cmd/asm/internal/asm/testdata/arm.s b/src/cmd/asm/internal/asm/testdata/arm.s
index b0ed564a32..126405eafa 100644
--- a/src/cmd/asm/internal/asm/testdata/arm.s
+++ b/src/cmd/asm/internal/asm/testdata/arm.s
@@ -225,8 +225,7 @@ TEXT foo(SB), 0, $0
// (1<<4)); /* must be set */
// outcode(AMRC, Always, &nullgen, 0, &g);
// }
-// TODO: Representation in printout differs between 32- and 64-bit machines.
-// Fix the output in obj/arm and restore this.
+// TODO: Disabled until printout for this instruction is the same for 32 and 64 bits.
// MRC.S 4, 6, R1, C2, C3, 7
//