Merge branch 'PHP-8.0'

* PHP-8.0:
  Revert "Fixed bug #80377"

Author: dstogov

ext/opcache/config.m4

@@ -66,7 +66,7 @@ if test "$PHP_OPCACHE" != "no"; then
       esac
     fi
 
-    if test "$PHP_THREAD_SAFETY" = "yes"; then
+    if test "$enable_zts" = "yes"; then
       DASM_FLAGS="$DASM_FLAGS -D ZTS=1"
     fi
 

ext/session/config.m4

@@ -31,7 +31,7 @@ if test "$PHP_MM" != "no"; then
     AC_MSG_ERROR(cannot find mm library)
   fi
 
-  if test "$PHP_THREAD_SAFETY" = "yes"; then
+  if test "$enable_zts" = "yes"; then
     dnl The mm library is not thread-safe, and mod_mm.c refuses to compile.
     AC_MSG_ERROR(--with-mm cannot be combined with --enable-zts)
   fi