diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index bc954f02cbda9..97be99e0c021c 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -df6046971233854e5b7533140d4ead095ab69857 +9806c8a8e4e448eaf6810ff1acffa715745d2549 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 6fd742b50b08c..3c866f7f21a83 100755 --- a/libgo/configure +++ b/libgo/configure @@ -13841,7 +13841,6 @@ _ACEOF if ac_fn_c_try_compile "$LINENO"; then : GOARCH=sparc GOARCH_FAMILY=SPARC -GOARCH_INT64ALIGN=4 else GOARCH=sparc64 diff --git a/libgo/configure.ac b/libgo/configure.ac index ef0e700db47c8..2951392ed1603 100644 --- a/libgo/configure.ac +++ b/libgo/configure.ac @@ -364,7 +364,6 @@ GOARCH_MINFRAMESIZE=8 #endif], [GOARCH=sparc GOARCH_FAMILY=SPARC -GOARCH_INT64ALIGN=4 ], [GOARCH=sparc64 GOARCH_FAMILY=SPARC64