From a728a38fb658f8b2f0acbea8a586db8bd054f3fe Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 6 Jun 2012 10:11:14 -0700 Subject: [PATCH] Check __SSE_MATH__ in x86_64 feraiseexcept --- ChangeLog | 6 ++++++ sysdeps/x86_64/fpu/bits/fenv.h | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b2fd481..af2c41b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-06-06 H.J. Lu + + [BZ #14117] + * sysdeps/x86_64/fpu/bits/fenv.h (feraiseexcept): Check + __SSE_MATH__. + 2012-06-06 Siddhesh Poyarekar [BZ #14134] diff --git a/sysdeps/x86_64/fpu/bits/fenv.h b/sysdeps/x86_64/fpu/bits/fenv.h index bb790c9..b2c01c4 100644 --- a/sysdeps/x86_64/fpu/bits/fenv.h +++ b/sysdeps/x86_64/fpu/bits/fenv.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997-2001,2004,2011,2012 Free Software Foundation, Inc. +/* Copyright (C) 1997-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -109,7 +109,12 @@ __NTH (feraiseexcept (int __excepts)) /* One example of a invalid operation is 0.0 / 0.0. */ float __f = 0.0; +# ifdef __SSE_MATH__ __asm__ __volatile__ ("divss %0, %0 " : : "x" (__f)); +# else + __asm__ __volatile__ ("fdiv %%st, %%st(0); fwait" + : "=t" (__f) : "0" (__f)); +# endif (void) &__f; } if ((FE_DIVBYZERO & __excepts) != 0) @@ -117,7 +122,12 @@ __NTH (feraiseexcept (int __excepts)) float __f = 1.0; float __g = 0.0; +# ifdef __SSE_MATH__ __asm__ __volatile__ ("divss %1, %0" : : "x" (__f), "x" (__g)); +# else + __asm__ __volatile__ ("fdivp %%st, %%st(1); fwait" + : "=t" (__f) : "0" (__f), "u" (__g) : "st(1)"); +# endif (void) &__f; } -- 2.7.4