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: 974853 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-486388-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="cpIqAC92"; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Y5CjeT24"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42Km901YQTz9s8F for ; Wed, 26 Sep 2018 15:05:24 +1000 (AEST) 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=j5QBoxFY2GkFGU22ooFFqHas2zRSoSuLzrRo7kwmR5EYQLAuaJe8c 5r+m4CmkSasC0jDxsPR3xDRs9TaibRRcsfnqfoFbRlaiJwhBNHoAQTm2fhLfb0Jh JjR1DhS/OtroXFar2ajOr3ZVBfdVnmv42b8V2UrROMhaj+5pcrKDMY= 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=cpIqAC92AtvqBPmeTsS0 r4QP4tT2ExvEQnhE1cGfrWN6R35cjwDJR/Mpi4TZA2qU+tlHa9XreZ39TqXKV73k HxywVC1htCc9gOnZhl0ueNPWDh09BJ+wFgSjNtdZ2d5YeA7DEfI1mIgUPPmUx/7c s6wBJD/+M9Mj1Z93aV+O4Zg= 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== 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(-) 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);