From 8c2e1d6ca5497c08ec72abe9da93e4a7869e0f0e Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Tue, 1 May 2018 14:08:44 +0000
Subject: re PR go/85429 (Several gotools tests FAIL with Solaris as)

	PR go/85429
    cmd/go: support more Solaris assembler syntaxes

    Patch by Rainer Orth.

    Reviewed-on: https://go-review.googlesource.com/110563

From-SVN: r259797
---
 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 24592d2..61a5bc2 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-32861fd0acb0f3232f66be4791388b27e71c9990
+380527c032f02446438c71b0ac0026bcab416be5
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
-- 
cgit v1.1