From 0f366729b9b0e39922ee5f1cbe021226b35ee65a Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Fri, 11 Nov 2016 14:52:35 +0000
Subject: [PATCH] libgo: fix GOARCH_INT64ALIGN for several targets

    From Andreas Schwab.

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

From-SVN: r242072
---
 gcc/go/gofrontend/MERGE | 2 +-
 libgo/configure         | 6 +-----
 libgo/configure.ac      | 6 +-----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index c25c2e48642..9634f00a66e 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-449e918b0f93d3e3339edcec21a5bc157f548e54
+3c8d91cff0ad3d233ebd268f88a3749d38a0aac1
 
 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 7a9df58c216..adabb74baad 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -13648,7 +13648,6 @@ case ${host} in
     GOARCH_FAMILY=ARM
     GOARCH_CACHELINESIZE=32
     GOARCH_PCQUANTUM=4
-    GOARCH_INT64ALIGN=4
     GOARCH_MINFRAMESIZE=4
     ;;
   i[34567]86-*-* | x86_64-*-*)
@@ -13685,7 +13684,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     GOARCH_BIGENDIAN=1
     GOARCH_CACHELINESIZE=16
     GOARCH_PCQUANTUM=4
-    GOARCH_INT64ALIGN=4
+    GOARCH_INT64ALIGN=2
     ;;
   mips*-*-*)
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13747,7 +13746,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     case "$mips_abi" in
     "o32" | "n32")
         GOARCH_FAMILY=MIPS
-	GOARCH_INT64ALIGN=4
 	GOARCH_MINFRAMESIZE=4
         ;;
     "n64" | "o64")
@@ -13778,7 +13776,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
   GOARCH=ppc
 GOARCH_FAMILY=PPC
 GOARCH_BIGENDIAN=1
-GOARCH_INT64ALIGN=4
 
 else
 
@@ -13816,7 +13813,6 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   GOARCH=s390
 GOARCH_FAMILY=S390
-GOARCH_INT64ALIGN=4
 GOARCH_MINFRAMESIZE=4
 
 else
diff --git a/libgo/configure.ac b/libgo/configure.ac
index ed2edd3b69c..09add8d136b 100644
--- a/libgo/configure.ac
+++ b/libgo/configure.ac
@@ -230,7 +230,6 @@ case ${host} in
     GOARCH_FAMILY=ARM
     GOARCH_CACHELINESIZE=32
     GOARCH_PCQUANTUM=4
-    GOARCH_INT64ALIGN=4
     GOARCH_MINFRAMESIZE=4
     ;;
 changequote(,)dnl
@@ -262,7 +261,7 @@ GOARCH_HUGEPAGESIZE="1 << 21"
     GOARCH_BIGENDIAN=1
     GOARCH_CACHELINESIZE=16
     GOARCH_PCQUANTUM=4
-    GOARCH_INT64ALIGN=4
+    GOARCH_INT64ALIGN=2
     ;;
   mips*-*-*)
     AC_COMPILE_IFELSE([
@@ -296,7 +295,6 @@ GOARCH_HUGEPAGESIZE="1 << 21"
     case "$mips_abi" in
     "o32" | "n32")
         GOARCH_FAMILY=MIPS
-	GOARCH_INT64ALIGN=4
 	GOARCH_MINFRAMESIZE=4
         ;;
     "n64" | "o64")
@@ -323,7 +321,6 @@ GOARCH_HUGEPAGESIZE="1 << 21"
 [GOARCH=ppc
 GOARCH_FAMILY=PPC
 GOARCH_BIGENDIAN=1
-GOARCH_INT64ALIGN=4
 ],
     [
 GOARCH_FAMILY=PPC64
@@ -347,7 +344,6 @@ GOARCH_BIGENDIAN=1
 #endif],
 [GOARCH=s390
 GOARCH_FAMILY=S390
-GOARCH_INT64ALIGN=4
 GOARCH_MINFRAMESIZE=4
 ], [GOARCH=s390x
 GOARCH_FAMILY=S390X
-- 
2.30.2