This is the mail archive of the libc-alpha@sources.redhat.com mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

[patch] sysdeps/powerpc/pspinlocks.c: remove implicit include for pt-machine.h


Two patches. The first caused powerpc target in current CVS to fail in
linuxthreads because __compare_and_swap got double declared. The second
protects the pt-machine.h files from this happening again :)

2000-12-30  Ben Collins  <bcollins@debian.org>

	* sysdeps/powerpc/pspinlocks.c: Remove implicit
	  inclusion of pt-machine.h, which was causing it to be
	  included twice (internals.h includes it as well)
	
	* sysdeps/alpha/pt-machine.h: Protect in #ifndef
	* sysdeps/arm/pt-machine.h: Likewise
	* sysdeps/i386/pt-machine.h: Likewise
	* sysdeps/i386/i686/pt-machine.h: Likewise
	* sysdeps/m68k/pt-machine.h: Likewise
	* sysdeps/mips/pt-machine.h: Likewise
	* sysdeps/powerpc/pt-machine.h: Likewise
	* sysdeps/sparc/sparc32/pt-machine.h: Likewise
	* sysdeps/sparc/sparc64/pt-machine.h: Likewise
	* sysdeps/sh/pt-machine.h: Likewise
	* sysdeps/ia64/pt-machine.h: Likewise
	* sysdeps/s390/pt-machine.h: Likewise
	* sysdeps/hppa/pt-machine.h: Likewise

-- 
 -----------=======-=-======-=========-----------=====------------=-=------
/  Ben Collins  --  ...on that fantastic voyage...  --  Debian GNU/Linux   \
`  bcollins@debian.org  --  bcollins@openldap.org  --  bcollins@linux.com  '
 `---=========------=======-------------=-=-----=-===-======-------=--=---'
Index: sysdeps/powerpc/pspinlock.c
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads/sysdeps/powerpc/pspinlock.c,v
retrieving revision 1.3
diff -u -u -r1.3 pspinlock.c
--- pspinlock.c	2000/12/27 17:17:15	1.3
+++ pspinlock.c	2000/12/31 01:14:06
@@ -19,7 +19,6 @@
 
 #include <errno.h>
 #include <pthread.h>
-#include <pt-machine.h>
 #include "internals.h"
 
 int
Index: sysdeps/alpha/pt-machine.h
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads/sysdeps/alpha/pt-machine.h,v
retrieving revision 1.6
diff -u -u -r1.6 pt-machine.h
--- pt-machine.h	2000/04/15 16:49:47	1.6
+++ pt-machine.h	2000/12/31 01:29:16
@@ -19,6 +19,9 @@
    write to the Free Software Foundation, Inc.,  59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifndef _PT_MACHINE_H
+#define _PT_MACHINE_H	1
+
 #ifndef PT_EI
 # define PT_EI extern inline
 #endif
@@ -108,3 +111,5 @@
 
   return ret;
 }
+
+#endif /* pt-machine.h */
Index: sysdeps/arm/pt-machine.h
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads/sysdeps/arm/pt-machine.h,v
retrieving revision 1.3
diff -u -u -r1.3 pt-machine.h
--- pt-machine.h	2000/12/18 05:55:14	1.3
+++ pt-machine.h	2000/12/31 01:29:16
@@ -19,6 +19,9 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifndef _PT_MACHINE_H
+#define _PT_MACHINE_H	1
+
 #ifndef PT_EI
 # define PT_EI extern inline
 #endif
@@ -46,3 +49,5 @@
    of the stack, just something somewhere in the current frame.  */
 #define CURRENT_STACK_FRAME  stack_pointer
 register char * stack_pointer __asm__ ("sp");
+
+#endif /* pt-machine.h */
Index: sysdeps/hppa/pt-machine.h
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads/sysdeps/hppa/pt-machine.h,v
retrieving revision 1.2
diff -u -u -r1.2 pt-machine.h
--- pt-machine.h	2000/12/18 05:55:14	1.2
+++ pt-machine.h	2000/12/31 01:29:16
@@ -19,6 +19,9 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifndef _PT_MACHINE_H
+#define _PT_MACHINE_H	1
+
 #include <bits/initspin.h>
 
 #ifndef PT_EI
@@ -52,3 +55,5 @@
 }
 #undef str
 #undef xstr
+
+#endif /* pt-machine.h */
Index: sysdeps/i386/pt-machine.h
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads/sysdeps/i386/pt-machine.h,v
retrieving revision 1.9
diff -u -u -r1.9 pt-machine.h
--- pt-machine.h	2000/12/17 21:48:10	1.9
+++ pt-machine.h	2000/12/31 01:29:16
@@ -19,6 +19,9 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifndef _PT_MACHINE_H
+#define _PT_MACHINE_H	1
+
 #ifndef PT_EI
 # define PT_EI extern inline
 #endif
@@ -97,3 +100,5 @@
      Otherwise, it's a 486 or above and it has cmpxchg.  */
   return changed != 0;
 }
+
+#endif /* pt-machine.h */
Index: sysdeps/i386/i686/pt-machine.h
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads/sysdeps/i386/i686/pt-machine.h,v
retrieving revision 1.12
diff -u -u -r1.12 pt-machine.h
--- pt-machine.h	2000/12/17 21:47:51	1.12
+++ pt-machine.h	2000/12/31 01:29:16
@@ -19,6 +19,9 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifndef _PT_MACHINE_H
+#define _PT_MACHINE_H	1
+
 #ifndef PT_EI
 # define PT_EI extern inline
 #endif
@@ -65,3 +68,5 @@
 #if __ASSUME_LDT_WORKS > 0
 #include "../useldt.h"
 #endif
+
+#endif /* pt-machine.h */
Index: sysdeps/ia64/pt-machine.h
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads/sysdeps/ia64/pt-machine.h,v
retrieving revision 1.2
diff -u -u -r1.2 pt-machine.h
--- pt-machine.h	2000/12/18 22:35:59	1.2
+++ pt-machine.h	2000/12/31 01:29:16
@@ -18,6 +18,9 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifndef _PT_MACHINE_H
+#define _PT_MACHINE_H	1
+
 #ifndef PT_EI
 # define PT_EI extern inline
 #endif
@@ -104,3 +107,5 @@
 
   return ret;
 }
+
+#endif /* pt-machine.h */
Index: sysdeps/m68k/pt-machine.h
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads/sysdeps/m68k/pt-machine.h,v
retrieving revision 1.3
diff -u -u -r1.3 pt-machine.h
--- pt-machine.h	2000/12/18 05:55:14	1.3
+++ pt-machine.h	2000/12/31 01:29:16
@@ -19,6 +19,9 @@
    not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#ifndef _PT_MACHINE_H
+#define _PT_MACHINE_H	1
+
 #ifndef PT_EI
 # define PT_EI extern inline
 #endif
@@ -60,3 +63,5 @@
 
   return ret;
 }
+
+#endif /* pt-machine.h */
Index: sysdeps/mips/pt-machine.h
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads/sysdeps/mips/pt-machine.h,v
retrieving revision 1.6
diff -u -u -r1.6 pt-machine.h
--- pt-machine.h	2000/12/05 18:00:31	1.6
+++ pt-machine.h	2000/12/31 01:29:16
@@ -20,6 +20,9 @@
    not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#ifndef _PT_MACHINE_H
+#define _PT_MACHINE_H	1
+
 #include <sgidefs.h>
 #include <sys/tas.h>
 
@@ -107,3 +110,5 @@
 }
 
 #endif /* (_MIPS_ISA >= _MIPS_ISA_MIPS2) */
+
+#endif /* pt-machine.h */
Index: sysdeps/powerpc/pt-machine.h
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads/sysdeps/powerpc/pt-machine.h,v
retrieving revision 1.7
diff -u -u -r1.7 pt-machine.h
--- pt-machine.h	2000/07/22 02:24:23	1.7
+++ pt-machine.h	2000/12/31 01:29:16
@@ -21,6 +21,9 @@
 /* These routines are from Appendix G of the 'PowerPC 601 RISC Microprocessor
    User's Manual', by IBM and Motorola.  */
 
+#ifndef _PT_MACHINE_H
+#define _PT_MACHINE_H	1
+
 #ifndef PT_EI
 # define PT_EI extern inline
 #endif
@@ -65,3 +68,5 @@
   MEMORY_BARRIER ();
   return ret == 0;
 }
+
+#endif /* pt-machine.h */
Index: sysdeps/s390/pt-machine.h
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads/sysdeps/s390/pt-machine.h,v
retrieving revision 1.3
diff -u -u -r1.3 pt-machine.h
--- pt-machine.h	2000/12/18 05:55:14	1.3
+++ pt-machine.h	2000/12/31 01:29:16
@@ -19,6 +19,9 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifndef _PT_MACHINE_H
+#define _PT_MACHINE_H	1
+
 #ifndef PT_EI
 # define PT_EI extern inline
 #endif
@@ -95,3 +98,5 @@
    of the stack, just something somewhere in the current frame.  */
 #define CURRENT_STACK_FRAME  stack_pointer
 register char * stack_pointer __asm__ ("%r15");
+
+#endif /* pt-machine.h */
Index: sysdeps/sh/pt-machine.h
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads/sysdeps/sh/pt-machine.h,v
retrieving revision 1.3
diff -u -u -r1.3 pt-machine.h
--- pt-machine.h	2000/12/18 05:55:14	1.3
+++ pt-machine.h	2000/12/31 01:29:16
@@ -19,6 +19,9 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifndef _PT_MACHINE_H
+#define _PT_MACHINE_H	1
+
 #ifndef PT_EI
 # define PT_EI extern inline
 #endif
@@ -44,3 +47,5 @@
    of the stack, just something somewhere in the current frame.  */
 #define CURRENT_STACK_FRAME  stack_pointer
 register char * stack_pointer __asm__ ("r15");
+
+#endif /* pt-machine.h */
Index: sysdeps/sparc/sparc32/pt-machine.h
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads/sysdeps/sparc/sparc32/pt-machine.h,v
retrieving revision 1.7
diff -u -u -r1.7 pt-machine.h
--- pt-machine.h	2000/12/18 05:55:14	1.7
+++ pt-machine.h	2000/12/31 01:29:17
@@ -19,6 +19,9 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifndef _PT_MACHINE_H
+#define _PT_MACHINE_H	1
+
 #ifndef PT_EI
 # define PT_EI extern inline
 #endif
@@ -63,3 +66,5 @@
 #define THREAD_GETMEM_NC(descr, member) __thread_self->member
 #define THREAD_SETMEM(descr, member, value) __thread_self->member = (value)
 #define THREAD_SETMEM_NC(descr, member, value) __thread_self->member = (value)
+
+#endif /* pt-machine.h */
Index: sysdeps/sparc/sparc64/pt-machine.h
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads/sysdeps/sparc/sparc64/pt-machine.h,v
retrieving revision 1.11
diff -u -u -r1.11 pt-machine.h
--- pt-machine.h	2000/12/18 05:55:14	1.11
+++ pt-machine.h	2000/12/31 01:29:17
@@ -19,6 +19,9 @@
    not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#ifndef _PT_MACHINE_H
+#define _PT_MACHINE_H	1
+
 #ifndef PT_EI
 # define PT_EI extern inline
 #endif
@@ -86,3 +89,5 @@
 #define THREAD_GETMEM_NC(descr, member) __thread_self->member
 #define THREAD_SETMEM(descr, member, value) __thread_self->member = (value)
 #define THREAD_SETMEM_NC(descr, member, value) __thread_self->member = (value)
+
+#endif /* pt-machine.h */

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]