Avoid plain "aligned" attributes in installed headers.

diff --git a/ChangeLog b/ChangeLog
index 06d3a4f54e785c1389e1537376f7d9f317c61e8c..826ca6dd0868cf460f54125328c118e68c083664 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-15  Joseph Myers  <joseph@codesourcery.com>
+
+       [BZ #14109]
+       * sysdeps/unix/sysv/linux/powerpc/sys/procfs.h (elf_vrreg_t): Use
+       __aligned__ in attribute.
+       * sysdeps/unix/sysv/linux/s390/sys/ucontext.h (__psw_t): Likewise.
+       (gregset_t): Likewise.
+
 2012-05-15  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/x86_64/dl-trampoline.h: Use R*_LP to pass arguments

diff --git a/NEWS b/NEWS
index e8694718843777bee1f805220056f968ad8ad07a..dc0f11ae1c377f58cc400fa6881794a13eabd258 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -27,7 +27,7 @@ Version 2.16
   13922, 13923, 13924, 13926, 13927, 13928, 13938, 13941, 13942, 13954,
   13955, 13956, 13963, 13967, 13970, 13973, 13979, 13983, 13986, 14012,
   14027, 14033, 14034, 14040, 14043, 14044, 14049, 14053, 14055, 14064,
-  14080, 14083, 14103, 14104
+  14080, 14083, 14103, 14104, 14109
 
 * ISO C11 support:
 

diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h b/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h
index 146b28ed40f25c6566e832c45bc78d59bdc8a1b3..dc41bdf331fcdaeeb44975312d192a3104fb93bb 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h
+++ b/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1999, 2002, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1996-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
@@ -52,7 +52,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
 /* Altivec registers */
 typedef struct {
   unsigned int u[4];
-} __attribute__ ((aligned (16))) elf_vrreg_t;
+} __attribute__ ((__aligned__ (16))) elf_vrreg_t;
 typedef elf_vrreg_t elf_vrregset_t[ELF_NVRREG];
 #endif
 

diff --git a/sysdeps/unix/sysv/linux/s390/sys/ucontext.h b/sysdeps/unix/sysv/linux/s390/sys/ucontext.h
index 5dd023461357e90ea3d93940097bb94c83fb7d2d..e66854d9db66f23f059d3d3f340f547e4e407364 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/s390/sys/ucontext.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2000-2012 Free Software Foundation, Inc.
    Contributed by Denis Joseph Barrow (djbarrow@de.ibm.com).
    This file is part of the GNU C Library.
 
@@ -33,7 +33,7 @@ typedef struct
 {
   unsigned long mask;
   unsigned long addr;
-} __attribute__ ((aligned(8))) __psw_t;
+} __attribute__ ((__aligned__(8))) __psw_t;
 
 /* Type for a general-purpose register.  */
 typedef unsigned long greg_t;
@@ -49,7 +49,7 @@ typedef unsigned long greg_t;
 # define NGREG 36
 #endif
 /* Must match kernels psw_t alignment.  */
-typedef greg_t gregset_t[NGREG] __attribute__ ((aligned(8)));
+typedef greg_t gregset_t[NGREG] __attribute__ ((__aligned__(8)));
 
 typedef union
   {