diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | extra-lib.mk | 2 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/pthread/timer_routines.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index aac916aa81..e786cacfd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-04-09 Ulrich Drepper <drepper@redhat.com> + + * extra-lib.mk: Mark assignment to lib with override. + 2002-04-08 Ulrich Drepper <drepper@redhat.com> * Makerules: Use cppflags-iterator.mk to add defines for all test diff --git a/extra-lib.mk b/extra-lib.mk index 2a8227f369..d48f0faaa1 100644 --- a/extra-lib.mk +++ b/extra-lib.mk @@ -6,7 +6,7 @@ # to be included in that library. A sysdep Makefile can add to # $(lib)-sysdep_routines to include additional modules. -lib := $(firstword $(extra-libs-left)) +override lib := $(firstword $(extra-libs-left)) extra-libs-left := $(filter-out $(lib),$(extra-libs-left)) object-suffixes-$(lib) := $(filter-out $($(lib)-inhibit-o),$(object-suffixes)) diff --git a/linuxthreads/sysdeps/pthread/timer_routines.c b/linuxthreads/sysdeps/pthread/timer_routines.c index 6eae476cf5..ef66ac32aa 100644 --- a/linuxthreads/sysdeps/pthread/timer_routines.c +++ b/linuxthreads/sysdeps/pthread/timer_routines.c @@ -416,7 +416,7 @@ thread_func (void *arg) timer->overrun_count = 0; timespec_add (&timer->expirytime, &timer->expirytime, &timer->value.it_interval); - while (timespec_compare(&timer->expirytime, &now) < 0) + while (timespec_compare (&timer->expirytime, &now) < 0) { timespec_add (&timer->expirytime, &timer->expirytime, &timer->value.it_interval); |