diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 65badea861d..987aef7a6ef 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -841bea960b1f097e2cff5ad2618800296dcd4ec2 +b34c93bf00ec4f2ad043ec89ff96989e0d1b26aa 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 d3f64d2df53..137e7a66c86 100755 --- a/libgo/configure +++ b/libgo/configure @@ -13640,7 +13640,7 @@ case ${host} in GOARCH_FAMILY=ARM64 GOARCH_CACHELINESIZE=32 GOARCH_PHYSPAGESIZE=65536 - GOARCH_PCQUANTUm=4 + GOARCH_PCQUANTUM=4 GOARCH_MINFRAMESIZE=8 ;; arm*-*-* | strongarm*-*-* | ep9312*-*-* | xscale-*-*) diff --git a/libgo/configure.ac b/libgo/configure.ac index f33854503e3..2224f40c3ca 100644 --- a/libgo/configure.ac +++ b/libgo/configure.ac @@ -222,7 +222,7 @@ case ${host} in GOARCH_FAMILY=ARM64 GOARCH_CACHELINESIZE=32 GOARCH_PHYSPAGESIZE=65536 - GOARCH_PCQUANTUm=4 + GOARCH_PCQUANTUM=4 GOARCH_MINFRAMESIZE=8 ;; arm*-*-* | strongarm*-*-* | ep9312*-*-* | xscale-*-*)