From edf205d5ef1528247fde0637572a4631e0f1a5c2 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 11 May 2003 23:28:52 +0000 Subject: [PATCH] Update. * io/Makefile ($(objpfx)ftwtest.out): Use absolute file names. 2003-05-11 Ulrich Drepper * time/tst-strftime.c (do_test): Add tests for - flag. 2003-05-11 Jim Meyering * time/strftime.c (my_strftime): Let the `-' (no-pad) flag affect the space-padded-by-default conversion specifiers, %e, %k, %l. 2003-05-11 Andreas Schwab --- ChangeLog | 13 +++++++++++++ io/Makefile | 5 +++-- nptl/ChangeLog | 4 ++++ nptl/cond-perf.c | 4 +++- time/strftime.c | 4 ++-- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e089f2e2aa..6e393e646e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2003-05-11 Andreas Schwab + + * io/Makefile ($(objpfx)ftwtest.out): Use absolute file names. + +2003-05-11 Ulrich Drepper + + * time/tst-strftime.c (do_test): Add tests for - flag. + +2003-05-11 Jim Meyering + + * time/strftime.c (my_strftime): Let the `-' (no-pad) flag affect + the space-padded-by-default conversion specifiers, %e, %k, %l. + 2003-05-11 Andreas Schwab * sysdeps/generic/sched_setaffinity.c: Fix parameter name. diff --git a/io/Makefile b/io/Makefile index 97bff3606c..0a222a234e 100644 --- a/io/Makefile +++ b/io/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1992-1999,2000,01,02 Free Software Foundation, Inc. +# Copyright (C) 1992-2002, 2003 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -83,5 +83,6 @@ ifeq ($(cross-compiling),no) tests: $(objpfx)ftwtest.out $(objpfx)ftwtest.out: $(objpfx)ftwtest - $(SHELL) -e ftwtest-sh $(common-objpfx) $( $@ + $(SHELL) -e ftwtest-sh $(shell cd $(common-objpfx). && pwd)/ \ + $(shell cd $( $@ endif diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 93409bde1c..78943b3696 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,7 @@ +2003-05-11 Ulrich Drepper + + * cond-perf.c (cons): Add missing locking around setting of alldone. + 2003-05-10 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S: Remove futex diff --git a/nptl/cond-perf.c b/nptl/cond-perf.c index c3305b391d..53d85637b8 100644 --- a/nptl/cond-perf.c +++ b/nptl/cond-perf.c @@ -25,8 +25,10 @@ cons (void *arg) { if (--ntogo == 0) { + pthread_mutex_lock (&mut2); alldone = true; pthread_cond_signal (&cond2); + pthread_mutex_unlock (&mut2); } pthread_cond_wait (&cond1, &mut1); @@ -67,7 +69,7 @@ main (int argc, char *argv[]) pthread_t th[nthreads]; int i; for (i = 0; i < nthreads; ++i) - if ((err = pthread_create (&th[i], NULL, cons, (void *) (long) i)) != 0) + if (__builtin_expect ((err = pthread_create (&th[i], NULL, cons, (void *) (long) i)) != 0, 0)) printf ("pthread_create: %s\n", strerror (err)); for (i = 0; i < nrounds; ++i) diff --git a/time/strftime.c b/time/strftime.c index d9ed3ffe8c..99bf7f6f12 100644 --- a/time/strftime.c +++ b/time/strftime.c @@ -977,8 +977,8 @@ my_strftime (s, maxsize, format, tp ut_argument LOCALE_PARAM) jump to one of these two labels. */ do_number_spacepad: - /* Force `_' flag unless overwritten by `0' flag. */ - if (pad != L_('0')) + /* Force `_' flag unless overwritten by `0' or '-' flag. */ + if (pad != L_('0') && pad != L_('-')) pad = L_('_'); do_number: