From 4c1a1f71c083953f65b8f06bf7103cde549b3fb1 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@gmail.com>
Date: Thu, 15 Sep 2011 13:11:08 -0400
Subject: Add fmax and fmin inlines for x86-64

---
 ChangeLog                            |  5 ++++
 sysdeps/x86_64/fpu/bits/mathinline.h | 46 ++++++++++++++++++++++++++++++++----
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 57195c220b..37e87822d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-15  Ulrich Drepper  <drepper@gmail.com>
+
+	* sysdeps/x86_64/fpu/bits/mathinline.h: Add fmax and fmin optimizations
+	for __FINITE_MATH_ONLY__ == 1.
+
 2011-09-14  Ulrich Drepper  <drepper@gmail.com>
 
 	* sysdeps/x86_64/fpu/s_copysign.S [ELF]: Use correct section.
diff --git a/sysdeps/x86_64/fpu/bits/mathinline.h b/sysdeps/x86_64/fpu/bits/mathinline.h
index 9f2c4d9689..b63ab12eb3 100644
--- a/sysdeps/x86_64/fpu/bits/mathinline.h
+++ b/sysdeps/x86_64/fpu/bits/mathinline.h
@@ -64,8 +64,11 @@ __NTH (__signbitl (long double __x))
   return (__u.__i[2] & 0x8000) != 0;
 }
 
+#ifdef __USE_ISOC99
+__BEGIN_NAMESPACE_C99
+
 /* Round to nearest integer.  */
-# if __WORDSIZE == 64 || defined __SSE_MATH__
+#  if __WORDSIZE == 64 || defined __SSE_MATH__
 __MATH_INLINE long int
 __NTH (lrintf (float __x))
 {
@@ -73,8 +76,8 @@ __NTH (lrintf (float __x))
   asm ("cvtss2si %1, %0" : "=r" (__res) : "xm" (__x));
   return __res;
 }
-# endif
-# if __WORDSIZE == 64 || defined __SSE2_MATH__
+#  endif
+#  if __WORDSIZE == 64 || defined __SSE2_MATH__
 __MATH_INLINE long int
 __NTH (lrint (double __x))
 {
@@ -82,8 +85,8 @@ __NTH (lrint (double __x))
   asm ("cvtsd2si %1, %0" : "=r" (__res) : "xm" (__x));
   return __res;
 }
-# endif
-# if __WORDSIZE == 64
+#  endif
+#  if __WORDSIZE == 64
 __MATH_INLINE long long int
 __NTH (llrintf (float __x))
 {
@@ -98,6 +101,39 @@ __NTH (llrint (double __x))
   asm ("cvtsd2si %1, %0" : "=r" (__res) : "xm" (__x));
   return __res;
 }
+#  endif
+
+#  if __FINITE_MATH_ONLY__ == 1 && (__WORDSIZE == 64 || defined __SSE2_MATH__)
+/* Determine maximum of two values.  */
+__MATH_INLINE float
+__NTH (fmaxf (float __x, float __y))
+{
+  asm ("maxss %1, %0" : "+x" (__x) : "xm" (__y));
+  return __x;
+}
+__MATH_INLINE double
+__NTH (fmax (double __x, double __y))
+{
+  asm ("maxsd %1, %0" : "+x" (__x) : "xm" (__y));
+  return __x;
+}
+
+/* Determine minimum of two values.  */
+__MATH_INLINE float
+__NTH (fminf (float __x, float __y))
+{
+  asm ("minss %1, %0" : "+x" (__x) : "xm" (__y));
+  return __x;
+}
+__MATH_INLINE double
+__NTH (fmin (double __x, double __y))
+{
+  asm ("minsd %1, %0" : "+x" (__x) : "xm" (__y));
+  return __x;
+}
+#  endif
+
+__END_NAMESPACE_C99
 # endif
 
 #endif
-- 
cgit 1.4.1