diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index aff74bd74dc..5e8677b27f5 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -e997b0201512110e9c20b1fdfd40014830031047 +f5d708fd905d3f91d848a0ea25c77119f8af0c36 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 db89eae2a4f..db371bc76f1 100755 --- a/libgo/configure +++ b/libgo/configure @@ -14409,6 +14409,7 @@ esac test -z "$HWCAP_CFLAGS" && HWCAP_CFLAGS='' + # Restrict the test to Solaris, other assemblers (e.g. AIX as) have -nH # with a different meaning. case ${target_os} in