From 307dde6fcc0fdf813087212705f84370b1a2305b Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Tue, 1 Nov 2016 21:45:32 +0000
Subject: [PATCH] libgo: fix GOARCH_PHYSPAGESIZE for ia64

    From Andreas Schwab.

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

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

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index db435a26161..7868369e151 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-069ed35ecbefd2f138ea3132a557ad23a6936a45
+150bca67d8bb4b23009f53ba06e85e306e3960d8
 
 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 3c866f7f21a..7a9df58c216 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -13677,7 +13677,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     GOARCH=ia64
     GOARCH_FAMILY=IA64
     GOARCH_CACHELINESIZE=16384
-    GOARCH_PHYSPAGESIZE=8192
+    GOARCH_PHYSPAGESIZE=65536
     ;;
   m68k*-*-*)
     GOARCH=m68k
diff --git a/libgo/configure.ac b/libgo/configure.ac
index 2951392ed16..ed2edd3b69c 100644
--- a/libgo/configure.ac
+++ b/libgo/configure.ac
@@ -254,7 +254,7 @@ GOARCH_HUGEPAGESIZE="1 << 21"
     GOARCH=ia64
     GOARCH_FAMILY=IA64
     GOARCH_CACHELINESIZE=16384
-    GOARCH_PHYSPAGESIZE=8192
+    GOARCH_PHYSPAGESIZE=65536
     ;;
   m68k*-*-*)
     GOARCH=m68k
-- 
2.30.2