diff options
| author | kib <kib@FreeBSD.org> | 2012-03-24 19:14:44 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2012-03-24 19:14:44 +0000 |
| commit | e546223a7dd821a4c793b526c0bed8ba4003cf6d (patch) | |
| tree | 4512f1ef5bc48bf2c6231eb94521ebf6365fe33b /libexec | |
| parent | 196786e250a16f561fff3d9c357a6424c8b44377 (diff) | |
| download | FreeBSD-src-e546223a7dd821a4c793b526c0bed8ba4003cf6d.zip FreeBSD-src-e546223a7dd821a4c793b526c0bed8ba4003cf6d.tar.gz | |
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
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/rtld-elf/Makefile | 2 | ||||
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index 7a7bb7f..80737e8 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 b3d3329..e081e09 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -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) |
