[PATCH] linux-generic: use "__aligned__", not "aligned", in public headers

[PATCH] linux-generic: use "__aligned__", not "aligned", in public headers

[Chris Metcalf]

---
 ChangeLog.linux-generic                       |    6 ++++++
 sysdeps/unix/sysv/linux/generic/bits/stat.h   |    4 ++--
 sysdeps/unix/sysv/linux/generic/bits/statfs.h |    8 ++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.linux-generic b/ChangeLog.linux-generic
index 4b39e61..9f563e3 100644
--- a/ChangeLog.linux-generic
+++ b/ChangeLog.linux-generic
@@ -1,3 +1,9 @@
+2012-05-14  Chris Metcalf  <cmetcalf@tilera.com>
+
+	* sysdeps/unix/sysv/linux/generic/bits/stat.h,
+	sysdeps/unix/sysv/linux/generic/bits/statfs.h:
+	Use "__aligned__" instead of "aligned" in public headers.
+
 2012-05-12  Chris Metcalf  <cmetcalf@tilera.com>
 
 	* sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list:
diff --git a/sysdeps/unix/sysv/linux/generic/bits/stat.h b/sysdeps/unix/sysv/linux/generic/bits/stat.h
index f9aa66e..5de1bd0 100644
--- a/sysdeps/unix/sysv/linux/generic/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/generic/bits/stat.h
@@ -46,10 +46,10 @@
 # define __field64(type, type64, name) type name
 #elif __BYTE_ORDER == __LITTLE_ENDIAN
 # define __field64(type, type64, name) \
-  type name __attribute__((aligned(8))); int __##name##_pad
+  type name __attribute__((__aligned__(8))); int __##name##_pad
 #else
 # define __field64(type, type64, name) \
-  int __##name##_pad __attribute__((aligned(8))); type name
+  int __##name##_pad __attribute__((__aligned__(8))); type name
 #endif
 
 struct stat
diff --git a/sysdeps/unix/sysv/linux/generic/bits/statfs.h b/sysdeps/unix/sysv/linux/generic/bits/statfs.h
index bbc5da7..bf479e8 100644
--- a/sysdeps/unix/sysv/linux/generic/bits/statfs.h
+++ b/sysdeps/unix/sysv/linux/generic/bits/statfs.h
@@ -38,10 +38,10 @@
 # define __field64(type, type64, name) type name
 #elif __BYTE_ORDER == __LITTLE_ENDIAN
 # define __field64(type, type64, name) \
-  type name __attribute__((aligned(8))); int __##name##_pad
+  type name __attribute__((__aligned__(8))); int __##name##_pad
 #else
 # define __field64(type, type64, name) \
-  int __##name##_pad __attribute__((aligned(8))); type name
+  int __##name##_pad __attribute__((__aligned__(8))); type name
 #endif
 
 struct statfs
@@ -58,7 +58,7 @@ struct statfs
     __SWORD_TYPE f_frsize;
     __SWORD_TYPE f_flags;
     __SWORD_TYPE f_spare[4];
-  } __attribute__((aligned(8)));
+  } __attribute__((__aligned__(8)));
 
 #undef __field64
 
@@ -77,7 +77,7 @@ struct statfs64
     __SWORD_TYPE f_frsize;
     __SWORD_TYPE f_flags;
     __SWORD_TYPE f_spare[4];
-  } __attribute__((aligned(8)));
+  } __attribute__((__aligned__(8)));
 #endif
 
 /* Tell code we have these members.  */
-- 
1.6.5.2

Re: [PATCH] linux-generic: use "__aligned__", not "aligned", in public headers

[Joseph S. Myers]

Please commit this (and the other linux-generic changes you posted).  (I 
see no reason to delay committing the Tile changes either, but those are 
up to you.)

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [PATCH] linux-generic: use "__aligned__", not "aligned", in public headers

[Chris Metcalf]

On 5/14/2012 4:10 PM, Joseph S. Myers wrote:
> Please commit this (and the other linux-generic changes you posted).  (I 
> see no reason to delay committing the Tile changes either, but those are 
> up to you.)

OK, I went ahead and pushed all of it.  Thanks!

-- 
Chris Metcalf, Tilera Corp.
http://www.tilera.com

[PATCH] ia64: use __aligned__ inside of attributes

[Mike Frysinger]

Installed headers should always use the forms of attributes with __
prefixes and suffixes, so __attribute__ ((__aligned__ (8))) instead of
the plain "aligned" form, to avoid taking identifiers from the user's
namespace.

URL: http://sourceware.org/bugzilla/show_bug.cgi?id=14109
Reported-by: Joseph Myers <joseph@codesourcery.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
committed

 ChangeLog.ia64                                 |    8 ++++++++
 sysdeps/unix/sysv/linux/ia64/bits/setjmp.h     |    4 ++--
 sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h |    5 ++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.ia64 b/ChangeLog.ia64
index fd90f34..756be7e 100644
--- a/ChangeLog.ia64
+++ b/ChangeLog.ia64
@@ -1,5 +1,13 @@
 2012-05-14  Mike Frysinger  <vapier@gentoo.org>
 
+	[BZ #14109]
+	* sysdeps/unix/sysv/linux/ia64/bits/setjmp.h (__jmp_buf): Use
+	__aligned__ in attribute.
+	* sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h (ia64_fpreg):
+	Likewise.
+
+2012-05-14  Mike Frysinger  <vapier@gentoo.org>
+
 	* sysdeps/ia64/fpu/libm-symbols.h: Delete __ELF__ checks.
 
 2012-05-07  Mike Frysinger  <vapier@gentoo.org>
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/setjmp.h b/sysdeps/unix/sysv/linux/ia64/bits/setjmp.h
index 4ebc556..fc91baf 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/setjmp.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/setjmp.h
@@ -1,5 +1,5 @@
 /* Define the machine-dependent type `jmp_buf'.  Linux/IA-64 version.
-   Copyright (C) 1999,2000,2003,2005,2006 Free Software Foundation, Inc.
+   Copyright (C) 1999-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by David Mosberger-Tang <davidm@hpl.hp.com>.
 
@@ -29,6 +29,6 @@
 #define _JBLEN	70
 
 /* the __jmp_buf element type should be __float80 per ABI... */
-typedef long __jmp_buf[_JBLEN] __attribute__ ((aligned (16))); /* guarantees 128-bit alignment! */
+typedef long __jmp_buf[_JBLEN] __attribute__ ((__aligned__ (16))); /* guarantees 128-bit alignment! */
 
 #endif  /* bits/setjmp.h */
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h b/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h
index 18e3477..d6e7ce8 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h
@@ -1,5 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2000, 2001, 2003, 2004, 2007
-   Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jes Sorensen <jes@linuxcare.com>, July 2000
 
@@ -34,7 +33,7 @@ struct ia64_fpreg
       {
 	unsigned long bits[2];
       } u;
-  } __attribute__ ((aligned (16)));
+  } __attribute__ ((__aligned__ (16)));
 
 struct sigcontext
 {
-- 
1.7.8.6