diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-02-07 21:08:45 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-02-07 21:08:45 +0000 |
| commit | 716ac9d643e1a8b896ee78d21c33e74e2f78f8ed (patch) | |
| tree | 409555bf8bc2559fc2bc4e7587f3d71d6c05837f | |
| parent | d37f495863d7425ceb9bef830663bf225e2ba5bb (diff) | |
| download | eglibc2-eglibc-2_16.tar.gz | |
Merge changes between r25090 and r25239 from /fsf/glibc-2_16-branch.eglibc-2_16
git-svn-id: svn://svn.eglibc.org/branches/eglibc-2_16@25240 7b3dc134-2b1b-0410-93df-9e9f96275f8d
| -rw-r--r-- | libc/ChangeLog | 6 | ||||
| -rw-r--r-- | libc/NEWS | 3 | ||||
| -rw-r--r-- | libc/sysdeps/x86/fpu/bits/mathinline.h | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/libc/ChangeLog b/libc/ChangeLog index d823b1100..fa1ebb460 100644 --- a/libc/ChangeLog +++ b/libc/ChangeLog @@ -1,3 +1,9 @@ +2014-01-29 H.J. Lu <hongjiu.lu@intel.com> + + [BZ #16510] + * sysdeps/x86/fpu/bits/mathinline.h: Check __SSE2_MATH__ instead + of __x86_64__ when disabling x87 inline functions. + 2014-01-04 Maxim Kuvyrkov <maxim@kugelworks.com> Ondřej Bílka <neleai@seznam.cz> @@ -9,7 +9,8 @@ Version 2.16.1 * The following bugs are resolved with this release: - 6530, 14195, 14459, 14476, 14562, 14621, 14648, 14756, 14831, 15073 + 6530, 14195, 14459, 14476, 14562, 14621, 14648, 14756, 14831, 15073, + 16510. Version 2.16 diff --git a/libc/sysdeps/x86/fpu/bits/mathinline.h b/libc/sysdeps/x86/fpu/bits/mathinline.h index 6446b1d87..aba0b77cd 100644 --- a/libc/sysdeps/x86/fpu/bits/mathinline.h +++ b/libc/sysdeps/x86/fpu/bits/mathinline.h @@ -1,5 +1,5 @@ /* Inline math functions for i387 and SSE. - Copyright (C) 1995-2012 Free Software Foundation, Inc. + Copyright (C) 1995-2014 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 @@ -382,7 +382,7 @@ __END_NAMESPACE_C99 # endif #endif -#ifndef __x86_64__ +#ifndef __SSE2_MATH__ # if ((!defined __NO_MATH_INLINES || defined __LIBC_INTERNAL_MATH_INLINES) \ && defined __OPTIMIZE__) @@ -965,4 +965,4 @@ __inline_mathcode2 (__ieee754_atan2, __y, __x, return __value;) # endif -#endif /* !__x86_64__ */ +#endif /* !__SSE2_MATH__ */ |