From ab70da77ea8076b49ad81a8c06103c51d4e81dc4 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 5 Jan 2015 16:05:34 +0000 Subject: [PATCH] Fix ARM posix_fadvise64 namespace (bug 17793). ARM posix_fadvise calls __posix_fadvise64_l64, to which posix_fadvise64 is a strong alias, but posix_fadvise is a POSIX function and posix_fadvise64 isn't. This patch changes it into a weak alias. Tested for ARM that this fixes the corresponding linknamespace test failures. [BZ #17793] * sysdeps/unix/sysv/linux/arm/posix_fadvise64.c (posix_fadvise64): Define as weak alias not strong alias. --- ChangeLog | 4 ++++ NEWS | 2 +- sysdeps/unix/sysv/linux/arm/posix_fadvise64.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 493e34b2cf..0e6e224927 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2015-01-05 Joseph Myers + [BZ #17793] + * sysdeps/unix/sysv/linux/arm/posix_fadvise64.c (posix_fadvise64): + Define as weak alias not strong alias. + [BZ #17635] * ctype/ctype-c99.c: New file. isblank implementation moved from ... diff --git a/NEWS b/NEWS index db8e2c556a..f18ace18b8 100644 --- a/NEWS +++ b/NEWS @@ -16,7 +16,7 @@ Version 2.21 17583, 17584, 17585, 17589, 17594, 17601, 17608, 17616, 17625, 17630, 17633, 17634, 17635, 17647, 17653, 17657, 17664, 17665, 17668, 17682, 17717, 17719, 17722, 17723, 17724, 17725, 17732, 17733, 17744, 17745, - 17746, 17747, 17775, 17777, 17780, 17781, 17782 + 17746, 17747, 17775, 17777, 17780, 17781, 17782, 17793 * i386 memcpy functions optimized with SSE2 unaligned load/store. diff --git a/sysdeps/unix/sysv/linux/arm/posix_fadvise64.c b/sysdeps/unix/sysv/linux/arm/posix_fadvise64.c index 1f76e67930..b58c4c0824 100644 --- a/sysdeps/unix/sysv/linux/arm/posix_fadvise64.c +++ b/sysdeps/unix/sysv/linux/arm/posix_fadvise64.c @@ -35,4 +35,4 @@ __posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise) return 0; return INTERNAL_SYSCALL_ERRNO (ret, err); } -strong_alias (__posix_fadvise64_l64, posix_fadvise64); +weak_alias (__posix_fadvise64_l64, posix_fadvise64); -- 2.11.4.GIT