From 16310571d1b7c706e1b7a6a8d6e9ba7a39f70230 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 3 Jun 2015 15:13:10 -0400 Subject: [PATCH] cmd/asm: drop legacy RETURN mnemonic on ppc64 Change-Id: I999b57ef5535c18e02cc27c9bc9f896d73126b50 Reviewed-on: https://go-review.googlesource.com/10674 Reviewed-by: Russ Cox Reviewed-by: Minux Ma --- src/cmd/asm/internal/arch/arch.go | 1 - src/cmd/asm/internal/asm/testdata/ppc64.s | 4 ++-- src/cmd/internal/obj/ppc64/9.out.go | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/cmd/asm/internal/arch/arch.go b/src/cmd/asm/internal/arch/arch.go index 9f2d3472c0..e6901ebfc2 100644 --- 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 b1cde45687..42b8f77cbc 100644 --- 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 208dfa3be7..3028b6cac8 100644 --- 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 ) -- 2.50.0