aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/go/gofrontend/MERGE2
-rwxr-xr-xlibgo/configure2
-rw-r--r--libgo/configure.ac2
3 files changed, 3 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 3ba3462..b03c3fb 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 4e83816..3f8b6a0 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 7b0c629..297ddb1 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*-*-*)