From patchwork Wed Sep 26 05:03:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 147535 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp262659lji; Tue, 25 Sep 2018 22:05:29 -0700 (PDT) X-Google-Smtp-Source: ACcGV62Fi010WLbqPxFdrpcRtc+dMut5N6AksbrjeRz90DNHJNSHof3G0ChaAmaE+mhyz1p6/Jky X-Received: by 2002:a62:da1c:: with SMTP id c28-v6mr4413655pfh.68.1537938329024; Tue, 25 Sep 2018 22:05:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537938329; cv=none; d=google.com; s=arc-20160816; b=xJ3vQUtUe919M3C7xrlXBh3v4oVLwjpOSqxt0Y7sGruL44Eytj3oPWaHuslOSdGv7x 2Jw3kMnDvdl3Z3fd2H23TX962gnU1aHReKG9SdZbIvSsMii/6XUfEcJ6kPTUk6go3x67 28jeTLrBbbDb+fdxXRXcWhS2TlrVeZDEd839NM+EXYnrc57dSqVFpC4CzVeb31p/jBQL 8WvY1XjvQut7YAl5AWw38tN5rKAfIGFI2TrXtWJqBvs+6AgNmnkeyLT8G7Vfebxtm4e+ bBoAiiygYwgWOffSPWI32OkeDv5fIcih12v5shs1PZgjQgzVAB9BjiAqXO2N+M5YMp7T rr9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:delivered-to:sender:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature; bh=Zsw1gML1OXsYY+ur8r6ScUCibizpYOy9idt1rQoMres=; b=A6X0wyF7G+7MYaCryGV2nUG7jtOA/C5Ez/pUI380GeD88TByl2Qy9ToHoyPE6ZUevw I3ZBUhuv7YtX5tbh/da374zn9jqZB6Q8AuygoFpXKTEE6G9jyXLrtn7iCD3pHe/RdWJB /Dh/XqXLG29nl6G/4PtKEGJlcBWp+k3P3gMFtB9vnjvF3z5ev3oh+dVlOQUkIaHHSYSo +PhHzlyccARSQJFB9deZyn9Xt5UU5UnCL+ap2UG07XakOr443/Diy4fAsb16Ef19SKwJ X1lwOGL5SNngq10+bOlz/hjr9zqkwHYlz86U+3SpQlDjtBOr95c+7hOUDBBoL0IV16DS F5sA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=KFXqPZhW; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Y5CjeT24; spf=pass (google.com: domain of gcc-patches-return-486388-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="gcc-patches-return-486388-patch=linaro.org@gcc.gnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id s16-v6si3528556pgg.19.2018.09.25.22.05.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 22:05:29 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-return-486388-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=KFXqPZhW; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Y5CjeT24; spf=pass (google.com: domain of gcc-patches-return-486388-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="gcc-patches-return-486388-patch=linaro.org@gcc.gnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references; q=dns; s= default; b=Uz02X1M6Pnr6H5fBh/bTUj1l+FTif9SO4VqafLEsAAkFnA/H1HNfa puT0pyyjU8Ae7txuzegE82bBkK1TV6XjUUtl/+tqXI/O5cUFx0PBsq/kcy5KdJNa +c4SjXRZK6W21o75qQo0ac+YOCpLUXKKpuF+8aI1zSdH422USI2F7Q= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references; s= default; bh=zv0LMWU3ewfBPBw4VuJVsrCK+yk=; b=KFXqPZhWgLH24pY0wji7 8SRKZ0N6Ey+si7z1zt3tp/G34H5QxfQEgIS1ARoHRq1+sIuX37G5f8a0M5Tj2ajN 9xZB/P9MClC/nPv+8Omq2wrd3mNXyeygiMThca8N/BoN8T9y7/30E2sJpt+o1qB3 IFVMkyutpKy+TE9tXMvkmZ0= Received: (qmail 74123 invoked by alias); 26 Sep 2018 05:04:08 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 73948 invoked by uid 89); 26 Sep 2018 05:04:07 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=HX-Received:2d24, HX-Received:sk:o33-v6m, H*r:sk:y4-v6so, HX-HELO:sk:mail-pg X-HELO: mail-pg1-f180.google.com Received: from mail-pg1-f180.google.com (HELO mail-pg1-f180.google.com) (209.85.215.180) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 26 Sep 2018 05:04:06 +0000 Received: by mail-pg1-f180.google.com with SMTP id y4-v6so13213220pgp.9 for ; Tue, 25 Sep 2018 22:04:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Zsw1gML1OXsYY+ur8r6ScUCibizpYOy9idt1rQoMres=; b=Y5CjeT24AkN4aWRjO+ymoCQbxu8tXlgKCs/U1aUKquHBLygrub9cuuM5SjlXMdQJDa nMBScwjSmvF3JTtDv6opvgV+j+05dcgIIJHMQOvZe7wie2SN3VfxrKRIFBbmE8ZvGOcN Gkq1j5ApWcyOU2Fq1V4VeygX+6O9euDzcd+lSwmu9dE4rnldm6b7X8jXLr2B2CGP904z i0F3dC9ihV7rjo6NPpq6I6LdfXJa9dSKEWXqR13uzSM/bw7eskWtIJt1alOO2zxxH0us DIbOAN2uofA3yDP6XAOTElAEsHkuPCyskwleu+7BR99JKFnPF/Z8fkxv28wBMnO3oems wJ8w== Return-Path: Received: from cloudburst.twiddle.net (97-113-8-179.tukw.qwest.net. [97.113.8.179]) by smtp.gmail.com with ESMTPSA id j22-v6sm4954650pfh.45.2018.09.25.22.04.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Sep 2018 22:04:03 -0700 (PDT) From: rth7680@gmail.com To: gcc-patches@gcc.gnu.org Cc: ramana.radhakrishnan@arm.com, agraf@suse.de, matz@suse.de, Richard Henderson Subject: [PATCH, AArch64 07/11] Link static libgcc after shared libgcc for -shared-libgcc Date: Tue, 25 Sep 2018 22:03:51 -0700 Message-Id: <20180926050355.32746-8-richard.henderson@linaro.org> In-Reply-To: <20180926050355.32746-1-richard.henderson@linaro.org> References: <20180926050355.32746-1-richard.henderson@linaro.org> From: Richard Henderson We are about to introduce symbols to libgcc.a that will not be present in libgcc_s.so. Most symbols will be resolved from the shared library first, and only the new symbols will be pulled from the static library. * gcc.c (init_gcc_specs): Include static_name after shared_name. --- gcc/gcc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/gcc/gcc.c b/gcc/gcc.c index 264204d7b37..4a7ca691122 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -1676,9 +1676,8 @@ init_gcc_specs (struct obstack *obstack, const char *shared_name, static_name, " " LD_AS_NEEDED_OPTION " ", shared_name, " " LD_NO_AS_NEEDED_OPTION "}" - "%{shared-libgcc:", - shared_name, "%{!shared: ", static_name, "}" - "}}" + "%{shared-libgcc:", shared_name, " ", static_name, "}" + "}" #else buf = concat ("%{static|static-libgcc:", static_name, " ", eh_name, "}" "%{!static:%{!static-libgcc:" @@ -1688,11 +1687,11 @@ init_gcc_specs (struct obstack *obstack, const char *shared_name, "}" #ifdef LINK_EH_SPEC "%{shared:" - "%{shared-libgcc:", shared_name, "}" + "%{shared-libgcc:", shared_name, " ", static_name, "}" "%{!shared-libgcc:", static_name, "}" "}" #else - "%{shared:", shared_name, "}" + "%{shared:", shared_name, " ", static_name, "}" #endif #endif "}}", NULL);