ia64: use __aligned__ inside of attributes

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>

diff --git a/ChangeLog.ia64 b/ChangeLog.ia64
index fd90f34..756be7e 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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
 {