Date: Sat, 24 Mar 2012 19:14:44 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r233431 - head/libexec/rtld-elf Message-ID: <201203241914.q2OJEiVl045301@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Sat Mar 24 19:14:44 2012 New Revision: 233431 URL: http://svn.freebsd.org/changeset/base/233431 Log: Remove libssp_nonshared from the rtld linking set. The only use for the library was definition for the weak alias of __stack_chk_fail. No objections from: kan MFC after: 2 weeks Modified: head/libexec/rtld-elf/Makefile head/libexec/rtld-elf/rtld.c Modified: head/libexec/rtld-elf/Makefile ============================================================================== --- head/libexec/rtld-elf/Makefile Sat Mar 24 19:13:10 2012 (r233430) +++ head/libexec/rtld-elf/Makefile Sat Mar 24 19:14:44 2012 (r233431) @@ -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 Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Sat Mar 24 19:13:10 2012 (r233430) +++ head/libexec/rtld-elf/rtld.c Sat Mar 24 19:14:44 2012 (r233431) @@ -4390,6 +4390,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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203241914.q2OJEiVl045301>