headers: correct value of _M_IX86 based on arch

different variations of -march can be passed to the compiler.
this also fixes building winpthreads  when __i686__ is not present.
This commit is contained in:
Martell Malone 2017-11-13 05:51:30 +00:00
parent 9bd31fabf8
commit 55f4a99b45
2 changed files with 4 additions and 4 deletions

View File

@ -47,10 +47,10 @@
# 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. */
# elif defined(__i686__)
# define _M_IX86 600
# else
# define _M_IX86 300
# endif
#endif /* if defined(_X86_) && !defined(_M_IX86) && !defined(_M_IA64) ... */

View File

@ -1457,7 +1457,7 @@ pthread_setcanceltype (int type, int *oldtype)
return 0;
}
#if defined(__i686__)
#if defined(__i386__)
/* Align ESP on 16-byte boundaries. */
# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)
__attribute__((force_align_arg_pointer))