diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-11-04 11:32:46 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-11-04 11:32:46 +0100 |
| commit | 451314111b9942c8389415f04e9017c3e3d3cb56 (patch) | |
| tree | 3cdcd889bc41a827d37b756586df37f6ff55aae8 /Zend/zend_portability.h | |
| parent | c9abfaec6bf61bcef6d9651827b49cc7789018fd (diff) | |
| download | php-git-451314111b9942c8389415f04e9017c3e3d3cb56.tar.gz | |
Revert "Remove configure checks for supported instruction sets"
This reverts commit edccf32f7f36a8bc759b9482737e0c3efcb3a005.
This was reported to cause issues for as yet unknown reasons in
bug #78769. As this was intended as code cleanup, revert this from
7.4 at least. May reapply it to master later.
Diffstat (limited to 'Zend/zend_portability.h')
| -rw-r--r-- | Zend/zend_portability.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h index 3331b9ed10..1e549d300b 100644 --- a/Zend/zend_portability.h +++ b/Zend/zend_portability.h @@ -532,21 +532,21 @@ static zend_always_inline double _zend_get_nan(void) /* {{{ */ #endif #if (defined(__i386__) || defined(__x86_64__)) -# if defined(HAVE_TMMINTRIN_H) -# define PHP_HAVE_SSSE3 +# if PHP_HAVE_SSSE3_INSTRUCTIONS && defined(HAVE_TMMINTRIN_H) +# define PHP_HAVE_SSSE3 # endif -# if defined(HAVE_NMMINTRIN_H) -# define PHP_HAVE_SSE4_2 +# if PHP_HAVE_SSE4_2_INSTRUCTIONS && defined(HAVE_NMMINTRIN_H) +# define PHP_HAVE_SSE4_2 # endif /* * AVX2 support was added in gcc 4.7, but AVX2 intrinsics don't work in * __attribute__((target("avx2"))) functions until gcc 4.9. */ -# if defined(HAVE_IMMINTRIN_H) && \ +# if PHP_HAVE_AVX2_INSTRUCTIONS && defined(HAVE_IMMINTRIN_H) && \ (defined(__llvm__) || defined(__clang__) || (defined(__GNUC__) && ZEND_GCC_VERSION >= 4009)) -# define PHP_HAVE_AVX2 +# define PHP_HAVE_AVX2 # endif #endif |