Merge branch 'PHP-7.4'

nikic · nikic · commit b9d0ff763459 · 2020-05-22T16:57:24.000+02:00
* PHP-7.4:
  Revert "Fix #79595: zend_init_fpu() alters FPU precision"
diff --git 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
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,7 @@`
`22`	`22`
`23`	`23`	`ZEND_API void zend_init_fpu(void) /* {{{ */`
`24`	`24`	`{`
`25`		`-/* under __SSE__ the FPCW is irrelevant; no need to change it */`
`26`		`-#if XPFPA_HAVE_CW && !defined(__SSE__)`
	`25`	`+#if XPFPA_HAVE_CW`
`27`	`26`	`XPFPA_DECLARE`
`28`	`27`
`29`	`28`	`if (!EG(saved_fpu_cw_ptr)) {`
`@@ -39,7 +38,7 @@ ZEND_API void zend_init_fpu(void) /* {{{ */`
`39`	`38`
`40`	`39`	`ZEND_API void zend_shutdown_fpu(void) /* {{{ */`
`41`	`40`	`{`
`42`		`-#if XPFPA_HAVE_CW && !defined(__SSE__)`
	`41`	`+#if XPFPA_HAVE_CW`
`43`	`42`	`if (EG(saved_fpu_cw_ptr)) {`
`44`	`43`	`XPFPA_RESTORE_CW(EG(saved_fpu_cw_ptr));`
`45`	`44`	`}`
`@@ -50,10 +49,8 @@ ZEND_API void zend_shutdown_fpu(void) /* {{{ */`
`50`	`49`
`51`	`50`	`ZEND_API void zend_ensure_fpu_mode(void) /* {{{ */`
`52`	`51`	`{`
`53`		`-#ifndef __SSE__`
`54`	`52`	`XPFPA_DECLARE`
`55`	`53`
`56`	`54`	`XPFPA_SWITCH_DOUBLE();`
`57`		`-#endif`
`58`	`55`	`}`
`59`	`56`	`/* }}} */`