diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | iconvdata/Makefile | 5 | ||||
| -rw-r--r-- | iconvdata/bug-iconv3.c | 50 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/sparc/tls.h | 10 | ||||
| -rw-r--r-- | nptl/ChangeLog | 9 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/bits/libc-lock.h | 2 |
6 files changed, 74 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 6ddaaf5814..9c0662b1bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-02-04 Ulrich Drepper <drepper@redhat.com> + + * iconvdata/Makefile: Add rules to build and run bug-iconv3. + * iconvdata/bug-iconv3.c: New file. + 2003-02-04 Martin Schwidefsky <schwidefsky@de.ibm.com> * sysdeps/unix/sysv/linux/s390/system.c: New file. diff --git a/iconvdata/Makefile b/iconvdata/Makefile index 5e96ef5203..c85ffcbcd7 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -58,7 +58,7 @@ modules.so := $(addsuffix .so, $(modules)) include ../Makeconfig ifeq (yes,$(build-shared)) -tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 +tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv3 test-srcs := tst-table-from tst-table-to endif @@ -321,6 +321,9 @@ $(objpfx)bug-iconv1.out: $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) $(objpfx)bug-iconv2.out: $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) +$(objpfx)bug-iconv3: $(libdl) +$(objpfx)bug-iconv3.out: $(objpfx)gconv-modules \ + $(addprefix $(objpfx),$(modules.so)) $(objpfx)tst-loading.out: $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) $(objpfx)tst-iconv4.out: $(objpfx)gconv-modules \ diff --git a/iconvdata/bug-iconv3.c b/iconvdata/bug-iconv3.c new file mode 100644 index 0000000000..f733db89d4 --- /dev/null +++ b/iconvdata/bug-iconv3.c @@ -0,0 +1,50 @@ +/* Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@redhat.com>, 2003. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <dlfcn.h> +#include <iconv.h> +#include <stdio.h> +#include <stdlib.h> +#include <gnu/lib-names.h> + + +static int +do_test (void) +{ + /* Get the iconv machinery initialized. */ + (void) iconv_open ("ISO-8859-1", "ISO-8859-2"); + + /* Dynamically load libpthread. */ + if (dlopen (LIBPTHREAD_SO, RTLD_NOW) == NULL) + { + printf ("cannot load %s: %s\n", LIBPTHREAD_SO, dlerror ()); + exit (1); + } + + /* And load some more. This call hang for some configuration since + the internal locking necessary wasn't adequately written to + handle a dynamically loaded libpthread after the first call to + iconv_open. */ + (void) iconv_open ("ISO-8859-2", "ISO-8859-3"); + + return 0; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/linuxthreads/sysdeps/sparc/tls.h b/linuxthreads/sysdeps/sparc/tls.h index 9a9719c48e..6b1966fe1c 100644 --- a/linuxthreads/sysdeps/sparc/tls.h +++ b/linuxthreads/sysdeps/sparc/tls.h @@ -98,11 +98,11 @@ typedef struct #else -#define NONTLS_INIT_TP \ - do { \ - static const tcbhead_t nontls_init_tp \ - = { .multiple_threads = 0 }; \ - __thread_self = (__typeof (__thread_self)) &nontls_init_tp; \ +# define NONTLS_INIT_TP \ + do { \ + static const tcbhead_t nontls_init_tp \ + = { .multiple_threads = 0 }; \ + __thread_self = (__typeof (__thread_self)) &nontls_init_tp; \ } while (0) #endif /* USE_TLS */ diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 745737821e..068d36976a 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,14 @@ +2003-02-04 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/pthread/bits/libc-lock.h (__libc_once): In case no + thread library is available, use correct value to mark initialized + once variable. + 2003-02-03 Ulrich Drepper <drepper@redhat.com> + * allocatestack.c (allocate_stack): Use __getpagesize instead of + __sysconf to determine pagesize. + * pthread_create.c: Include <atomic.h>. * allocatestack.c (allocate_stack): Implement coloring of the allocated stack memory. Rename pagesize to pagesize_m1. It's the diff --git a/nptl/sysdeps/pthread/bits/libc-lock.h b/nptl/sysdeps/pthread/bits/libc-lock.h index f19281e999..3a3d3cc6d3 100644 --- a/nptl/sysdeps/pthread/bits/libc-lock.h +++ b/nptl/sysdeps/pthread/bits/libc-lock.h @@ -340,7 +340,7 @@ typedef pthread_key_t __libc_key_t; PTF(__pthread_once) (&(ONCE_CONTROL), INIT_FUNCTION); \ else if ((ONCE_CONTROL) == PTHREAD_ONCE_INIT) { \ INIT_FUNCTION (); \ - (ONCE_CONTROL) = !PTHREAD_ONCE_INIT; \ + (ONCE_CONTROL) |= 2; \ } \ } while (0) |