cmd/asm: drop legacy RETURN mnemonic on ppc64

Change-Id: I999b57ef5535c18e02cc27c9bc9f896d73126b50
Reviewed-on: https://go-review.googlesource.com/10674
Reviewed-by: Russ Cox <rsc@golang.org>
Reviewed-by: Minux Ma <minux@golang.org>

diff --git a/src/cmd/asm/internal/arch/arch.go b/src/cmd/asm/internal/arch/arch.go
index 9f2d3472c04a9ff226284663d81925c1f404efce..e6901ebfc2a1d7881eab3cdffe1be6941de7f7a9 100644 (file)
--- a/src/cmd/asm/internal/arch/arch.go
+++ b/src/cmd/asm/internal/arch/arch.go
@@ -351,7 +351,6 @@ func archPPC64() *Arch {
        // Annoying aliases.
        instructions["BR"] = ppc64.ABR
        instructions["BL"] = ppc64.ABL
-       instructions["RETURN"] = ppc64.ARETURN
 
        return &Arch{
                LinkArch:       &ppc64.Linkppc64,

diff --git a/src/cmd/asm/internal/asm/testdata/ppc64.s b/src/cmd/asm/internal/asm/testdata/ppc64.s
index b1cde456874280e937476865d4696e5f651a9d70..42b8f77cbc48d860f0ffa71948512142310282f2 100644 (file)
--- a/src/cmd/asm/internal/asm/testdata/ppc64.s
+++ b/src/cmd/asm/internal/asm/testdata/ppc64.s
@@ -692,13 +692,13 @@ label1:
 //     }
        NOP     $4
 
-// RETURN
+// RET
 //
 //     LRETRN  comma // asm doesn't support the trailing comma.
 //     {
 //             outcode(int($1), &nullgen, 0, &nullgen);
 //     }
-       RETURN
+       RET
 
 // END
 //

diff --git a/src/cmd/internal/obj/ppc64/9.out.go b/src/cmd/internal/obj/ppc64/9.out.go
index 208dfa3be76560ca7b469acf48e8cd598d3eec8c..3028b6cac8d41850d8221825636251f4fbd80e4a 100644 (file)
--- a/src/cmd/internal/obj/ppc64/9.out.go
+++ b/src/cmd/internal/obj/ppc64/9.out.go
@@ -533,7 +533,6 @@ const (
        ALAST
 
        // aliases
-       ABR     = obj.AJMP
-       ABL     = obj.ACALL
-       ARETURN = obj.ARET
+       ABR = obj.AJMP
+       ABL = obj.ACALL
 )