commit aac2b382839154d74eeef160522c0a5c1ea8aadf
author Clément Chigot <clement.chigot@atos.net> Wed Aug 26 10:08:48 2020 +0200
committer Ian Lance Taylor <iant@golang.org> Wed Aug 26 23:17:04 2020 +0000
tree 77474009abd38ec0bdc7db96f784964c3d3a5d15
parent 823c91088bc6ac606362fc34b2880ce0de1624ad

libgo: add FAT library support for static libraries on AIX

Like shared libraries, AIX static libraries must also have both 32 and
64 bit objects.

Change-Id: Ida39532db6bfc61868ab3fa9495ff1d8e7d5a9d7
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/250777
Reviewed-by: Ian Lance Taylor <iant@golang.org>

libgo/Makefile.am

diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 1112ee2..9ce0cab 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -1255,4 +1255,8 @@
 	  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

libgo/Makefile.in

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 1fb8da6..b577083 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -3129,6 +3129,10 @@
 	  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
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.