From 75a696fe8b0283fd1447161fba30f7e114fc1680 Mon Sep 17 00:00:00 2001
From: kib <kib@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sat, 7 Apr 2012 05:43:50 +0000
Subject: [PATCH] MFC r233431: Remove libssp_nonshared from the rtld linking
 set. The only use for the library was definition for the weak alias of
 __stack_chk_fail.

git-svn-id: svn://svn.freebsd.org/base/stable/9@233987 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 libexec/rtld-elf/Makefile | 2 +-
 libexec/rtld-elf/rtld.c   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 7a7bb7faf..80737e8c4 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -40,7 +40,7 @@ CFLAGS+=	-fpic
 CFLAGS+=	-DPIC $(DEBUG)
 LDFLAGS+=	-shared -Wl,-Bsymbolic
 DPADD=		${LIBC_PIC}
-LDADD=		-lc_pic -lssp_nonshared
+LDADD=		-lc_pic
 
 .if ${MK_SYMVER} == "yes"
 LIBCDIR=	${TOPSRCDIR}/lib/libc
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 1ba4442d8..3aba27993 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -4410,6 +4410,7 @@ __stack_chk_fail(void)
 	_rtld_error("stack overflow detected; terminated");
 	die();
 }
+__weak_reference(__stack_chk_fail, __stack_chk_fail_local);
 
 void
 __chk_fail(void)
-- 
2.45.0