Skip to content

Commit 5936971

Browse files
committed
x86 zend_init_fpu() alters FPU precision php#5621 php#12125
1 parent 36a87e6 commit 5936971

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Zend/zend_float.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ END_EXTERN_C()
7474
# define HAVE__CONTROLFP_S
7575
#endif /* _MSC_VER */
7676

77-
#if defined(HAVE__CONTROLFP_S) && !defined(__x86_64__)
77+
#if defined(HAVE__CONTROLFP_S) && !defined(__i386__) && !defined(__x86_64__)
7878

7979
/* float.h defines _controlfp_s */
8080
# include <float.h>
@@ -138,7 +138,7 @@ END_EXTERN_C()
138138
return _xpfpa_result; \
139139
} while (0)
140140

141-
#elif defined(HAVE__CONTROLFP) && !defined(__x86_64__)
141+
#elif defined(HAVE__CONTROLFP) && !defined(__i386__) && !defined(__x86_64__)
142142

143143
/* float.h defines _controlfp */
144144
# include <float.h>
@@ -197,7 +197,7 @@ END_EXTERN_C()
197197
return _xpfpa_result; \
198198
} while (0)
199199

200-
#elif defined(HAVE__FPU_SETCW) && !defined(__x86_64__) /* glibc systems */
200+
#elif defined(HAVE__FPU_SETCW) && !defined(__i386__) && !defined(__x86_64__) /* glibc systems */
201201

202202
/* fpu_control.h defines _FPU_[GS]ETCW */
203203
# include <fpu_control.h>
@@ -256,7 +256,7 @@ END_EXTERN_C()
256256
return _xpfpa_result; \
257257
} while (0)
258258

259-
#elif defined(HAVE_FPSETPREC) && !defined(__x86_64__) /* FreeBSD */
259+
#elif defined(HAVE_FPSETPREC) && !defined(__i386__) && !defined(__x86_64__) /* FreeBSD */
260260

261261
/* fpu_control.h defines _FPU_[GS]ETCW */
262262
# include <machine/ieeefp.h>
@@ -312,7 +312,7 @@ END_EXTERN_C()
312312
return _xpfpa_result; \
313313
} while (0)
314314

315-
#elif defined(HAVE_FPU_INLINE_ASM_X86) && !defined(__x86_64__)
315+
#elif defined(HAVE_FPU_INLINE_ASM_X86) && !defined(__i386__) && !defined(__x86_64__)
316316

317317
/*
318318
Custom x86 inline assembler implementation.

0 commit comments

Comments
 (0)