From patchwork Wed Aug 12 18:34:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 1343830 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=ofCn2C6X; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BRdds6cRcz9sTN for ; Thu, 13 Aug 2020 04:34:24 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 936903861971; Wed, 12 Aug 2020 18:34:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 936903861971 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1597257261; bh=L13TMG/qb86/jBhUB5qDWfiG+hYmJvMuler7b2hOq8U=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=ofCn2C6X+1roZwJK0fY23Va8PsalJ5jFaS2pY56a8vKCEExhAKfihF4csMOX/Bes7 sJhB9/iZ/+r+MvcFYhJEVfteTAG769nJNzjm3CkxSOJM2byF25bxnm7tIV3tAidPZQ f+mF9tw5yYzHTjALsdCjA2pdvStFyKj9mje+HfoY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by sourceware.org (Postfix) with ESMTPS id 147763858D38 for ; Wed, 12 Aug 2020 18:34:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 147763858D38 Received: by mail-ej1-x636.google.com with SMTP id m22so3342101eje.10 for ; Wed, 12 Aug 2020 11:34:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=L13TMG/qb86/jBhUB5qDWfiG+hYmJvMuler7b2hOq8U=; b=QSIJk4cCs4pOwCp/amAudvfwBaDyUTOK72TK5jB0Tu/jm7Ln0p8hDE7YmxSt2CXaAh XycfDA7FieTL9+FSJTql4p8G1G95Kxb7coDrH5wKAyCC+pmrPb5MjObdfQ8J70ktqFcI oaQJ0KwFEBlnM9yLmvR/tB68nYf4V0q/AzSxVSN1dAnSbK6FhzxxrQ2iBL0TdWXLCzIC DMxYtDiCyiO+berymeUXQAtqRellSIaktTtrL8qfNx9lcQqiLcJ7jPP3pETZcTScIMft +qhOoyabjs8jQ8Q7rBV0mYsv9gJ69BchFXhgiUwFkYQ3eJ0BA8eNYBtAe4sEoRhMEctI Fcyg== X-Gm-Message-State: AOAM53354exrloxYMJsRstrBtWyNQSw5zylTPvdsWGp8nWQOP5ogdvgA G284lxe4auVB5l6ORGKgQp/SEbth3AJ/KBmkFyATexaplaE= X-Google-Smtp-Source: ABdhPJwVjBe2CV13IJ69EuYWMBiM66J/dSPKbtDHyardxlxIj8tlygCNtbakxjCTySJmk1D5dbyPL3gvyJW1tqlcvy8= X-Received: by 2002:a17:907:20e6:: with SMTP id rh6mr1097532ejb.301.1597257257911; Wed, 12 Aug 2020 11:34:17 -0700 (PDT) MIME-Version: 1.0 Date: Wed, 12 Aug 2020 11:34:06 -0700 Message-ID: Subject: To: gcc-patches , gofrontend-dev X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Ian Lance Taylor via Gcc-patches From: Ian Lance Taylor Reply-To: Ian Lance Taylor Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" This libgo patch by Clément Chigot correctly handles AIX FAT library creation. The previous patch wasn't working everytime. Especially when AR had "-X32_64", the new .so would replace the default one and not just being added. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline. Ian de93b8d5bfb3d2652e5e166f3e4db1c25a3a2c57 diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 08daa1a5924..e443282d0e8 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -e08f1d7d1bc14c0a29eb9ee17980f14fa2397239 +fe5d94c5792f7f990004c3dee0ea501835512200 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 88ea2728bc3..1112ee27df6 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -1244,8 +1244,15 @@ endif all-local: $(ALL_LOCAL_DEPS) MAJOR=$(firstword $(subst :, ,$(libtool_VERSION))) + +# If we want to use "AR -r" when creating AIX FAT archives, +# AR must be stripped of all its -X flags. +# Otherwize, if AR was defined with -X32_64, the replace option would +# erase the default .so when adding the extra one. There is no +# order priority within -X flags. add-aix-fat-library: all-multi @if test "$(MULTIBUILDTOP)" = ""; then \ - ${AR} -X$(AIX_DEFAULT_ARCH) rc .libs/$(PACKAGE).a ../ppc$(AIX_DEFAULT_ARCH)/$(PACKAGE)/.libs/$(PACKAGE).so.$(MAJOR); \ - ${AR} -X$(AIX_DEFAULT_ARCH) rc ../pthread/$(PACKAGE)/.libs/$(PACKAGE).a ../pthread/ppc$(AIX_DEFAULT_ARCH)/$(PACKAGE)/.libs/$(PACKAGE).so.$(MAJOR); \ + 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); \ fi diff --git a/libgo/configure.ac b/libgo/configure.ac index db5848e36ad..abc58b87b53 100644 --- a/libgo/configure.ac +++ b/libgo/configure.ac @@ -38,12 +38,12 @@ case ${host} in GOCFLAGS="$GOCFLAGS -fno-section-anchors" # Check default architecture for FAT library creation - if test -z "`$(CC) -x c -E /dev/null -g3 -o - | grep 64BIT`" ; then - AIX_DEFAULT_ARCH='64' + if test -z "`$CC -x c -E /dev/null -g3 -o - | grep 64BIT`" ; then + AIX_EXTRA_ARCH='64' else - AIX_DEFAULT_ARCH='32' + AIX_EXTRA_ARCH='32' fi - AC_SUBST(AIX_DEFAULT_ARCH) + AC_SUBST(AIX_EXTRA_ARCH) ;; esac