diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-02-07 21:06:00 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-02-07 21:06:00 +0000 |
| commit | 55a5cb2de9b38158b3fdb92791a91897585e113e (patch) | |
| tree | 8be94e43ec9c6de41e479fe800031c81780a1f7b | |
| parent | 0e346abb5c813a7b10befdeaa40584058f59c73b (diff) | |
Merge changes between r25088 and r25237 from /fsf/glibc-2_18-branch.eglibc-2_18
git-svn-id: svn://svn.eglibc.org/branches/eglibc-2_18@25238 7b3dc134-2b1b-0410-93df-9e9f96275f8d
| -rw-r--r-- | libc/ChangeLog | 6 | ||||
| -rw-r--r-- | libc/NEWS | 2 | ||||
| -rw-r--r-- | libc/ports/ChangeLog.aarch64 | 6 | ||||
| -rw-r--r-- | libc/ports/sysdeps/unix/sysv/linux/aarch64/clone.S | 7 | ||||
| -rw-r--r-- | libc/sysdeps/x86/fpu/bits/mathinline.h | 6 |
5 files changed, 22 insertions, 5 deletions
diff --git a/libc/ChangeLog b/libc/ChangeLog index 15ce0b6aa..41f5d2eb8 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-20 H.J. Lu <hongjiu.lu@intel.com> [BZ #15605] @@ -9,7 +9,7 @@ Version 2.18.1 * The following bugs are resolved with this release: - 15073, 15128, 15909, 15996, 16150, 16387. + 15073, 15128, 15909, 15996, 16150, 16169, 16387, 16510. Version 2.18 diff --git a/libc/ports/ChangeLog.aarch64 b/libc/ports/ChangeLog.aarch64 index ce2fd5cf5..89259326d 100644 --- a/libc/ports/ChangeLog.aarch64 +++ b/libc/ports/ChangeLog.aarch64 @@ -1,3 +1,9 @@ +2014-01-20 Tom Tromey <tromey@redhat.com> + + [BZ #16169] + * sysdeps/unix/sysv/linux/aarch64/clone.S (__clone): Add CFI + directives; Zero x29. + 2014-01-07 Marcus Shawcroft <marcus.shawcroft@linaro.org> [BZ #16387] diff --git a/libc/ports/sysdeps/unix/sysv/linux/aarch64/clone.S b/libc/ports/sysdeps/unix/sysv/linux/aarch64/clone.S index b359e6e8a..7d8816977 100644 --- a/libc/ports/sysdeps/unix/sysv/linux/aarch64/clone.S +++ b/libc/ports/sysdeps/unix/sysv/linux/aarch64/clone.S @@ -63,6 +63,7 @@ ENTRY(__clone) mov x8, #SYS_ify(clone) /* X0:flags, x1:newsp, x2:parenttidptr, x3:newtls, x4:childtid. */ svc 0x0 + cfi_endproc cmp x0, #0 beq 2f blt 3f @@ -72,6 +73,9 @@ ENTRY(__clone) b syscall_error 2: + cfi_startproc + cfi_undefined (x30) + mov x29, 0 #ifdef RESET_PID tbnz x5, #CLONE_THREAD_BIT, 3f mov x0, #-1 @@ -93,7 +97,8 @@ ENTRY(__clone) /* We are done, pass the return value through x0. */ b HIDDEN_JUMPTARGET(_exit) - + cfi_endproc + cfi_startproc PSEUDO_END (__clone) weak_alias (__clone, clone) diff --git a/libc/sysdeps/x86/fpu/bits/mathinline.h b/libc/sysdeps/x86/fpu/bits/mathinline.h index fed64149f..b4b28f30f 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-2013 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 @@ -384,7 +384,7 @@ __END_NAMESPACE_C99 # endif #endif -#ifndef __x86_64__ +#ifndef __SSE2_MATH__ # if ((!defined __NO_MATH_INLINES || defined __LIBC_INTERNAL_MATH_INLINES) \ && defined __OPTIMIZE__) @@ -970,4 +970,4 @@ __inline_mathcode2 (__ieee754_atan2, __y, __x, return __value;) # endif -#endif /* !__x86_64__ */ +#endif /* !__SSE2_MATH__ */ |