Re: GNU C Library master sources branch, master, updated. glibc-2.15-52-ga784e50

[Thomas Schwinge <thomas at codesourcery dot com>]

Hi!

On 8 Jan 2012 04:57:52 -0000, drepper@sourceware.org wrote:
> commit a784e502472fb3a1afa4d01a47c66b52d23e00f6
> Author: Ulrich Drepper <drepper@gmail.com>
> Date:   Sat Jan 7 23:57:22 2012 -0500
> 
>     Remove pre-ISO C support
>     
>     No more __const.
> 
> diff --git a/ChangeLog b/ChangeLog
> index 24d3ddf..1d04fca 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,5 +1,207 @@
>  2012-01-07  Ulrich Drepper  <drepper@gmail.com>
>  
> +	[BZ #13553]
> +	* misc/sys/cdefs.h: Remove __const, __signed, and __volatile definition
> +	for non-gcc.
> +	* argp/argp-fmtstream.h: Use const instead __const.
> +	[...]

I just put this on top of it (as obvious):

commit c3b1bf7d8581ac097f06346f0b279fdca92fb6b1
Author: Thomas Schwinge <thomas@codesourcery.com>
Date:   Thu Apr 5 00:26:22 2012 +0200

    [BZ #13553] Remove pre-ISO C support
    
    The bits missing from a784e502472fb3a1afa4d01a47c66b52d23e00f6.

diff --git a/ChangeLog b/ChangeLog
index 85b0841..3fe5585 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 e62f53b..1f110e2 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 33b793d..84159c5 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.  */
 


GrÃÃe,
 Thomas

Attachment: pgp00000.pgp
Description: PGP signature