From: Ulrich Drepper <drepper@gmail.com>
Date: Thu, 15 Sep 2011 17:12:25 +0000 (-0400)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: upstream/2.30~12053
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d8e1f11950c7ceb6b5037c66ee104d031487d72;p=external%2Fglibc.git

Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
	ChangeLog
---

4d8e1f11950c7ceb6b5037c66ee104d031487d72
diff --cc ChangeLog
index 37e8782,6dd445b..fa117e9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,14 +1,19 @@@
 +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-15  Andreas Schwab  <schwab@redhat.com>
+ 
+ 	* sysdeps/powerpc/fpu/e_hypot.c (__ieee754_hypot): Use
+ 	__ieee754_sqrt instead of sqrt.
+ 	* sysdeps/powerpc/fpu/e_hypotf.c (__ieee754_hypotf): Use
+ 	__ieee754_sqrtf instead of sqrtf.
+ 	* sysdeps/powerpc/fpu/e_rem_pio2f.c (__ieee754_rem_pio2f): Use
+ 	__floorf instead of floorf.
+ 	* sysdeps/powerpc/fpu/k_rem_pio2f.c (__fp_kernel_rem_pio2f): Use
+ 	__floorf, __truncf instead of floorf, truncf.
+ 
  2011-09-14  Ulrich Drepper  <drepper@gmail.com>
  
  	* sysdeps/x86_64/fpu/s_copysign.S [ELF]: Use correct section.