Use __extension__ with long long in installed headers.

This commit is contained in:
Joseph Myers 2013-01-10 20:19:45 +00:00
parent 034ed64b2c
commit 828beb132d
20 changed files with 84 additions and 31 deletions

View File

@ -1,5 +1,25 @@
2013-01-10 Joseph Myers <joseph@codesourcery.com> 2013-01-10 Joseph Myers <joseph@codesourcery.com>
* elf/link.h (struct dl_phdr_info): Use __extension__ with long
long.
* math/bits/mathcalls.h (llrint): Likewise.
(llround): Likewise.
* stdlib/stdlib.h (struct drand48_data): Likewise.
* sysdeps/generic/inttypes.h (imaxdiv_t): Likewise.
* sysdeps/s390/bits/byteswap.h (__bswap_64): Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/ipc.h (struct ipc_perm):
Likewise.
* sysdeps/unix/sysv/linux/sparc/sys/ucontext.h (struct fpu):
Likewise.
* sysdeps/unix/sysv/linux/x86/sys/procfs.h [__x86_64__]
(elf_greg_t): Likewise.
* sysdeps/x86/bits/setjmp.h [__x86_64__ && __WORDSIZE != 64]
(__jmp_buf): Likewise.
* sysdeps/x86/fpu/bits/mathinline.h (llrintf): Likewise, for all
definitions.
(llrint): Likewise, for all definitions.
(llrintl): Likewise.
* string/string.h [__USE_BSD && __USE_GNU && __GNUC__] (ffsll): * string/string.h [__USE_BSD && __USE_GNU && __GNUC__] (ffsll):
Remove [__GNUC__] condition. Remove [__GNUC__] condition.
* wcsmbs/wchar.h [__USE_ISOC99 || (__GNUC__ && __USE_GNU)]: Change * wcsmbs/wchar.h [__USE_ISOC99 || (__GNUC__ && __USE_GNU)]: Change

View File

@ -147,9 +147,9 @@ struct dl_phdr_info
whether or not each later member is available. */ whether or not each later member is available. */
/* Incremented when a new object may have been added. */ /* Incremented when a new object may have been added. */
unsigned long long int dlpi_adds; __extension__ unsigned long long int dlpi_adds;
/* Incremented when an object may have been removed. */ /* Incremented when an object may have been removed. */
unsigned long long int dlpi_subs; __extension__ unsigned long long int dlpi_subs;
/* If there is a PT_TLS segment, its module ID as used in /* If there is a PT_TLS segment, its module ID as used in
TLS relocations, else zero. */ TLS relocations, else zero. */

View File

@ -323,11 +323,13 @@ __MATHCALL (remquo,, (_Mdouble_ __x, _Mdouble_ __y, int *__quo));
/* Round X to nearest integral value according to current rounding /* Round X to nearest integral value according to current rounding
direction. */ direction. */
__MATHDECL (long int,lrint,, (_Mdouble_ __x)); __MATHDECL (long int,lrint,, (_Mdouble_ __x));
__extension__
__MATHDECL (long long int,llrint,, (_Mdouble_ __x)); __MATHDECL (long long int,llrint,, (_Mdouble_ __x));
/* Round X to nearest integral value, rounding halfway cases away from /* Round X to nearest integral value, rounding halfway cases away from
zero. */ zero. */
__MATHDECL (long int,lround,, (_Mdouble_ __x)); __MATHDECL (long int,lround,, (_Mdouble_ __x));
__extension__
__MATHDECL (long long int,llround,, (_Mdouble_ __x)); __MATHDECL (long long int,llround,, (_Mdouble_ __x));

View File

@ -1,3 +1,8 @@
2013-01-10 Joseph Myers <joseph@codesourcery.com>
* sysdeps/aarch64/bits/setjmp.h (__jmp_buf): Use __extension__
with long long.
2013-01-02 Joseph Myers <joseph@codesourcery.com> 2013-01-02 Joseph Myers <joseph@codesourcery.com>
* All files with FSF copyright notices: Update copyright dates * All files with FSF copyright notices: Update copyright dates

View File

@ -1,3 +1,11 @@
2013-01-10 Joseph Myers <joseph@codesourcery.com>
* sysdeps/hppa/fpu/fpu_control.h (_FPU_GETCW): Use __extension__
with long long.
(_FPU_SETCW): Likewise.
* sysdeps/unix/sysv/linux/hppa/bits/ipc.h (struct ipc_perm):
Likewise.
2013-01-08 Andreas Jaeger <aj@suse.de> 2013-01-08 Andreas Jaeger <aj@suse.de>
[BZ# 14985] [BZ# 14985]

View File

@ -1,3 +1,8 @@
2013-01-10 Joseph Myers <joseph@codesourcery.com>
* sysdeps/m68k/bits/byteswap.h (__bswap_64): Use __extension__
with long long.
2013-01-04 Andreas Schwab <schwab@suse.de> 2013-01-04 Andreas Schwab <schwab@suse.de>
* sysdeps/m68k/m680x0/fpu/libm-test-ulps: Update. * sysdeps/m68k/m680x0/fpu/libm-test-ulps: Update.

View File

@ -1,3 +1,8 @@
2013-01-10 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/mips/bits/sigcontext.h (struct
sigcontext): Use __extension__ with long long in all definitions.
2013-01-08 Steve Ellcey <sellcey@mips.com> 2013-01-08 Steve Ellcey <sellcey@mips.com>
* sysdeps/mips/memcpy.S: Change prefetch hint, reorder partial * sysdeps/mips/memcpy.S: Change prefetch hint, reorder partial

View File

@ -27,7 +27,7 @@
/* Jump buffer contains: /* Jump buffer contains:
x19-x28, x29(fp), x30(lr), (x31)sp, d8-d15. Other registers are not x19-x28, x29(fp), x30(lr), (x31)sp, d8-d15. Other registers are not
saved. */ saved. */
typedef unsigned long long __jmp_buf [22]; __extension__ typedef unsigned long long __jmp_buf [22];
#endif #endif
#endif #endif

View File

@ -44,7 +44,7 @@ typedef unsigned int fpu_control_t;
/* Macros for accessing the hardware control word. */ /* Macros for accessing the hardware control word. */
#define _FPU_GETCW(cw) \ #define _FPU_GETCW(cw) \
({ \ ({ \
union { unsigned long long __fpreg; unsigned int __halfreg[2]; } __fullfp; \ union { __extension__ unsigned long long __fpreg; unsigned int __halfreg[2]; } __fullfp; \
/* Get the current status word. */ \ /* Get the current status word. */ \
__asm__ ("fstd %%fr0,0(%1)\n\t" \ __asm__ ("fstd %%fr0,0(%1)\n\t" \
"fldd 0(%1),%%fr0\n\t" \ "fldd 0(%1),%%fr0\n\t" \
@ -54,7 +54,7 @@ typedef unsigned int fpu_control_t;
#define _FPU_SETCW(cw) \ #define _FPU_SETCW(cw) \
({ \ ({ \
union { unsigned long long __fpreg; unsigned int __halfreg[2]; } __fullfp; \ union { __extension__ unsigned long long __fpreg; unsigned int __halfreg[2]; } __fullfp; \
__fullfp.__halfreg[0] = cw; \ __fullfp.__halfreg[0] = cw; \
__asm__ ("fldd 0(%1),%%fr0\n\t" \ __asm__ ("fldd 0(%1),%%fr0\n\t" \
: : "m" (__fullfp.__fpreg), "r" (__fullfp.__fpreg) : "%r0" ); \ : : "m" (__fullfp.__fpreg), "r" (__fullfp.__fpreg) : "%r0" ); \

View File

@ -74,6 +74,7 @@ __bswap_32 (unsigned int __bsx)
| (((x) & 0x00000000000000ffull) << 56)) | (((x) & 0x00000000000000ffull) << 56))
/* Swap bytes in 64 bit value. */ /* Swap bytes in 64 bit value. */
__extension__
static __inline unsigned long long static __inline unsigned long long
__bswap_64 (unsigned long long __bsx) __bswap_64 (unsigned long long __bsx)
{ {

View File

@ -57,6 +57,6 @@ struct ipc_perm
#endif #endif
unsigned short int __seq; /* Sequence number. */ unsigned short int __seq; /* Sequence number. */
unsigned int __pad3; unsigned int __pad3;
unsigned long long int __unused1; __extension__ unsigned long long int __unused1;
unsigned long long int __unused2; __extension__ unsigned long long int __unused2;
}; };

View File

@ -39,16 +39,16 @@
struct sigcontext { struct sigcontext {
unsigned int sc_regmask; unsigned int sc_regmask;
unsigned int sc_status; unsigned int sc_status;
unsigned long long sc_pc; __extension__ unsigned long long sc_pc;
unsigned long long sc_regs[32]; __extension__ unsigned long long sc_regs[32];
unsigned long long sc_fpregs[32]; __extension__ unsigned long long sc_fpregs[32];
unsigned int sc_ownedfp; unsigned int sc_ownedfp;
unsigned int sc_fpc_csr; unsigned int sc_fpc_csr;
unsigned int sc_fpc_eir; unsigned int sc_fpc_eir;
unsigned int sc_used_math; unsigned int sc_used_math;
unsigned int sc_dsp; unsigned int sc_dsp;
unsigned long long sc_mdhi; __extension__ unsigned long long sc_mdhi;
unsigned long long sc_mdlo; __extension__ unsigned long long sc_mdlo;
unsigned long sc_hi1; unsigned long sc_hi1;
unsigned long sc_lo1; unsigned long sc_lo1;
unsigned long sc_hi2; unsigned long sc_hi2;
@ -61,17 +61,17 @@ struct sigcontext {
/* This structure changed in 2.6.12-rc4 when DSP support was added. */ /* This structure changed in 2.6.12-rc4 when DSP support was added. */
struct sigcontext { struct sigcontext {
unsigned long long sc_regs[32]; __extension__ unsigned long long sc_regs[32];
unsigned long long sc_fpregs[32]; __extension__ unsigned long long sc_fpregs[32];
unsigned long long sc_mdhi; __extension__ unsigned long long sc_mdhi;
unsigned long long sc_hi1; __extension__ unsigned long long sc_hi1;
unsigned long long sc_hi2; __extension__ unsigned long long sc_hi2;
unsigned long long sc_hi3; __extension__ unsigned long long sc_hi3;
unsigned long long sc_mdlo; __extension__ unsigned long long sc_mdlo;
unsigned long long sc_lo1; __extension__ unsigned long long sc_lo1;
unsigned long long sc_lo2; __extension__ unsigned long long sc_lo2;
unsigned long long sc_lo3; __extension__ unsigned long long sc_lo3;
unsigned long long sc_pc; __extension__ unsigned long long sc_pc;
unsigned int sc_fpc_csr; unsigned int sc_fpc_csr;
unsigned int sc_used_math; unsigned int sc_used_math;
unsigned int sc_dsp; unsigned int sc_dsp;

View File

@ -415,7 +415,8 @@ struct drand48_data
unsigned short int __old_x[3]; /* Old state. */ unsigned short int __old_x[3]; /* Old state. */
unsigned short int __c; /* Additive const. in congruential formula. */ unsigned short int __c; /* Additive const. in congruential formula. */
unsigned short int __init; /* Flag for initializing. */ unsigned short int __init; /* Flag for initializing. */
unsigned long long int __a; /* Factor in congruential formula. */ __extension__ unsigned long long int __a; /* Factor in congruential
formula. */
}; };
/* Return non-negative, double-precision floating-point value in [0.0,1.0). */ /* Return non-negative, double-precision floating-point value in [0.0,1.0). */

View File

@ -286,8 +286,8 @@ typedef struct
/* We have to define the `uintmax_t' type using `lldiv_t'. */ /* We have to define the `uintmax_t' type using `lldiv_t'. */
typedef struct typedef struct
{ {
long long int quot; /* Quotient. */ __extension__ long long int quot; /* Quotient. */
long long int rem; /* Remainder. */ __extension__ long long int rem; /* Remainder. */
} imaxdiv_t; } imaxdiv_t;
#endif #endif

View File

@ -123,6 +123,7 @@ __bswap_32 (unsigned int __bsx)
| (((x) & 0x000000000000ff00ull) << 40) \ | (((x) & 0x000000000000ff00ull) << 40) \
| (((x) & 0x00000000000000ffull) << 56)) | (((x) & 0x00000000000000ffull) << 56))
__extension__
static __inline unsigned long long int static __inline unsigned long long int
__bswap_64 (unsigned long long int __bsx) __bswap_64 (unsigned long long int __bsx)
{ {

View File

@ -56,6 +56,6 @@ struct ipc_perm
unsigned short int __pad1; unsigned short int __pad1;
#endif #endif
unsigned short int __seq; /* Sequence number. */ unsigned short int __seq; /* Sequence number. */
unsigned long long int __unused1; __extension__ unsigned long long int __unused1;
unsigned long long int __unused2; __extension__ unsigned long long int __unused2;
}; };

View File

@ -217,7 +217,7 @@ typedef struct fpu
typedef struct fpu typedef struct fpu
{ {
union { /* FPU floating point regs */ 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 */ double fpu_dregs[16]; /* 16 doubles */
} fpu_fr; } fpu_fr;
struct fq *fpu_q; /* ptr to array of FQ entries */ struct fq *fpu_q; /* ptr to array of FQ entries */

View File

@ -36,7 +36,7 @@ __BEGIN_DECLS
/* Type for a general-purpose register. */ /* Type for a general-purpose register. */
#ifdef __x86_64__ #ifdef __x86_64__
typedef unsigned long long elf_greg_t; __extension__ typedef unsigned long long elf_greg_t;
#else #else
typedef unsigned long elf_greg_t; typedef unsigned long elf_greg_t;
#endif #endif

View File

@ -30,7 +30,7 @@
# if __WORDSIZE == 64 # if __WORDSIZE == 64
typedef long int __jmp_buf[8]; typedef long int __jmp_buf[8];
# elif defined __x86_64__ # elif defined __x86_64__
typedef long long int __jmp_buf[8]; __extension__ typedef long long int __jmp_buf[8];
# else # else
typedef int __jmp_buf[6]; typedef int __jmp_buf[6];
# endif # endif

View File

@ -198,6 +198,7 @@ __NTH (lrint (double __x))
} }
# endif # endif
# ifdef __x86_64__ # ifdef __x86_64__
__extension__
__MATH_INLINE long long int __MATH_INLINE long long int
__NTH (llrintf (float __x)) __NTH (llrintf (float __x))
{ {
@ -209,6 +210,7 @@ __NTH (llrintf (float __x))
__asm __volatile__ ("cvtss2si %1, %0" : "=r" (__res) : "xm" (__x)); __asm __volatile__ ("cvtss2si %1, %0" : "=r" (__res) : "xm" (__x));
return __res; return __res;
} }
__extension__
__MATH_INLINE long long int __MATH_INLINE long long int
__NTH (llrint (double __x)) __NTH (llrint (double __x))
{ {
@ -896,16 +898,19 @@ __NTH (lrintl (long double __x))
("fistpll %0" \ ("fistpll %0" \
: "=m" (__llrintres) : "t" (__x) : "st"); \ : "=m" (__llrintres) : "t" (__x) : "st"); \
return __llrintres return __llrintres
__extension__
__MATH_INLINE long long int __MATH_INLINE long long int
__NTH (llrintf (float __x)) __NTH (llrintf (float __x))
{ {
__llrint_code; __llrint_code;
} }
__extension__
__MATH_INLINE long long int __MATH_INLINE long long int
__NTH (llrint (double __x)) __NTH (llrint (double __x))
{ {
__llrint_code; __llrint_code;
} }
__extension__
__MATH_INLINE long long int __MATH_INLINE long long int
__NTH (llrintl (long double __x)) __NTH (llrintl (long double __x))
{ {