diff options
Diffstat (limited to 'x86_64-w64-mingw32/include/_mingw_mac.h')
| -rw-r--r-- | x86_64-w64-mingw32/include/_mingw_mac.h | 90 |
1 files changed, 48 insertions, 42 deletions
diff --git a/x86_64-w64-mingw32/include/_mingw_mac.h b/x86_64-w64-mingw32/include/_mingw_mac.h index 6f73a031..843aebd1 100644 --- a/x86_64-w64-mingw32/include/_mingw_mac.h +++ b/x86_64-w64-mingw32/include/_mingw_mac.h @@ -11,7 +11,7 @@ #define __MINGW64_STRINGIFY(x) \ __STRINGIFY(x) -#define __MINGW64_VERSION_MAJOR 4 +#define __MINGW64_VERSION_MAJOR 5 #define __MINGW64_VERSION_MINOR 0 /* This macro holds an monotonic increasing value, which indicates @@ -27,7 +27,7 @@ "." \ __MINGW64_STRINGIFY(__MINGW64_VERSION_MINOR) -#define __MINGW64_VERSION_STATE "stable" +#define __MINGW64_VERSION_STATE "alpha" /* mingw.org's version macros: these make gcc to define MINGW32_SUPPORTS_MT_EH and to use the _CRT_MT global @@ -36,7 +36,49 @@ #define __MINGW32_MAJOR_VERSION 3 #define __MINGW32_MINOR_VERSION 11 -#ifdef _WIN64 +/* Set VC specific compiler target macros. */ +#if defined(__x86_64) && defined(_X86_) +# undef _X86_ /* _X86_ is not for __x86_64 */ +#endif + +#if defined(_X86_) && !defined(_M_IX86) && !defined(_M_IA64) \ + && !defined(_M_AMD64) && !defined(__x86_64) +# if defined(__i486__) +# define _M_IX86 400 +# elif defined(__i586__) +# define _M_IX86 500 +# else + /* This gives wrong (600 instead of 300) value if -march=i386 is specified + but we cannot check for__i386__ as it is defined for all 32-bit CPUs. */ +# define _M_IX86 600 +# endif +#endif /* if defined(_X86_) && !defined(_M_IX86) && !defined(_M_IA64) ... */ + +#if defined(__x86_64) && !defined(_M_IX86) && !defined(_M_IA64) \ + && !defined(_M_AMD64) +# define _M_AMD64 100 +# define _M_X64 100 +#endif + +#if defined(__ia64__) && !defined(_M_IX86) && !defined(_M_IA64) \ + && !defined(_M_AMD64) && !defined(_X86_) && !defined(__x86_64) +# define _M_IA64 100 +#endif + +#if defined(__arm__) && !defined(_M_ARM) && !defined(_M_ARMT) \ + && !defined(_M_THUMB) +# define _M_ARM 100 +# define _M_ARMT 100 +# define _M_THUMB 100 +# ifndef _ARM_ +# define _ARM_ 1 +# endif +# ifndef _M_ARM_NT +# define _M_ARM_NT 1 +# endif +#endif + +#ifndef _X86_ /* MS does not prefix symbols by underscores for 64-bit. */ # ifndef __MINGW_USE_UNDERSCORE_PREFIX /* As we have to support older gcc version, which are using underscores @@ -57,11 +99,11 @@ # define __MINGW_USE_UNDERSCORE_PREFIX 0 # endif /* __USER_LABEL_PREFIX__ */ # endif -#else /* ! ifdef _WIN64 */ - /* For 32-bits we have always to prefix by underscore. */ +#else /* ! ifndef _X86_ */ + /* For x86 we have always to prefix by underscore. */ # undef __MINGW_USE_UNDERSCORE_PREFIX # define __MINGW_USE_UNDERSCORE_PREFIX 1 -#endif /* ifdef _WIN64 */ +#endif /* ifndef _X86_ */ #if __MINGW_USE_UNDERSCORE_PREFIX == 0 # define __MINGW_IMP_SYMBOL(sym) __imp_##sym @@ -75,42 +117,6 @@ # define __MINGW_LSYMBOL(sym) sym #endif /* if __MINGW_USE_UNDERSCORE_PREFIX == 0 */ -/* Set VC specific compiler target macros. */ -#if defined(__x86_64) && defined(_X86_) -# undef _X86_ /* _X86_ is not for __x86_64 */ -#endif - -#if defined(_X86_) && !defined(_M_IX86) && !defined(_M_IA64) \ - && !defined(_M_AMD64) && !defined(__x86_64) -# if defined(__i486__) -# define _M_IX86 400 -# elif defined(__i586__) -# define _M_IX86 500 -# else - /* This gives wrong (600 instead of 300) value if -march=i386 is specified - but we cannot check for__i386__ as it is defined for all 32-bit CPUs. */ -# define _M_IX86 600 -# endif -#endif /* if defined(_X86_) && !defined(_M_IX86) && !defined(_M_IA64) ... */ - -#if defined(__x86_64) && !defined(_M_IX86) && !defined(_M_IA64) \ - && !defined(_M_AMD64) -# define _M_AMD64 100 -# define _M_X64 100 -#endif - -#if defined(__ia64__) && !defined(_M_IX86) && !defined(_M_IA64) \ - && !defined(_M_AMD64) && !defined(_X86_) && !defined(__x86_64) -# define _M_IA64 100 -#endif - -#if defined(__arm__) && !defined(_M_ARM) -# define _M_ARM 100 -# ifndef _ARM_ -# define _ARM_ 1 -# endif -#endif - #ifndef __PTRDIFF_TYPE__ # ifdef _WIN64 # define __PTRDIFF_TYPE__ long long int |