Date: Sat, 7 Apr 2012 05:43:50 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r233987 - stable/9/libexec/rtld-elf Message-ID: <201204070543.q375hoeU045337@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Sat Apr 7 05:43:50 2012 New Revision: 233987 URL: http://svn.freebsd.org/changeset/base/233987 Log: 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. Modified: stable/9/libexec/rtld-elf/Makefile stable/9/libexec/rtld-elf/rtld.c Directory Properties: stable/9/libexec/rtld-elf/ (props changed) Modified: stable/9/libexec/rtld-elf/Makefile ============================================================================== --- stable/9/libexec/rtld-elf/Makefile Sat Apr 7 05:42:37 2012 (r233986) +++ stable/9/libexec/rtld-elf/Makefile Sat Apr 7 05:43:50 2012 (r233987) @@ -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: stable/9/libexec/rtld-elf/rtld.c ============================================================================== --- stable/9/libexec/rtld-elf/rtld.c Sat Apr 7 05:42:37 2012 (r233986) +++ stable/9/libexec/rtld-elf/rtld.c Sat Apr 7 05:43:50 2012 (r233987) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204070543.q375hoeU045337>