From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1059) id D6011394743D; Fri, 28 Aug 2020 16:07:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D6011394743D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1598630844; bh=lZgDxkslCfiHEM/pmmA/QnNi1giQB91g3t5EKGDGlXQ=; h=From:To:Subject:Date:From; b=o5pMX0NBE0K7vJa13IIni+NWNxOantGqmLthTallFLSwOZAB8NtL7fZLhGYOVZ6+y 7RNU363Ozka7NfTZcTOsEbeYX2+hCuSkVKAN8zI/uTIrPu+31mQywFeRimNUqauRsp aDiazLlgcAFaV+BiXrVMOrD64nEWlvwc8J0KB44Y= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Nathan Sidwell To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/c++-modules] libgo: add FAT library support for static libraries on AIX X-Act-Checkin: gcc X-Git-Author: =?utf-8?q?Cl=C3=A9ment_Chigot?= X-Git-Refname: refs/heads/devel/c++-modules X-Git-Oldrev: 07545fbd2dfa2351218a5be6488dc5067258d980 X-Git-Newrev: 6b0b6a3868f34b1462744cfa003c2c6ac18ef28e Message-Id: <20200828160724.D6011394743D@sourceware.org> Date: Fri, 28 Aug 2020 16:07:24 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Aug 2020 16:07:24 -0000 https://gcc.gnu.org/g:6b0b6a3868f34b1462744cfa003c2c6ac18ef28e commit 6b0b6a3868f34b1462744cfa003c2c6ac18ef28e Author: Clément Chigot Date: Wed Aug 26 10:08:48 2020 +0200 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 Diff: --- gcc/go/gofrontend/MERGE | 2 +- libgo/Makefile.am | 4 ++++ libgo/Makefile.in | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) 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 diff --git a/libgo/Makefile.in b/libgo/Makefile.in index 1fb8da6f552..b5770831556 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.