com php-src: JIT disabled build fix.: ext/opcache/ZendAccelerator.c
| From: | Nikita Popov | Date: | Tue, 15 Dec 2020 08:51:16 +0000 |
| Subject: | com php-src: JIT disabled build fix.: ext/opcache/ZendAccelerator.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-114445@lists.php.net to get a copy of this message | ||
Commit: 1e6c7e776c1f8958524d5b7af047e55108d870d2
Author: David Carlier <devnexen@gmail.com> Mon, 14 Dec 2020 18:42:52 +0000
Committer: Nikita Popov <nikita.ppv@gmail.com> Tue, 15 Dec 2020 09:51:16 +0100
Parents: 2e974c8c81771883d85af9cef6d5563db5b381df
Branches: PHP-8.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1e6c7e776c1f8958524d5b7af047e55108d870d2
Log:
JIT disabled build fix.
Closes GH-6514.
Changed paths:
M ext/opcache/ZendAccelerator.c
Diff:
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 5c7f31b4879..19fc938228d 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(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 */