From patchwork Tue Feb 23 23:39:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nix X-Patchwork-Id: 11023 Received: (qmail 50966 invoked by alias); 23 Feb 2016 23:39:56 -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 50837 invoked by uid 89); 23 Feb 2016 23:39:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.9 required=5.0 tests=AWL, BAYES_50, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD autolearn=no version=3.3.2 spammy=6747, 674, 7, UD:7.0.198.g6dd47b6, UD:2.7.0.198.g6dd47b6 X-HELO: mail.esperi.org.uk From: Nix To: libc-alpha@sourceware.org Cc: carlos@redhat.com Subject: [PATCH 08/14] Link libc.so with libc_nonshared.a to pull in __stack_chk_fail. Date: Tue, 23 Feb 2016 23:39:31 +0000 Message-Id: <1456270777-9083-9-git-send-email-nix@esperi.org.uk> In-Reply-To: <1456270777-9083-1-git-send-email-nix@esperi.org.uk> References: <1456270777-9083-1-git-send-email-nix@esperi.org.uk> X-DCC-wuwien-Metrics: spindle 1290; Body=2 Fuz1=2 Fuz2=2 From: Nick Alcock This prevents a spurious undefined reference from libc (which would be an ABI break). --- Makerules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makerules b/Makerules index 53eabfa..d369d78 100644 --- a/Makerules +++ b/Makerules @@ -674,6 +674,7 @@ $(common-objpfx)linkobj/libc.so: link-libc-deps = # empty # libraries. $(common-objpfx)libc.so: $(elf-objpfx)soinit.os \ $(common-objpfx)libc_pic.os$(libc_pic_clean) \ + $(common-objpfx)libc_nonshared.a \ $(elf-objpfx)sofini.os \ $(elf-objpfx)interp.os \ $(elf-objpfx)ld.so \ @@ -683,6 +684,7 @@ $(common-objpfx)libc.so: $(elf-objpfx)soinit.os \ $(common-objpfx)linkobj/libc.so: $(elf-objpfx)soinit.os \ $(common-objpfx)linkobj/libc_pic.a \ + $(common-objpfx)libc_nonshared.a \ $(elf-objpfx)sofini.os \ $(elf-objpfx)interp.os \ $(elf-objpfx)ld.so \