From 6156a05a2588e36f69b279bfa21025892cab4338 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Fri, 21 Oct 2016 20:44:46 +0000
Subject: [PATCH] libgo: leave Int64Align as 8 on 32-bit SPARC

    Verified by testing on SPARC Solaris.

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

From-SVN: r241430
---
 gcc/go/gofrontend/MERGE | 2 +-
 libgo/configure         | 1 -
 libgo/configure.ac      | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index bc954f02cbd..97be99e0c02 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-df6046971233854e5b7533140d4ead095ab69857
+9806c8a8e4e448eaf6810ff1acffa715745d2549
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/configure b/libgo/configure
index 6fd742b50b0..3c866f7f21a 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -13841,7 +13841,6 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   GOARCH=sparc
 GOARCH_FAMILY=SPARC
-GOARCH_INT64ALIGN=4
 
 else
   GOARCH=sparc64
diff --git a/libgo/configure.ac b/libgo/configure.ac
index ef0e700db47..2951392ed16 100644
--- a/libgo/configure.ac
+++ b/libgo/configure.ac
@@ -364,7 +364,6 @@ GOARCH_MINFRAMESIZE=8
 #endif],
 [GOARCH=sparc
 GOARCH_FAMILY=SPARC
-GOARCH_INT64ALIGN=4
 ],
 [GOARCH=sparc64
 GOARCH_FAMILY=SPARC64
-- 
2.30.2