diff -rNpu glibc-2.3.4/linuxthreads/ChangeLog glibc-2.3.5/linuxthreads/ChangeLog --- glibc-2.3.4/linuxthreads/ChangeLog 2004-12-12 13:06:37.000000000 -0800 +++ glibc-2.3.5/linuxthreads/ChangeLog 2005-02-16 03:27:36.000000000 -0800 @@ -1,3 +1,25 @@ +2005-02-09 Daniel Jacobowitz + + [BZ #740] + * descr.h (__pthread_find_self, thread_self): Mark as pure + instead of const. + +2005-02-07 Jakub Jelinek + + [BZ #739] + * specific.c (pthread_key_delete): If pthread_create has not been + called yet, clear p_specific for the current thread. + * Makefile (tests): Add tst-tsd1. + * tst-tsd1.c: New test. + +2004-12-21 Jakub Jelinek + + [BZ #723] + * Makefile (tests): Add tst-align. + * tst-align.c: New test. + * sysdeps/i386/Makefile (CFLAGS-tst-align.c): Add + -mpreferred-stack-boundary=4. + 2004-12-12 Ulrich Drepper * internals.h: Include to match includes used in nptl. diff -rNpu glibc-2.3.4/linuxthreads/descr.h glibc-2.3.5/linuxthreads/descr.h --- glibc-2.3.4/linuxthreads/descr.h 2003-09-17 02:39:00.000000000 -0700 +++ glibc-2.3.5/linuxthreads/descr.h 2005-02-16 03:27:25.000000000 -0800 @@ -239,9 +239,9 @@ extern int __pthread_nonstandard_stacks; /* Recover thread descriptor for the current thread */ -extern pthread_descr __pthread_find_self (void) __attribute__ ((const)); +extern pthread_descr __pthread_find_self (void) __attribute__ ((pure)); -static inline pthread_descr thread_self (void) __attribute__ ((const)); +static inline pthread_descr thread_self (void) __attribute__ ((pure)); static inline pthread_descr thread_self (void) { #ifdef THREAD_SELF diff -rNpu glibc-2.3.4/linuxthreads/Makefile glibc-2.3.5/linuxthreads/Makefile --- glibc-2.3.4/linuxthreads/Makefile 2004-12-02 14:55:00.000000000 -0800 +++ glibc-2.3.5/linuxthreads/Makefile 2005-02-16 03:26:38.000000000 -0800 @@ -111,7 +111,7 @@ tests = ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex17 ex18 tst-cancel tst-context bug-sleep \ tst-cancel1 tst-cancel2 tst-cancel3 tst-cancel4 tst-cancel5 \ tst-cancel6 tst-cancel7 tst-cancel8 tst-popen tst-popen2 tst-attr1 \ - tst-stack1 + tst-stack1 tst-align tst-tsd1 test-srcs = tst-signal # These tests are linked with libc before libpthread tests-reverse += tst-cancel5 diff -rNpu glibc-2.3.4/linuxthreads/specific.c glibc-2.3.5/linuxthreads/specific.c --- glibc-2.3.4/linuxthreads/specific.c 2004-05-03 14:42:17.000000000 -0700 +++ glibc-2.3.5/linuxthreads/specific.c 2005-02-16 03:26:39.000000000 -0800 @@ -104,15 +104,16 @@ int pthread_key_delete(pthread_key_t key that if the key is reallocated later by pthread_key_create, its associated values will be NULL in all threads. - Do nothing if no threads have been created yet. */ + If no threads have been created yet, clear it just in the + current thread. */ + struct pthread_key_delete_helper_args args; + args.idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE; + args.idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE; if (__pthread_manager_request != -1) { - struct pthread_key_delete_helper_args args; struct pthread_request request; - args.idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE; - args.idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE; args.self = 0; request.req_thread = self; @@ -124,6 +125,11 @@ int pthread_key_delete(pthread_key_t key (char *) &request, sizeof(request))); suspend(self); } + else + { + if (self->p_specific[args.idx1st] != NULL) + self->p_specific[args.idx1st][args.idx2nd] = NULL; + } pthread_mutex_unlock(&pthread_keys_mutex); return 0; diff -rNpu glibc-2.3.4/linuxthreads/sysdeps/i386/Makefile glibc-2.3.5/linuxthreads/sysdeps/i386/Makefile --- glibc-2.3.4/linuxthreads/sysdeps/i386/Makefile 2003-09-17 01:49:33.000000000 -0700 +++ glibc-2.3.5/linuxthreads/sysdeps/i386/Makefile 2005-02-16 00:46:13.000000000 -0800 @@ -15,6 +15,7 @@ CFLAGS-pthread.c += -fno-omit-frame-poin CFLAGS-ptlongjmp.c += -fno-omit-frame-pointer CFLAGS-semaphore.c += -fno-omit-frame-pointer CFLAGS-sighandler.c += -fno-omit-frame-pointer -mpreferred-stack-boundary=4 +CFLAGS-tst-align.c += -mpreferred-stack-boundary=4 endif ifeq ($(subdir),csu) diff -rNpu glibc-2.3.4/linuxthreads/tst-align.c glibc-2.3.5/linuxthreads/tst-align.c --- glibc-2.3.4/linuxthreads/tst-align.c 1969-12-31 16:00:00.000000000 -0800 +++ glibc-2.3.5/linuxthreads/tst-align.c 2005-02-16 00:46:15.000000000 -0800 @@ -0,0 +1,71 @@ +/* Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 +#include +#include +#include +#include + +static void * +tf (void *arg) +{ + bool ok = true; + + puts ("in thread"); + + if (TEST_STACK_ALIGN ()) + ok = false; + + return ok ? NULL : (void *) -1l; +} + +static int +do_test (void) +{ + bool ok = true; + + puts ("in main"); + + if (TEST_STACK_ALIGN ()) + ok = false; + + pthread_t th; + if (pthread_create (&th, NULL, tf, NULL) != 0) + { + puts ("create failed"); + return 1; + } + + void *res; + if (pthread_join (th, &res) != 0) + { + puts ("join failed"); + return 1; + } + + if (res != NULL) + ok = false; + + return ok ? 0 : 1; +} + + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff -rNpu glibc-2.3.4/linuxthreads/tst-tsd1.c glibc-2.3.5/linuxthreads/tst-tsd1.c --- glibc-2.3.4/linuxthreads/tst-tsd1.c 1969-12-31 16:00:00.000000000 -0800 +++ glibc-2.3.5/linuxthreads/tst-tsd1.c 2005-02-16 03:27:12.000000000 -0800 @@ -0,0 +1,118 @@ +/* Copyright (C) 2002, 2005 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 2002. + + 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 +#include +#include + + +static int +do_test (void) +{ + pthread_key_t key1; + pthread_key_t key2; + void *value; + int result = 0; + int err; + + err = pthread_key_create (&key1, NULL); + if (err != 0) + { + printf ("1st key_create failed: %s\n", strerror (err)); + return 1; + } + + /* Initial value must be NULL. */ + value = pthread_getspecific (key1); + if (value != NULL) + { + puts ("1st getspecific != NULL"); + result = 1; + } + + err = pthread_setspecific (key1, (void *) -2l); + if (err != 0) + { + printf ("1st setspecific failed: %s\n", strerror (err)); + return 1; + } + + value = pthread_getspecific (key1); + if (value == NULL) + { + puts ("2nd getspecific == NULL\n"); + result = 1; + } + else if (value != (void *) -2l) + { + puts ("2nd getspecific != -2l\n"); + result = 1; + } + + err = pthread_setspecific (key1, (void *) -3l); + if (err != 0) + { + printf ("2nd setspecific failed: %s\n", strerror (err)); + return 1; + } + + value = pthread_getspecific (key1); + if (value == NULL) + { + puts ("3rd getspecific == NULL\n"); + result = 1; + } + else if (value != (void *) -3l) + { + puts ("3rd getspecific != -2l\n"); + result = 1; + } + + err = pthread_key_delete (key1); + if (err != 0) + { + printf ("key_delete failed: %s\n", strerror (err)); + result = 1; + } + + + err = pthread_key_create (&key2, NULL); + if (err != 0) + { + printf ("2nd key_create failed: %s\n", strerror (err)); + return 1; + } + + if (key1 != key2) + puts ("key1 != key2; no more tests performed"); + else + { + value = pthread_getspecific (key2); + if (value != NULL) + { + puts ("4th getspecific != NULL"); + result = 1; + } + } + + return result; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c"