diff options
| author | Alexander Kabaev <kan@FreeBSD.org> | 2009-06-29 01:33:59 +0000 |
|---|---|---|
| committer | Alexander Kabaev <kan@FreeBSD.org> | 2009-06-29 01:33:59 +0000 |
| commit | d48890cfb8cf92f9f2d49763781b20fd01e1e9d4 (patch) | |
| tree | b971befb61e661c38ca8a12e087cc3b59f93ce95 /lib/libc | |
| parent | a162c9ae9c55a9593b15ef618f4df0a045e39dbd (diff) | |
Notes
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/Makefile | 2 | ||||
| -rw-r--r-- | lib/libc/sys/Symbol.map | 1 | ||||
| -rw-r--r-- | lib/libc/sys/stack_protector.c | 7 |
3 files changed, 8 insertions, 2 deletions
diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 4f13f8e1f5a51..cf9ef3aa77e41 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -26,7 +26,7 @@ PRECIOUSLIB= # DPADD+= ${LIBGCC} LDFLAGS+= -nodefaultlibs -LDADD+= -lgcc -lssp_nonshared +LDADD+= -lgcc # Define (empty) variables so that make doesn't give substitution # errors if the included makefiles don't change these: diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map index 41f34ae9b4d7d..88bc779f2ca6b 100644 --- a/lib/libc/sys/Symbol.map +++ b/lib/libc/sys/Symbol.map @@ -282,6 +282,7 @@ FBSD_1.0 { socket; socketpair; __stack_chk_fail; + __stack_chk_fail_local; __stack_chk_guard; stat; statfs; diff --git a/lib/libc/sys/stack_protector.c b/lib/libc/sys/stack_protector.c index 63beebc1c9443..f753fcddd4b7d 100644 --- a/lib/libc/sys/stack_protector.c +++ b/lib/libc/sys/stack_protector.c @@ -47,6 +47,7 @@ static void __guard_setup(void) __attribute__((__constructor__, __used__)); static void __fail(const char *); void __stack_chk_fail(void); void __chk_fail(void); +void __stack_chk_fail_local(void); /*LINTED used*/ static void @@ -108,4 +109,8 @@ __chk_fail(void) __fail("buffer overflow detected; terminated"); } -__sym_compat(__stack_chk_fail_local, __stack_chk_fail, FBSD_1.0); +void +__stack_chk_fail_local(void) +{ + __stack_chk_fail(); +} |