diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-15 09:51:51 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-15 09:51:51 +0100 |
| commit | f9942b061d980113193930b4e22b1e95bbec1c38 (patch) | |
| tree | 5b9f4c66cb0e6180c2b1244166b791e56b406c26 | |
| parent | b59156ca8cbfa430a936ce29de62b4b4531766bf (diff) | |
| parent | 1e6c7e776c1f8958524d5b7af047e55108d870d2 (diff) | |
| download | php-git-f9942b061d980113193930b4e22b1e95bbec1c38.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
JIT disabled build fix.
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index f39bc21278..891863df61 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -3058,8 +3058,10 @@ static zend_result accel_post_startup(void) 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 */ |