From 854f9ec4a67d903e31007a3d4bad0bdada53758a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 11 Sep 2003 18:56:41 +0000 Subject: [PATCH] Update. 2003-09-11 Steven Munroe * sysdeps/powerpc/powerpc64/pt-machine.h [MEMORY_BARRIER]: Use lwsync. [READ_MEMORY_BARRIER]: Define. [WRITE_MEMORY_BARRIER]: Define. --- linuxthreads/ChangeLog | 6 ++++++ linuxthreads/sysdeps/powerpc/powerpc64/pt-machine.h | 4 +++- nptl/Banner | 2 +- nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h | 1 - 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 56947bb614..28993df038 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,9 @@ +2003-09-11 Steven Munroe + + * sysdeps/powerpc/powerpc64/pt-machine.h [MEMORY_BARRIER]: Use lwsync. + [READ_MEMORY_BARRIER]: Define. + [WRITE_MEMORY_BARRIER]: Define. + 2003-09-10 Jakub Jelinek * sysdeps/pthread/pthread-functions.h (struct pthread_functions): Move diff --git a/linuxthreads/sysdeps/powerpc/powerpc64/pt-machine.h b/linuxthreads/sysdeps/powerpc/powerpc64/pt-machine.h index f28e8080bb..ac3149581b 100644 --- a/linuxthreads/sysdeps/powerpc/powerpc64/pt-machine.h +++ b/linuxthreads/sysdeps/powerpc/powerpc64/pt-machine.h @@ -34,7 +34,9 @@ extern int __compare_and_swap (long int *p, long int oldval, long int newval); /* For multiprocessor systems, we want to ensure all memory accesses are completed before we reset a lock. On other systems, we still need to make sure that the compiler has flushed everything to memory. */ -#define MEMORY_BARRIER() __asm__ __volatile__ ("sync" : : : "memory") +#define MEMORY_BARRIER() __asm__ __volatile__ ("lwsync" : : : "memory") +#define READ_MEMORY_BARRIER() __asm__ __volatile__ ("lwsync" : : : "memory") +#define WRITE_MEMORY_BARRIER() __asm__ __volatile__ ("eieio" : : : "memory") /* We want the OS to assign stack addresses. */ #define FLOATING_STACKS 1 diff --git a/nptl/Banner b/nptl/Banner index be11d5b816..cc4ac696ef 100644 --- a/nptl/Banner +++ b/nptl/Banner @@ -1 +1 @@ -NPTL 0.57 by Ulrich Drepper +NPTL 0.58 by Ulrich Drepper diff --git a/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h index e31c27da22..fc0a54c036 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h +++ b/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h @@ -80,7 +80,6 @@ typedef union unsigned long long int __wakeup_seq; unsigned long long int __woken_seq; void *__mutex; - int __locker; } __data; char __size[__SIZEOF_PTHREAD_COND_T]; long long int __align;