]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-8.0'
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 15 Dec 2020 08:51:51 +0000 (09:51 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 15 Dec 2020 08:51:51 +0000 (09:51 +0100)
* PHP-8.0:
  JIT disabled build fix.

1  2 
ext/opcache/ZendAccelerator.c

index f39bc2127879f92344a0e2757d5abb60b9da1e41,19fc938228d4d563bc324a2cd581b591f37e5319..891863df615b39476c10b53b9e651c2d5be8a9c7
@@@ -3055,11 -3055,13 +3055,13 @@@ static zend_result accel_post_startup(v
                SHM_PROTECT();
        } else if (!ZCG(accel_directives).file_cache) {
                accel_startup_ok = 0;
 -              zend_accel_error(ACCEL_LOG_FATAL, "opcache.file_cache_only is set without a proper setting of opcache.file_cache");
 +              zend_accel_error_noreturn(ACCEL_LOG_FATAL, "opcache.file_cache_only is set without a proper setting of opcache.file_cache");
                return SUCCESS;
        } else {
+ #ifdef HAVE_JIT
                JIT_G(enabled) = 0;
                JIT_G(on) = 0;
+ #endif
                accel_shared_globals = calloc(1, sizeof(zend_accel_shared_globals));
  
                /* Init auto-global strings */