about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sysdeps/mach/i386/machine-lock.h4
-rw-r--r--sysdeps/mach/powerpc/machine-lock.h4
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 85b08416cd..3fe55856a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+2012-04-05  Thomas Schwinge  <thomas@codesourcery.com>
+
+	[BZ #13553]
+	* sysdeps/mach/i386/machine-lock.h: Use volatile instead of __volatile.
+	* sysdeps/mach/powerpc/machine-lock.h: Likewise.
+
 2012-04-03  Andreas Jaeger  <aj@suse.de>
 
-	[BZ # 13938]
+	[BZ #13938]
 	* manual/setjmp.texi (System V contexts): Fix sentence.
 
 	[BZ #13926]
diff --git a/sysdeps/mach/i386/machine-lock.h b/sysdeps/mach/i386/machine-lock.h
index e62f53bb88..1f110e2d8e 100644
--- a/sysdeps/mach/i386/machine-lock.h
+++ b/sysdeps/mach/i386/machine-lock.h
@@ -1,5 +1,5 @@
 /* Machine-specific definition for spin locks.  i386 version.
-   Copyright (C) 1994,1997,2007,2008 Free Software Foundation, Inc.
+   Copyright (C) 1994-2012 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
@@ -21,7 +21,7 @@
 
 /* The type of a spin lock variable.  */
 
-typedef __volatile int __spin_lock_t;
+typedef volatile int __spin_lock_t;
 
 /* Value to initialize `__spin_lock_t' variables to.  */
 
diff --git a/sysdeps/mach/powerpc/machine-lock.h b/sysdeps/mach/powerpc/machine-lock.h
index 33b793df76..84159c5a5d 100644
--- a/sysdeps/mach/powerpc/machine-lock.h
+++ b/sysdeps/mach/powerpc/machine-lock.h
@@ -1,5 +1,5 @@
 /* Machine-specific definition for spin locks.  PowerPC version.
-   Copyright (C) 1994,97,2002,2007 Free Software Foundation, Inc.
+   Copyright (C) 1994-2012 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
@@ -21,7 +21,7 @@
 
 /* The type of a spin lock variable.  */
 
-typedef __volatile long int __spin_lock_t;
+typedef volatile long int __spin_lock_t;
 
 /* Value to initialize `__spin_lock_t' variables to.  */