Update.

2002-04-09  Ulrich Drepper  <drepper@redhat.com>

	* extra-lib.mk: Mark assignment to lib with override.

diff --git a/ChangeLog b/ChangeLog
index aac916aa811ab4b8d73e7d06b4fd5af55595c83a..e786cacfd012ff90750782cb0605dc106e90b65c 100644 (file)
--- 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 2a8227f3697a2bb786f49207adabaeb24c705a01..d48f0faaa188eed2ef8d603c4e16f61b377944bc 100644 (file)
--- 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 6eae476cf568556a2c7e32b25370de582c0cdfbf..ef66ac32aa1c2decc9fa95b8bdb95ee095567ab8 100644 (file)
--- 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);