diff options
Diffstat (limited to 'linuxthreads/sysdeps')
-rw-r--r-- | linuxthreads/sysdeps/alpha/bits/semaphore.h | 31 | ||||
-rw-r--r-- | linuxthreads/sysdeps/powerpc/bits/semaphore.h | 32 | ||||
-rw-r--r-- | linuxthreads/sysdeps/pthread/bits/pthreadtypes.h | 3 | ||||
-rw-r--r-- | linuxthreads/sysdeps/pthread/cmpxchg/bits/semaphore.h | 26 | ||||
-rw-r--r-- | linuxthreads/sysdeps/pthread/no-cmpxchg/bits/semaphore.h | 27 |
5 files changed, 3 insertions, 116 deletions
diff --git a/linuxthreads/sysdeps/alpha/bits/semaphore.h b/linuxthreads/sysdeps/alpha/bits/semaphore.h deleted file mode 100644 index 323fea159e..0000000000 --- a/linuxthreads/sysdeps/alpha/bits/semaphore.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (C) 1996, 1997 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 - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#ifndef _SEMAPHORE_H -# error "Never include <bits/semaphore.h> directly; use <semaphore.h> instead." -#endif - - -/* Due to the implementation of the load-locked/store-conditional - instructions, we cannot pack semaphores closer than a cache line - or risk threads deadlocking on unrelated semaphores. */ - -typedef struct { - long int sem_status; - long int sem_reserved[3]; -} sem_t; diff --git a/linuxthreads/sysdeps/powerpc/bits/semaphore.h b/linuxthreads/sysdeps/powerpc/bits/semaphore.h deleted file mode 100644 index 3770eedf15..0000000000 --- a/linuxthreads/sysdeps/powerpc/bits/semaphore.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright (C) 1996, 1997 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 - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#ifndef _SEMAPHORE_H -# error "Never include <bits/semaphore.h> directly; use <semaphore.h> instead." -#endif - - -/* Due to the implementation of the load-locked/store-conditional - instructions, we cannot pack semaphores closer than a cache line - or risk threads deadlocking on unrelated semaphores. */ - -typedef struct - { - int sem_status; - int sem_reserved[7]; - } sem_t; diff --git a/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h b/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h index 04dbe35ff7..fbb10ed5c7 100644 --- a/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h +++ b/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h @@ -29,8 +29,11 @@ struct _pthread_fastlock int __spinlock; /* For compare-and-swap emulation */ }; +#ifndef _PTHREAD_DESCR_DEFINED /* Thread descriptors */ typedef struct _pthread_descr_struct *_pthread_descr; +# define _PTHREAD_DESCR_DEFINED +#endif /* Attributes for threads. */ diff --git a/linuxthreads/sysdeps/pthread/cmpxchg/bits/semaphore.h b/linuxthreads/sysdeps/pthread/cmpxchg/bits/semaphore.h deleted file mode 100644 index 0cdbc05b90..0000000000 --- a/linuxthreads/sysdeps/pthread/cmpxchg/bits/semaphore.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (C) 1996, 1997 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 - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#ifndef _SEMAPHORE_H -# error "Never include <bits/semaphore.h> directly; use <semaphore.h> instead." -#endif - - -typedef struct { - long int sem_status; -} sem_t; diff --git a/linuxthreads/sysdeps/pthread/no-cmpxchg/bits/semaphore.h b/linuxthreads/sysdeps/pthread/no-cmpxchg/bits/semaphore.h deleted file mode 100644 index 4d801a26a6..0000000000 --- a/linuxthreads/sysdeps/pthread/no-cmpxchg/bits/semaphore.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (C) 1996, 1997 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 - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#ifndef _SEMAPHORE_H -# error "Never include <bits/semaphore.h> directly; use <semaphore.h> instead." -#endif - - -typedef struct { - long int sem_status; - int sem_spinlock; -} sem_t; |