summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/go/gofrontend/MERGE2
-rwxr-xr-xlibgo/configure1
-rw-r--r--libgo/configure.ac1
3 files changed, 1 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index bc954f02cbd..97be99e0c02 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 6fd742b50b0..3c866f7f21a 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 ef0e700db47..2951392ed16 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