From c4d7bd3907c64ce6ab670cfe97557881b6da2d32 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 3 Nov 2004 20:31:21 +0000 Subject: [PATCH] * debug/tst-chk1.c (ret): New volatile variable. (CHK_FAIL_END): Remove redundant ret setting. (do_test): Remote ret variable. --- ChangeLog | 6 ++++++ debug/tst-chk1.c | 4 +--- nptl/ChangeLog | 4 ++++ nptl/sysdeps/unix/sysv/linux/smp.h | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1f07a9..280c717 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-11-02 Jakub Jelinek + + * debug/tst-chk1.c (ret): New volatile variable. + (CHK_FAIL_END): Remove redundant ret setting. + (do_test): Remote ret variable. + 2004-01-03 Paolo Bonzini * posix/regex_internal.h (__regfree) [!_LIBC]: Define to regfree. diff --git a/debug/tst-chk1.c b/debug/tst-chk1.c index 639da38..ef7f278 100644 --- a/debug/tst-chk1.c +++ b/debug/tst-chk1.c @@ -50,7 +50,7 @@ do_prepare (void) } } -volatile int chk_fail_ok; +volatile int chk_fail_ok, ret; jmp_buf chk_fail_buf; static void @@ -86,7 +86,6 @@ int num2 = 987654; #define CHK_FAIL_END \ chk_fail_ok = 0; \ FAIL (); \ - ret = 1; \ } #if __USE_FORTIFY_LEVEL >= 2 #define CHK_FAIL2_START CHK_FAIL_START @@ -99,7 +98,6 @@ int num2 = 987654; static int do_test (void) { - int ret = 0; struct sigaction sa; sa.sa_handler = handler; sa.sa_flags = 0; diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 33e2d8a..f7c87c2 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,7 @@ +2004-11-02 Jakub Jelinek + + * sysdeps/unix/sysv/linux/smp.h: Include . + 2004-10-29 Kaz Kojima * sysdeps/unix/sysv/linux/sh/sem_timedwait.S (sem_timedwait): diff --git a/nptl/sysdeps/unix/sysv/linux/smp.h b/nptl/sysdeps/unix/sysv/linux/smp.h index c1160a7..4f4d358 100644 --- a/nptl/sysdeps/unix/sysv/linux/smp.h +++ b/nptl/sysdeps/unix/sysv/linux/smp.h @@ -17,6 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include -- 2.7.4