qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove __GLIBC_HAVE_LONG_LONG.

This commit is contained in:
Joseph Myers 2013-01-11 21:13:25 +00:00
parent 0e8529e94f
commit 6a57d93130
11 changed files with 48 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ChangeLog
View File

@ -1,3 +1,25 @@
2013-01-11 Joseph Myers <joseph@codesourcery.com>
* include/features.h (__GLIBC_HAVE_LONG_LONG): Remove.
* bits/byteswap.h [__GLIBC_HAVE_LONG_LONG]: Change #elif condition
to just #else.
* bits/types.h [__GLIBC_HAVE_LONG_LONG]: Likewise. Remove
[!__GLIBC_HAVE_LONG_LONG] case.
* posix/sys/types.h [__GLIBC_HAVE_LONG_LONG]: Change #elif
condition to just #else.
* stdlib/stdlib.h [__USE_ISOC99 || (__GLIBC_HAVE_LONG_LONG &&
__USE_MISC)]: Change all uses to [__USE_ISOC99 || __USE_MISC].
[__GLIBC_HAVE_LONG_LONG && __USE_BSD]: Change to [__USE_BSD].
* string/byteswap.h [__GLIBC_HAVE_LONG_LONG]: Make code
unconditional.
* string/endian.h [__GLIBC_HAVE_LONG_LONG]: Likewise.
* sysdeps/s390/bits/byteswap.h [__GLIBC_HAVE_LONG_LONG]: Change
#elif condition to just #else.
* sysdeps/unix/sysv/linux/sys/sysmacros.h
[__GLIBC_HAVE_LONG_LONG]: Make code unconditional.
* sysdeps/x86/bits/byteswap.h [__GLIBC_HAVE_LONG_LONG]: Change
#elif condition to just #else.
2013-01-11 Steve Ellcey <sellcey@mips.com> 2013-01-11 Steve Ellcey <sellcey@mips.com>
* elf/elf.h (EF_MIPS_ARCH_32): Fix value. * elf/elf.h (EF_MIPS_ARCH_32): Fix value.

2
bits/byteswap.h
View File

@ -91,7 +91,7 @@ __bswap_64 (__uint64_t __bsx)
} \ } \
__r.__ll; })) __r.__ll; }))
# endif # endif
#elif __GLIBC_HAVE_LONG_LONG #else
# define __bswap_constant_64(x) \ # define __bswap_constant_64(x) \
((((x) & 0xff00000000000000ull) >> 56) \ ((((x) & 0xff00000000000000ull) >> 56) \
| (((x) & 0x00ff000000000000ull) >> 40) \ | (((x) & 0x00ff000000000000ull) >> 40) \

13
bits/types.h
View File

@ -42,7 +42,7 @@ typedef unsigned int __uint32_t;
#if __WORDSIZE == 64 #if __WORDSIZE == 64
typedef signed long int __int64_t; typedef signed long int __int64_t;
typedef unsigned long int __uint64_t; typedef unsigned long int __uint64_t;
#elif defined __GLIBC_HAVE_LONG_LONG #else
__extension__ typedef signed long long int __int64_t; __extension__ typedef signed long long int __int64_t;
__extension__ typedef unsigned long long int __uint64_t; __extension__ typedef unsigned long long int __uint64_t;
#endif #endif
@ -51,18 +51,9 @@ __extension__ typedef unsigned long long int __uint64_t;
#if __WORDSIZE == 64 #if __WORDSIZE == 64
typedef long int __quad_t; typedef long int __quad_t;
typedef unsigned long int __u_quad_t; typedef unsigned long int __u_quad_t;
#elif defined __GLIBC_HAVE_LONG_LONG #else
__extension__ typedef long long int __quad_t; __extension__ typedef long long int __quad_t;
__extension__ typedef unsigned long long int __u_quad_t; __extension__ typedef unsigned long long int __u_quad_t;
#else
typedef struct
{
long __val[2];
} __quad_t;
typedef struct
{
__u_long __val[2];
} __u_quad_t;
#endif #endif

8
include/features.h
View File

@ -358,14 +358,6 @@
#define __GLIBC_PREREQ(maj, min) \ #define __GLIBC_PREREQ(maj, min) \
((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min)) ((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
/* Decide whether a compiler supports the long long datatypes. */
#if defined __GNUC__ \
|| (defined __PGI && defined __i386__ ) \
|| (defined __INTEL_COMPILER && (defined __i386__ || defined __ia64__)) \
|| (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
# define __GLIBC_HAVE_LONG_LONG 1
#endif
/* This is here only because every header file already includes this one. */ /* This is here only because every header file already includes this one. */
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
# ifndef _SYS_CDEFS_H # ifndef _SYS_CDEFS_H

4
posix/sys/types.h
View File

@ -164,7 +164,7 @@ typedef short int int16_t;
typedef int int32_t; typedef int int32_t;
# if __WORDSIZE == 64 # if __WORDSIZE == 64
typedef long int int64_t; typedef long int int64_t;
# elif __GLIBC_HAVE_LONG_LONG # else
__extension__ typedef long long int int64_t; __extension__ typedef long long int int64_t;
# endif # endif
# endif # endif
@ -175,7 +175,7 @@ typedef unsigned short int u_int16_t;
typedef unsigned int u_int32_t; typedef unsigned int u_int32_t;
# if __WORDSIZE == 64 # if __WORDSIZE == 64
typedef unsigned long int u_int64_t; typedef unsigned long int u_int64_t;
# elif __GLIBC_HAVE_LONG_LONG # else
__extension__ typedef unsigned long long int u_int64_t; __extension__ typedef unsigned long long int u_int64_t;
# endif # endif

10
stdlib/stdlib.h
View File

@ -151,7 +151,7 @@ extern long int atol (const char *__nptr)
__THROW __attribute_pure__ __nonnull ((1)) __wur; __THROW __attribute_pure__ __nonnull ((1)) __wur;
__END_NAMESPACE_STD __END_NAMESPACE_STD
#if defined __USE_ISOC99 || (defined __GLIBC_HAVE_LONG_LONG && defined __USE_MISC) #if defined __USE_ISOC99 || defined __USE_MISC
__BEGIN_NAMESPACE_C99 __BEGIN_NAMESPACE_C99
/* Convert a string to a long long integer. */ /* Convert a string to a long long integer. */
__extension__ extern long long int atoll (const char *__nptr) __extension__ extern long long int atoll (const char *__nptr)
@ -189,7 +189,7 @@ extern unsigned long int strtoul (const char *__restrict __nptr,
__THROW __nonnull ((1)); __THROW __nonnull ((1));
__END_NAMESPACE_STD __END_NAMESPACE_STD
#if defined __GLIBC_HAVE_LONG_LONG && defined __USE_BSD #ifdef __USE_BSD
/* Convert a string to a quadword integer. */ /* Convert a string to a quadword integer. */
__extension__ __extension__
extern long long int strtoq (const char *__restrict __nptr, extern long long int strtoq (const char *__restrict __nptr,
@ -200,9 +200,9 @@ __extension__
extern unsigned long long int strtouq (const char *__restrict __nptr, extern unsigned long long int strtouq (const char *__restrict __nptr,
char **__restrict __endptr, int __base) char **__restrict __endptr, int __base)
__THROW __nonnull ((1)); __THROW __nonnull ((1));
#endif /* GCC and use BSD. */ #endif /* Use BSD. */
#if defined __USE_ISOC99 || (defined __GLIBC_HAVE_LONG_LONG && defined __USE_MISC) #if defined __USE_ISOC99 || defined __USE_MISC
__BEGIN_NAMESPACE_C99 __BEGIN_NAMESPACE_C99
/* Convert a string to a quadword integer. */ /* Convert a string to a quadword integer. */
__extension__ __extension__
@ -215,7 +215,7 @@ extern unsigned long long int strtoull (const char *__restrict __nptr,
char **__restrict __endptr, int __base) char **__restrict __endptr, int __base)
__THROW __nonnull ((1)); __THROW __nonnull ((1));
__END_NAMESPACE_C99 __END_NAMESPACE_C99
#endif /* ISO C99 or GCC and use MISC. */ #endif /* ISO C99 or use MISC. */
#ifdef __USE_GNU #ifdef __USE_GNU

4
string/byteswap.h
View File

@ -33,9 +33,7 @@
/* Return a value with all bytes in the 32 bit argument swapped. */ /* Return a value with all bytes in the 32 bit argument swapped. */
#define bswap_32(x) __bswap_32 (x) #define bswap_32(x) __bswap_32 (x)
#if __GLIBC_HAVE_LONG_LONG
/* Return a value with all bytes in the 64 bit argument swapped. */ /* Return a value with all bytes in the 64 bit argument swapped. */
# define bswap_64(x) __bswap_64 (x) #define bswap_64(x) __bswap_64 (x)
#endif
#endif /* byteswap.h */ #endif /* byteswap.h */

20
string/endian.h
View File

@ -70,12 +70,10 @@
# define be32toh(x) __bswap_32 (x) # define be32toh(x) __bswap_32 (x)
# define le32toh(x) (x) # define le32toh(x) (x)
# if __GLIBC_HAVE_LONG_LONG # define htobe64(x) __bswap_64 (x)
# define htobe64(x) __bswap_64 (x) # define htole64(x) (x)
# define htole64(x) (x) # define be64toh(x) __bswap_64 (x)
# define be64toh(x) __bswap_64 (x) # define le64toh(x) (x)
# define le64toh(x) (x)
# endif
# else # else
# define htobe16(x) (x) # define htobe16(x) (x)
@ -88,12 +86,10 @@
# define be32toh(x) (x) # define be32toh(x) (x)
# define le32toh(x) __bswap_32 (x) # define le32toh(x) __bswap_32 (x)
# if __GLIBC_HAVE_LONG_LONG # define htobe64(x) (x)
# define htobe64(x) (x) # define htole64(x) __bswap_64 (x)
# define htole64(x) __bswap_64 (x) # define be64toh(x) (x)
# define be64toh(x) (x) # define le64toh(x) __bswap_64 (x)
# define le64toh(x) __bswap_64 (x)
# endif
# endif # endif
#endif #endif

2
sysdeps/s390/bits/byteswap.h
View File

@ -112,7 +112,7 @@ __bswap_32 (unsigned int __bsx)
__r.__l[1] = __bswap_32 (__w.__l[0]); \ __r.__l[1] = __bswap_32 (__w.__l[0]); \
__r.__ll; }) __r.__ll; })
# endif # endif
#elif __GLIBC_HAVE_LONG_LONG #else
# define __bswap_constant_64(x) \ # define __bswap_constant_64(x) \
((((x) & 0xff00000000000000ull) >> 56) \ ((((x) & 0xff00000000000000ull) >> 56) \
| (((x) & 0x00ff000000000000ull) >> 40) \ | (((x) & 0x00ff000000000000ull) >> 40) \

15
sysdeps/unix/sysv/linux/sys/sysmacros.h
View File

@ -21,10 +21,6 @@
#include <features.h> #include <features.h>
/* If the compiler does not know long long it is out of luck. We are
not going to hack weird hacks to support the dev_t representation
they need. */
#ifdef __GLIBC_HAVE_LONG_LONG
__BEGIN_DECLS __BEGIN_DECLS
__extension__ __extension__
@ -38,7 +34,7 @@ extern unsigned long long int gnu_dev_makedev (unsigned int __major,
unsigned int __minor) unsigned int __minor)
__THROW __attribute_const__; __THROW __attribute_const__;
# ifdef __USE_EXTERN_INLINES #ifdef __USE_EXTERN_INLINES
__extension__ __extern_inline __attribute_const__ unsigned int __extension__ __extern_inline __attribute_const__ unsigned int
__NTH (gnu_dev_major (unsigned long long int __dev)) __NTH (gnu_dev_major (unsigned long long int __dev))
{ {
@ -58,13 +54,12 @@ __NTH (gnu_dev_makedev (unsigned int __major, unsigned int __minor))
| (((unsigned long long int) (__minor & ~0xff)) << 12) | (((unsigned long long int) (__minor & ~0xff)) << 12)
| (((unsigned long long int) (__major & ~0xfff)) << 32)); | (((unsigned long long int) (__major & ~0xfff)) << 32));
} }
# endif #endif
__END_DECLS __END_DECLS
/* Access the functions with their traditional names. */ /* Access the functions with their traditional names. */
# define major(dev) gnu_dev_major (dev) #define major(dev) gnu_dev_major (dev)
# define minor(dev) gnu_dev_minor (dev) #define minor(dev) gnu_dev_minor (dev)
# define makedev(maj, min) gnu_dev_makedev (maj, min) #define makedev(maj, min) gnu_dev_makedev (maj, min)
#endif
#endif /* sys/sysmacros.h */ #endif /* sys/sysmacros.h */

2
sysdeps/x86/bits/byteswap.h
View File

@ -134,7 +134,7 @@ __bswap_64 (__uint64_t __bsx)
} \ } \
__r.__ll; })) __r.__ll; }))
# endif # endif
#elif __GLIBC_HAVE_LONG_LONG #else
# define __bswap_constant_64(x) \ # define __bswap_constant_64(x) \
((((x) & 0xff00000000000000ull) >> 56) \ ((((x) & 0xff00000000000000ull) >> 56) \
| (((x) & 0x00ff000000000000ull) >> 40) \ | (((x) & 0x00ff000000000000ull) >> 40) \