From 319e41dc77e31f3ece720ec37853ffbcc4a0df25 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Sat, 6 Jan 2018 01:17:29 +0000
Subject: [PATCH] libgo: fix GOARCH_CACHELINESIZE on ia64

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

From-SVN: r256306
---
 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 3ba34626478..b03c3fb3492 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-9b9bece388d1bacdc9d1d0024e722ffe449d221d
+1319f36ccc65cf802b8e17ddd3d2da3ca6d82f4c
 
 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 4e838166484..3f8b6a0887f 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -13706,7 +13706,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   ia64-*-*)
     GOARCH=ia64
     GOARCH_FAMILY=IA64
-    GOARCH_CACHELINESIZE=16384
+    GOARCH_CACHELINESIZE=128
     GOARCH_PHYSPAGESIZE=65536
     ;;
   m68k*-*-*)
diff --git a/libgo/configure.ac b/libgo/configure.ac
index 7b0c629653f..297ddb1cacd 100644
--- a/libgo/configure.ac
+++ b/libgo/configure.ac
@@ -264,7 +264,7 @@ GOARCH_HUGEPAGESIZE="1 << 21"
   ia64-*-*)
     GOARCH=ia64
     GOARCH_FAMILY=IA64
-    GOARCH_CACHELINESIZE=16384
+    GOARCH_CACHELINESIZE=128
     GOARCH_PHYSPAGESIZE=65536
     ;;
   m68k*-*-*)
-- 
2.30.2