From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 15 Dec 2020 08:51:51 +0000 (+0100)
Subject: Merge branch 'PHP-8.0'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9942b061d980113193930b4e22b1e95bbec1c38;p=php

Merge branch 'PHP-8.0'

* PHP-8.0:
  JIT disabled build fix.
---

f9942b061d980113193930b4e22b1e95bbec1c38
diff --cc ext/opcache/ZendAccelerator.c
index f39bc21278,19fc938228..891863df61
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -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 */