libgo: fix GOARCH_CACHELINESIZE on ia64

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

From-SVN: r256306

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 3ba3462647818b7986dd2593fe4acdecd030daff..b03c3fb34921711f8c3191af87553cf8a7cd8f20 100644 (file)
--- 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 4e838166484e22832aeb3e5fb549616ccf457ca3..3f8b6a0887fe64eccb4aa1c8ea60aec86529b886 100755 (executable)
--- 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 7b0c629653fa7363f52f76bef175e4c7e15ac91e..297ddb1cacd9a06064209f33f3d490e7fa0fc277 100644 (file)
--- 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*-*-*)