libgo patch committed: Add FAT library support for AIX static libraries

[Ian Lance Taylor via Gcc-patches]

This libgo patch by Clément Chigot adds FAT library support for static
libraries on AIX.  Like shared libraries, AIX static libraries must
also have both 32 and 64 bit objects.  Bootstrapped and ran Go
testsuite on x86_64-pc-linux-gnu.  Committed to mainline.

Ian

a66f773796a78d61891f5e78d275aeb46260e7ca
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index e425f15285e..2f0865b7c80 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-823c91088bc6ac606362fc34b2880ce0de1624ad
+aac2b382839154d74eeef160522c0a5c1ea8aadf
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 1112ee27df6..9ce0cab9d6a 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -1255,4 +1255,8 @@ add-aix-fat-library: all-multi
          arx=`echo $(AR) | sed -e 's/-X[^ ]*//g'`; \
          $${arx} -X$(AIX_EXTRA_ARCH) rc .libs/$(PACKAGE).a 
../ppc$(AIX_EXTRA_ARCH)/$(PACKAGE)/.libs/$(PACKAGE).so.$(MAJOR); \
          $${arx} -X$(AIX_EXTRA_ARCH) rc 
../pthread/$(PACKAGE)/.libs/$(PACKAGE).a 
../pthread/ppc$(AIX_EXTRA_ARCH)/$(PACKAGE)/.libs/$(PACKAGE).so.$(MAJOR); \
+         $${arx} -X$(AIX_EXTRA_ARCH) rc libgobegin.a 
../ppc$(AIX_EXTRA_ARCH)/$(PACKAGE)/$(libgobegin_a_OBJECTS); \
+         $${arx} -X$(AIX_EXTRA_ARCH) rc ../pthread/$(PACKAGE)/libgobegin.a 
../pthread/ppc$(AIX_EXTRA_ARCH)/$(PACKAGE)/$(libgobegin_a_OBJECTS); \
+         $${arx} -X$(AIX_EXTRA_ARCH) rc libgolibbegin.a 
../ppc$(AIX_EXTRA_ARCH)/$(PACKAGE)/$(libgolibbegin_a_OBJECTS); \
+         $${arx} -X$(AIX_EXTRA_ARCH) rc ../pthread/$(PACKAGE)/libgolibbegin.a 
../pthread/ppc$(AIX_EXTRA_ARCH)/$(PACKAGE)/$(libgolibbegin_a_OBJECTS); \
        fi