Merge branch 'PHP-7.4'

cmb69 · cmb69 · commit c0920e674f05 · 2020-05-22T15:47:33.000+02:00
* PHP-7.4:
  Fix #79595: zend_init_fpu() alters FPU precision
diff --git a/Zend/zend_float.c b/Zend/zend_float.c
@@ -22,7 +22,8 @@
 
 ZEND_API void zend_init_fpu(void) /* {{{ */
 {
-#if XPFPA_HAVE_CW
+/* under __SSE__ the FPCW is irrelevant; no need to change it */
+#if XPFPA_HAVE_CW && !defined(__SSE__)
 	XPFPA_DECLARE
 
 	if (!EG(saved_fpu_cw_ptr)) {
@@ -38,7 +39,7 @@ ZEND_API void zend_init_fpu(void) /* {{{ */
 
 ZEND_API void zend_shutdown_fpu(void) /* {{{ */
 {
-#if XPFPA_HAVE_CW
+#if XPFPA_HAVE_CW && !defined(__SSE__)
 	if (EG(saved_fpu_cw_ptr)) {
 		XPFPA_RESTORE_CW(EG(saved_fpu_cw_ptr));
 	}
@@ -49,8 +50,10 @@ 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,7 +22,8 @@`
`22`	`22`
`23`	`23`	`ZEND_API void zend_init_fpu(void) /* {{{ */`
`24`	`24`	`{`
`25`		`-#if XPFPA_HAVE_CW`
	`25`	`+/* under __SSE__ the FPCW is irrelevant; no need to change it */`
	`26`	`+#if XPFPA_HAVE_CW && !defined(__SSE__)`
`26`	`27`	`XPFPA_DECLARE`
`27`	`28`
`28`	`29`	`if (!EG(saved_fpu_cw_ptr)) {`
`@@ -38,7 +39,7 @@ ZEND_API void zend_init_fpu(void) /* {{{ */`
`38`	`39`
`39`	`40`	`ZEND_API void zend_shutdown_fpu(void) /* {{{ */`
`40`	`41`	`{`
`41`		`-#if XPFPA_HAVE_CW`
	`42`	`+#if XPFPA_HAVE_CW && !defined(__SSE__)`
`42`	`43`	`if (EG(saved_fpu_cw_ptr)) {`
`43`	`44`	`XPFPA_RESTORE_CW(EG(saved_fpu_cw_ptr));`
`44`	`45`	`}`
`@@ -49,8 +50,10 @@ ZEND_API void zend_shutdown_fpu(void) /* {{{ */`
`49`	`50`
`50`	`51`	`ZEND_API void zend_ensure_fpu_mode(void) /* {{{ */`
`51`	`52`	`{`
	`53`	`+#ifndef __SSE__`
`52`	`54`	`XPFPA_DECLARE`
`53`	`55`
`54`	`56`	`XPFPA_SWITCH_DOUBLE();`
	`57`	`+#endif`
`55`	`58`	`}`
`56`	`59`	`/* }}} */`