diff options
| author | Jia Tan <jiat0218@gmail.com> | 2023-04-19 22:22:16 +0800 |
|---|---|---|
| committer | Jia Tan <jiat0218@gmail.com> | 2023-04-19 22:22:16 +0800 |
| commit | f41df2ac2fed347d3f107f3533e76e000d29c6cb (patch) | |
| tree | 2f434efad6e8672a261a31881b64d7969240b4bc | |
| parent | 7062348bf35c1e4cbfee00ad9fffb4a21aa6eff7 (diff) | |
| download | xz-f41df2ac2fed347d3f107f3533e76e000d29c6cb.tar.gz | |
Windows: Include <intrin.h> when needed.
Legacy Windows did not need to #include <intrin.h> to use the MSVC
intrinsics. Newer versions likely just issue a warning, but the MSVC
documentation says to include the header file for the intrinsics we use.
GCC and Clang can "pretend" to be MSVC on Windows, so extra checks are
needed in tuklib_integer.h to only include <intrin.h> when it will is
actually needed.
| -rw-r--r-- | src/common/tuklib_integer.h | 6 | ||||
| -rw-r--r-- | src/liblzma/common/memcmplen.h | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/common/tuklib_integer.h b/src/common/tuklib_integer.h index 2125695..aee1ad0 100644 --- a/src/common/tuklib_integer.h +++ b/src/common/tuklib_integer.h @@ -52,6 +52,12 @@ // and such functions. #if defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1500) # include <immintrin.h> +// Only include <intrin.h> when it is needed. GCC and Clang can both +// use __builtin's, so we only need Windows instrincs when using MSVC. +// GCC and Clang can set _MSC_VER on Windows, so we need to exclude these +// cases explicitly. +#elif defined(_MSC_VER) && !TUKLIB_GNUC_REQ(3, 4) && !defined(__clang__) +# include <intrin.h> #endif diff --git a/src/liblzma/common/memcmplen.h b/src/liblzma/common/memcmplen.h index 5372cfa..db3fff6 100644 --- a/src/liblzma/common/memcmplen.h +++ b/src/liblzma/common/memcmplen.h @@ -19,6 +19,16 @@ # include <immintrin.h> #endif +// Only include <intrin.h> if it is needed. The header is only needed +// on Windows when using an MSVC compatible compiler. The Intel compiler +// can use the intrinsics without the header file. +#if defined(TUKLIB_FAST_UNALIGNED_ACCESS) \ + && (defined(_MSC_VER) \ + && defined(_M_X64) \ + && !defined(__INTEL_COMPILER)) +# include <intrin.h> +#endif + /// Find out how many equal bytes the two buffers have. /// |