diff options
| author | Clément Chigot <clement.chigot@atos.net> | 2020-08-26 10:08:48 +0200 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-08-26 16:18:06 -0700 |
| commit | 6b0b6a3868f34b1462744cfa003c2c6ac18ef28e (patch) | |
| tree | 557c5bdfcdd4523bd0d58a5a9c2eb03725b1cbce | |
| parent | 07545fbd2dfa2351218a5be6488dc5067258d980 (diff) | |
| download | gcc-6b0b6a3868f34b1462744cfa003c2c6ac18ef28e.zip gcc-6b0b6a3868f34b1462744cfa003c2c6ac18ef28e.tar.gz gcc-6b0b6a3868f34b1462744cfa003c2c6ac18ef28e.tar.bz2 | |
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.
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/250777
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/Makefile.am | 4 | ||||
| -rw-r--r-- | libgo/Makefile.in | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index e425f15..2f0865b 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 1112ee2..9ce0cab 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 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 @@ 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 # Tell versions [3.59,3.63) of GNU make to not export all variables. |