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 /build | |
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 'build')
-rw-r--r-- | build/php.m4 | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/build/php.m4 b/build/php.m4 index fd37373f20..e91ef9887c 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -2675,6 +2675,30 @@ AC_DEFUN([PHP_CHECK_BUILTIN_CPU_SUPPORTS], [ ]) dnl +dnl PHP_CHECK_CPU_SUPPORTS +dnl +AC_DEFUN([PHP_CHECK_CPU_SUPPORTS], [ + AC_REQUIRE([PHP_CHECK_BUILTIN_CPU_INIT]) + AC_REQUIRE([PHP_CHECK_BUILTIN_CPU_SUPPORTS]) + have_ext_instructions=0 + if test $have_builtin_cpu_supports = 1; then + AC_MSG_CHECKING([for $1 instructions supports]) + AC_RUN_IFELSE([AC_LANG_SOURCE([[ +int main() { + return __builtin_cpu_supports("$1")? 0 : 1; +} + ]])], [ + have_ext_instructions=1 + AC_MSG_RESULT([yes]) + ], [ + AC_MSG_RESULT([no]) + ], [AC_MSG_RESULT([no])]) + fi + AC_DEFINE_UNQUOTED(AS_TR_CPP([PHP_HAVE_$1_INSTRUCTIONS]), + [$have_ext_instructions], [Whether the compiler supports $1 instructions]) +]) + +dnl dnl PHP_PATCH_CONFIG_HEADERS([FILE]) dnl dnl PACKAGE_* symbols are automatically defined by Autoconf. When including |