From patchwork Mon Jul 10 12:03:33 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: 21492 Received: (qmail 5057 invoked by alias); 10 Jul 2017 12:03:38 -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 4706 invoked by uid 89); 10 Jul 2017 12:03:37 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 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-oi0-f68.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=T5IR9ZdGlJkBUay6dcbLFRw7yCdRH6gYFEYmKdpx/Wc=; b=LQkbq9m39IjxwUCfyaVMcpLEHVCSs0W3WA8TULKkekLMctKW+0/22q8u36Jyb0xaTv jctlJOxO1kF7SVd5gzU5odCe6xAdh/toVqh9YxNE7YWHBrF5+5Gwv9pG3I5r6CXgNDFO k3IQxgrvlR+yqNAdf0/p8fN5ehjeM2AFosvS4aDPTuqccsZ8x1MN4TD+HbR03wj5Pk7z zp/ZSVHGvZHpurtHAQ0hO6NAQOEDAqBUmw8O8nHTFPpRqnZ0w/6eNGZUWdHm/EEXObIC QDhdNK6zEv7vWzAJWTksFGveghfXyWavsT+fEOx5wlOtqHWzIDs8EySVIxXXkYVFcQTr j3yA== X-Gm-Message-State: AIVw111Zdbt+hFQTHPlBPeBzEC0HNViCzHFKaanEv+AI+JV9UiJkf7BU ypp2rFivHbmhE3aOuMwgvMQsF10YtnT2 X-Received: by 10.202.232.135 with SMTP id f129mr8864871oih.157.1499688214299; Mon, 10 Jul 2017 05:03:34 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: References: <20170709210507.GA14761@gmail.com> From: "H.J. Lu" Date: Mon, 10 Jul 2017 05:03:33 -0700 Message-ID: Subject: Re: [PATCH] Don't include _dl_resolve_conflicts in libc.a [BZ #21742] To: Andreas Schwab Cc: GNU C Library On Mon, Jul 10, 2017 at 12:23 AM, Andreas Schwab wrote: > On Jul 09 2017, "H.J. Lu" wrote: > >> Since _dl_resolve_conflicts is only used in elf/rtld.c, don't include >> it in libc.a. >> >> OK for master? > > Add it to shared-only-routines instead. > I think adding it to rtld-routines it more appropriate. Here is the updated patch. OK for master? Thanks. From f0dbaf3228dba8a775f4dfa8eb405c20a655ec7f Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sun, 9 Jul 2017 11:52:33 -0700 Subject: [PATCH] Don't include _dl_resolve_conflicts in libc.a [BZ #21742] Since _dl_resolve_conflicts is only used in elf/rtld.c, don't include it in libc.a. [BZ #21742] * elf/Makefile (dl-routines): Move dl-conflict to ... (rtld-routines): Here. --- elf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elf/Makefile b/elf/Makefile index 201b328..e758a4c 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -30,7 +30,7 @@ routines = $(all-dl-routines) dl-support dl-iteratephdr \ # profiled libraries. dl-routines = $(addprefix dl-,load lookup object reloc deps hwcaps \ runtime init fini debug misc \ - version profile conflict tls origin scope \ + version profile tls origin scope \ execstack caller open close trampoline) ifeq (yes,$(use-ldconfig)) dl-routines += dl-cache @@ -57,7 +57,7 @@ shared-only-routines += dl-caller # ld.so uses those routines, plus some special stuff for being the program # interpreter and operating independent of libc. rtld-routines = rtld $(all-dl-routines) dl-sysdep dl-environ dl-minimal \ - dl-error-minimal + dl-error-minimal dl-conflict all-rtld-routines = $(rtld-routines) $(sysdep-rtld-routines) CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables -- 2.9.4