summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-05-22 16:57:14 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-05-22 16:57:14 +0200
commit10eb842a6434f7b05dbb8676da57ada445f4434f (patch)
treeabd6e221a81886bae3652d4a7132fe8ccf482707
parent6ad746488ec4b06b7bdfe06b52f70230edf4e38d (diff)
downloadphp-git-10eb842a6434f7b05dbb8676da57ada445f4434f.tar.gz
Revert "Fix #79595: zend_init_fpu() alters FPU precision"
This reverts commit 88dfc475c5937822399843e8aed9b98a36a01813.
-rw-r--r--NEWS1
-rw-r--r--Zend/zend_float.c7
2 files changed, 2 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 007406315f..eb88651544 100644
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,6 @@ PHP NEWS
. Fixed bug #79489 (.user.ini does not inherit). (cmb)
. Fixed bug #79600 (Regression in 7.4.6 when yielding an array based
generator). (Nikita)
- . Fixed bug #79595 (zend_init_fpu() alters FPU precision). (cmb, Nikita)
- FFI:
. Fixed bug #79571 (FFI: var_dumping unions may segfault). (cmb)
diff --git a/Zend/zend_float.c b/Zend/zend_float.c
index 2d7e6529a5..90af0c4a5f 100644
--- a/Zend/zend_float.c
+++ b/Zend/zend_float.c
@@ -22,8 +22,7 @@
ZEND_API void zend_init_fpu(void) /* {{{ */
{
-/* under __SSE__ the FPCW is irrelevant; no need to change it */
-#if XPFPA_HAVE_CW && !defined(__SSE__)
+#if XPFPA_HAVE_CW
XPFPA_DECLARE
if (!EG(saved_fpu_cw_ptr)) {
@@ -39,7 +38,7 @@ ZEND_API void zend_init_fpu(void) /* {{{ */
ZEND_API void zend_shutdown_fpu(void) /* {{{ */
{
-#if XPFPA_HAVE_CW && !defined(__SSE__)
+#if XPFPA_HAVE_CW
if (EG(saved_fpu_cw_ptr)) {
XPFPA_RESTORE_CW(EG(saved_fpu_cw_ptr));
}
@@ -50,10 +49,8 @@ ZEND_API void zend_shutdown_fpu(void) /* {{{ */
ZEND_API void zend_ensure_fpu_mode(void) /* {{{ */
{
-#ifndef __SSE__
XPFPA_DECLARE
XPFPA_SWITCH_DOUBLE();
-#endif
}
/* }}} */