diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2009-12-19 14:02:14 -0800 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2009-12-19 14:03:00 -0800 |
| commit | 875d11eec5df38bae0003df4a884ef962cf28590 (patch) | |
| tree | 83667b7ab2470a3aba40fb9ee868784d77d7e900 /libc/sysdeps/linux | |
| parent | f3217f9be3225c4943677d03b274cbc0cb4ed228 (diff) | |
| parent | 23528282b771d1af3df0fa17f1e909ad3b663f59 (diff) | |
Merge commit 'origin/master' into nptl
Conflicts:
libc/signal/sigpause.c
libc/string/x86_64/memset.S
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libc/sysdeps/linux')
| -rw-r--r-- | libc/sysdeps/linux/common/ssp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libc/sysdeps/linux/common/ssp.c b/libc/sysdeps/linux/common/ssp.c index 69611cab5..a2d7ff2ca 100644 --- a/libc/sysdeps/linux/common/ssp.c +++ b/libc/sysdeps/linux/common/ssp.c @@ -100,7 +100,6 @@ void __stack_chk_fail(void) terminate(); } -#if 0 void __chk_fail(void) attribute_noreturn; void __chk_fail(void) { @@ -115,4 +114,4 @@ void __chk_fail(void) while(1) terminate(); } -#endif + |