From 828beb132ddf5664cf9971329e8cdcb93dce43af Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 10 Jan 2013 20:19:45 +0000
Subject: Use __extension__ with long long in installed headers.

---
 sysdeps/generic/inttypes.h                   | 4 ++--
 sysdeps/s390/bits/byteswap.h                 | 1 +
 sysdeps/unix/sysv/linux/sparc/bits/ipc.h     | 4 ++--
 sysdeps/unix/sysv/linux/sparc/sys/ucontext.h | 2 +-
 sysdeps/unix/sysv/linux/x86/sys/procfs.h     | 2 +-
 sysdeps/x86/bits/setjmp.h                    | 2 +-
 sysdeps/x86/fpu/bits/mathinline.h            | 5 +++++
 7 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'sysdeps')

diff --git a/sysdeps/generic/inttypes.h b/sysdeps/generic/inttypes.h
index 47fe751e29..dc97519056 100644
--- a/sysdeps/generic/inttypes.h
+++ b/sysdeps/generic/inttypes.h
@@ -286,8 +286,8 @@ typedef struct
 /* We have to define the `uintmax_t' type using `lldiv_t'.  */
 typedef struct
   {
-    long long int quot;		/* Quotient.  */
-    long long int rem;		/* Remainder.  */
+    __extension__ long long int quot;	/* Quotient.  */
+    __extension__ long long int rem;	/* Remainder.  */
   } imaxdiv_t;
 
 #endif
diff --git a/sysdeps/s390/bits/byteswap.h b/sysdeps/s390/bits/byteswap.h
index 6f96257005..9221ea2cfc 100644
--- a/sysdeps/s390/bits/byteswap.h
+++ b/sysdeps/s390/bits/byteswap.h
@@ -123,6 +123,7 @@ __bswap_32 (unsigned int __bsx)
       | (((x) & 0x000000000000ff00ull) << 40)				      \
       | (((x) & 0x00000000000000ffull) << 56))
 
+__extension__
 static __inline unsigned long long int
 __bswap_64 (unsigned long long int __bsx)
 {
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/ipc.h b/sysdeps/unix/sysv/linux/sparc/bits/ipc.h
index 757d0472bb..e59f96abc5 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/ipc.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/ipc.h
@@ -56,6 +56,6 @@ struct ipc_perm
     unsigned short int __pad1;
 #endif
     unsigned short int __seq;		/* Sequence number.  */
-    unsigned long long int __unused1;
-    unsigned long long int __unused2;
+    __extension__ unsigned long long int __unused1;
+    __extension__ unsigned long long int __unused2;
   };
diff --git a/sysdeps/unix/sysv/linux/sparc/sys/ucontext.h b/sysdeps/unix/sysv/linux/sparc/sys/ucontext.h
index 74c729166a..1a3d4b54a7 100644
--- a/sysdeps/unix/sysv/linux/sparc/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/sparc/sys/ucontext.h
@@ -217,7 +217,7 @@ typedef struct fpu
 typedef struct fpu
   {
     union {				/* FPU floating point regs */
-      unsigned long long fpu_regs[32];	/* 32 singles */
+      __extension__ unsigned long long fpu_regs[32];	/* 32 singles */
       double             fpu_dregs[16];	/* 16 doubles */
     } fpu_fr;
     struct fq       *fpu_q;		/* ptr to array of FQ entries */
diff --git a/sysdeps/unix/sysv/linux/x86/sys/procfs.h b/sysdeps/unix/sysv/linux/x86/sys/procfs.h
index dddbced57e..ec318ad937 100644
--- a/sysdeps/unix/sysv/linux/x86/sys/procfs.h
+++ b/sysdeps/unix/sysv/linux/x86/sys/procfs.h
@@ -36,7 +36,7 @@ __BEGIN_DECLS
 
 /* Type for a general-purpose register.  */
 #ifdef __x86_64__
-typedef unsigned long long elf_greg_t;
+__extension__ typedef unsigned long long elf_greg_t;
 #else
 typedef unsigned long elf_greg_t;
 #endif
diff --git a/sysdeps/x86/bits/setjmp.h b/sysdeps/x86/bits/setjmp.h
index 8a7e5dcc95..7c666e20d7 100644
--- a/sysdeps/x86/bits/setjmp.h
+++ b/sysdeps/x86/bits/setjmp.h
@@ -30,7 +30,7 @@
 # if __WORDSIZE == 64
 typedef long int __jmp_buf[8];
 # elif defined  __x86_64__
-typedef long long int __jmp_buf[8];
+__extension__ typedef long long int __jmp_buf[8];
 # else
 typedef int __jmp_buf[6];
 # endif
diff --git a/sysdeps/x86/fpu/bits/mathinline.h b/sysdeps/x86/fpu/bits/mathinline.h
index 838c13cd8d..fed64149fc 100644
--- a/sysdeps/x86/fpu/bits/mathinline.h
+++ b/sysdeps/x86/fpu/bits/mathinline.h
@@ -198,6 +198,7 @@ __NTH (lrint (double __x))
 }
 #   endif
 #   ifdef __x86_64__
+__extension__
 __MATH_INLINE long long int
 __NTH (llrintf (float __x))
 {
@@ -209,6 +210,7 @@ __NTH (llrintf (float __x))
   __asm __volatile__ ("cvtss2si %1, %0" : "=r" (__res) : "xm" (__x));
   return __res;
 }
+__extension__
 __MATH_INLINE long long int
 __NTH (llrint (double __x))
 {
@@ -896,16 +898,19 @@ __NTH (lrintl (long double __x))
     ("fistpll %0"							      \
      : "=m" (__llrintres) : "t" (__x) : "st");				      \
   return __llrintres
+__extension__
 __MATH_INLINE long long int
 __NTH (llrintf (float __x))
 {
   __llrint_code;
 }
+__extension__
 __MATH_INLINE long long int
 __NTH (llrint (double __x))
 {
   __llrint_code;
 }
+__extension__
 __MATH_INLINE long long int
 __NTH (llrintl (long double __x))
 {
-- 
cgit 1.4.1