From patchwork Sun Jul 9 21:05:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 21484 Received: (qmail 104124 invoked by alias); 9 Jul 2017 21:05:14 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 104100 invoked by uid 89); 9 Jul 2017 21:05:12 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-pf0-f173.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=oFY0h4GE5Xu60LTCs11sPbEpV8GpdCrEKPV4iRWvtSg=; b=FhnscDCrd0MJJnUUuWlKyScwi1evG81krZgZVyxzkY4yIamxk3jtsiktM9r745juO0 uIhy4xPIPhi1t1NX5CD0Rc92M7DHu4ra66PKGyGcfwYCWZJBYf3wZIr1axfojSQIoA1X umY81q5nko1CZO+spVYw093lqL2Qop+t9KQHO45JjA6koUuZ56DYzrbNv+/xhixw/uMk LKUkOWf/ISPLjcnF6Fk8/gCu5HUjHdVkgCCjEZhf1ttmFyqO5fU6EEMW3uElcS7Ca+DQ twsfbjCg9I2E+dYco/w+acUzuPTTuEuE4Dy39MtiJJWI4W3ZPazO5mzcFkJVG0UfMPR4 2Iow== X-Gm-Message-State: AIVw112Ykry+S+0St57hLjL8P3KIu/Ti7HBvTRjmSH+NwwmgD5vZYVTT d+i/MB9UyVLCUXDX X-Received: by 10.99.166.17 with SMTP id t17mr11744991pge.60.1499634309220; Sun, 09 Jul 2017 14:05:09 -0700 (PDT) Date: Sun, 9 Jul 2017 14:05:07 -0700 From: "H.J. Lu" To: GNU C Library Subject: [PATCH] Don't include _dl_resolve_conflicts in libc.a [BZ #21742] Message-ID: <20170709210507.GA14761@gmail.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.8.3 (2017-05-23) Since _dl_resolve_conflicts is only used in elf/rtld.c, don't include it in libc.a. OK for master? H.J. --- [BZ #21742] * elf/dl-conflict.c (_dl_resolve_conflicts): Define only if SHARED is defined. --- elf/dl-conflict.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c index 3cbd074..875bf66 100644 --- a/elf/dl-conflict.c +++ b/elf/dl-conflict.c @@ -17,6 +17,7 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, see . */ +#ifdef SHARED #include #include #include @@ -72,3 +73,4 @@ _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict, } #endif } +#endif