From 9195aa172bbc20627f23bfb1612180c83a0a7bab Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Tue, 19 Mar 2019 14:00:59 +0000
Subject: libgo: fix build on AIX

    Since aix/ppc64 has been added to GC toolchain, a mix between new and
    old files were created in gcc toolchain.
    This commit corrects this merge for aix/ppc64 and aix/ppc.

    Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/167658

From-SVN: r269797
---
 gcc/go/gofrontend/MERGE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc/go')

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index a09733f..006da8c 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-87945b620b2100d33e27f33e6276a4e4e5890659
+069afe85f38c099660c5d81950d65248ed4fc516
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
-- 
cgit v1.1