diff options
| author | Martin Mares <mj@ucw.cz> | 2022-10-30 14:00:29 +0100 |
|---|---|---|
| committer | Martin Mares <mj@ucw.cz> | 2022-10-30 14:00:29 +0100 |
| commit | 637ad022fcc53da9ef84d11f9772bcb02c0d02ea (patch) | |
| tree | 8033558202a5ebe662d039262fb547369f8d47e5 | |
| parent | db933955057af7e3a7f19a8a488ac4f4a9ab2593 (diff) | |
| parent | 01ecaf9e3a515895d9eec85bc954412a6d0d7d97 (diff) | |
| download | pciutils-637ad022fcc53da9ef84d11f9772bcb02c0d02ea.tar.gz | |
Merge remote-tracking branch 'pali/win32-readeflags'
| -rw-r--r-- | lib/i386-io-windows.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/i386-io-windows.h b/lib/i386-io-windows.h index ac2a55d..1509d7d 100644 --- a/lib/i386-io-windows.h +++ b/lib/i386-io-windows.h @@ -107,16 +107,13 @@ unsigned long _inpd(unsigned short port); * function conflicts with some MSVC intrinsic. * MSVC supports inline assembly via __asm keyword in 32-bit mode only. * GCC version 4.9.0 and higher provides __builtin_ia32_readeflags_uXX() - * builtin for XX-mode. + * builtin for XX-mode. This builtin is also available as __readeflags() + * function indirectly via <x86intrin.h> header file. */ #if defined(_MSC_VER) && (_MSC_VER >= 1500 || (_MSC_VER >= 1400 && defined(__BUILDMACHINE__))) #pragma intrinsic(__readeflags) #elif defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 9) || (__GNUC__ > 4)) -#ifdef __x86_64__ -#define __readeflags() __builtin_ia32_readeflags_u64() -#else -#define __readeflags() __builtin_ia32_readeflags_u32() -#endif +#include <x86intrin.h> #elif defined(_MSC_VER) && defined(_M_IX86) static inline unsigned int __readeflags(void) |