diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2014-08-19 14:59:19 +0000 |
|---|---|---|
| committer | Kai Tietz <ktietz@gcc.gnu.org> | 2014-08-19 16:59:19 +0200 |
| commit | a3b69d6f0e8bf4dba2120c6518c85cf99feedc16 (patch) | |
| tree | ee22b8abd9022922fe97625bf3797b98175a08f9 | |
| parent | 6fe8c024aaebab2bce6c2e4636a6d2cb7cafff5f (diff) | |
| download | gcc-a3b69d6f0e8bf4dba2120c6518c85cf99feedc16.zip gcc-a3b69d6f0e8bf4dba2120c6518c85cf99feedc16.tar.gz gcc-a3b69d6f0e8bf4dba2120c6518c85cf99feedc16.tar.bz2 | |
cygwin-stdint.h: Throughout, make type definitions dependent on target architecture, not host.
2014-08-19 Yaakov Selkowitz <yselkowi@redhat.com>
* config/i386/cygwin-stdint.h: Throughout, make type
definitions dependent on target architecture, not host.
From-SVN: r214156
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/i386/cygwin-stdint.h | 57 |
2 files changed, 17 insertions, 45 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d2db5c9..f7a84c0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2014-08-19 Yaakov Selkowitz <yselkowi@redhat.com> + + * config/i386/cygwin-stdint.h: Throughout, make type + definitions dependent on target architecture, not host. + 2014-08-19 David Malcolm <dmalcolm@redhat.com> * rtl.h (PREV_INSN): Convert to an inline function. Strengthen diff --git a/gcc/config/i386/cygwin-stdint.h b/gcc/config/i386/cygwin-stdint.h index 3c82cc6..9ec27dd 100644 --- a/gcc/config/i386/cygwin-stdint.h +++ b/gcc/config/i386/cygwin-stdint.h @@ -24,71 +24,38 @@ along with GCC; see the file COPYING3. If not see #define INT8_TYPE "signed char" #define INT16_TYPE "short int" #define INT32_TYPE "int" -#ifdef __x86_64__ -#define INT64_TYPE "long int" -#else -#define INT64_TYPE "long long int" -#endif +#define INT64_TYPE (TARGET_64BIT ? "long int" : "long long int") #define UINT8_TYPE "unsigned char" #define UINT16_TYPE "short unsigned int" #define UINT32_TYPE "unsigned int" -#ifdef __x86_64__ -#define UINT64_TYPE "long unsigned int" -#else -#define UINT64_TYPE "long long unsigned int" -#endif +#define UINT64_TYPE (TARGET_64BIT ? "long unsigned int" : "long long unsigned int") /* Minimum-width integer types */ #define INT_LEAST8_TYPE "signed char" #define INT_LEAST16_TYPE "short int" #define INT_LEAST32_TYPE "int" -#ifdef __x86_64__ -#define INT_LEAST64_TYPE "long int" -#else -#define INT_LEAST64_TYPE "long long int" -#endif +#define INT_LEAST64_TYPE (TARGET_64BIT ? "long int" : "long long int") #define UINT_LEAST8_TYPE "unsigned char" #define UINT_LEAST16_TYPE "short unsigned int" #define UINT_LEAST32_TYPE "unsigned int" -#ifdef __x86_64__ -#define UINT_LEAST64_TYPE "long unsigned int" -#else -#define UINT_LEAST64_TYPE "long long unsigned int" -#endif +#define UINT_LEAST64_TYPE (TARGET_64BIT ? "long unsigned int" : "long long unsigned int") /* Fastest minimum-width integer types */ #define INT_FAST8_TYPE "signed char" -#ifdef __x86_64__ -#define INT_FAST16_TYPE "long int" -#define INT_FAST32_TYPE "long int" -#define INT_FAST64_TYPE "long int" -#else -#define INT_FAST16_TYPE "int" -#define INT_FAST32_TYPE "int" -#define INT_FAST64_TYPE "long long int" -#endif +#define INT_FAST16_TYPE (TARGET_64BIT ? "long int" : "int") +#define INT_FAST32_TYPE (TARGET_64BIT ? "long int" : "int") +#define INT_FAST64_TYPE (TARGET_64BIT ? "long int" : "long long int") #define UINT_FAST8_TYPE "unsigned char" -#ifdef __x86_64__ -#define UINT_FAST16_TYPE "long unsigned int" -#define UINT_FAST32_TYPE "long unsigned int" -#define UINT_FAST64_TYPE "long unsigned int" -#else -#define UINT_FAST16_TYPE "unsigned int" -#define UINT_FAST32_TYPE "unsigned int" -#define UINT_FAST64_TYPE "long long unsigned int" -#endif +#define UINT_FAST16_TYPE (TARGET_64BIT ? "long unsigned int" : "unsigned int") +#define UINT_FAST32_TYPE (TARGET_64BIT ? "long unsigned int" : "unsigned int") +#define UINT_FAST64_TYPE (TARGET_64BIT ? "long unsigned int" : "long long unsigned int") /* Integer types capable of holding object pointers */ -#ifdef __x86_64__ -#define INTPTR_TYPE "long int" -#define UINTPTR_TYPE "long unsigned int" -#else -#define INTPTR_TYPE "int" -#define UINTPTR_TYPE "unsigned int" -#endif +#define INTPTR_TYPE (TARGET_64BIT ? "long int" : "int") +#define UINTPTR_TYPE (TARGET_64BIT ? "long unsigned int" : "unsigned int") |