diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-02-07 21:07:28 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-02-07 21:07:28 +0000 |
| commit | dc4ea43b82b2b1c7615c4fabd67c6a61929cc57b (patch) | |
| tree | 6a817497ede7eb3185f9c93eb65d5fdb12690f3b | |
| parent | 56b544bde89ca5d99b49b4a0ec0bf655a4247e11 (diff) | |
Merge changes between r25089 and r25238 from /fsf/glibc-2_17-branch.eglibc-2_17
git-svn-id: svn://svn.eglibc.org/branches/eglibc-2_17@25239 7b3dc134-2b1b-0410-93df-9e9f96275f8d
| -rw-r--r-- | libc/ChangeLog | 6 | ||||
| -rw-r--r-- | libc/NEWS | 2 | ||||
| -rw-r--r-- | libc/sysdeps/x86/fpu/bits/mathinline.h | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/libc/ChangeLog b/libc/ChangeLog index 49bf8f900..5246373dd 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> @@ -8,7 +8,7 @@ using `glibc' in the "product" field. Version 2.17.1 * The following bugs are resolved with this release: - 15003, 15006, 15073, 15122, 15759. + 15003, 15006, 15073, 15122, 15759, 16510. Version 2.17 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__ */ |