1 From 13545bce877b33e30155fc412ad44cc118d83f77 Mon Sep 17 00:00:00 2001
2 From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
3 Date: Sat, 30 Jan 2010 00:24:37 +0900
4 Subject: [PATCH 15/15] getdents: Fix mips64 build
6 On Wed, 27 Jan 2010 07:14:08 +0100, Carmelo AMOROSO <carmelo.amoroso@st.com> wrote:
7 > I would re-write your patch in a simpler way.
9 > We already have the following
11 > 136 #if defined __UCLIBC_HAS_LFS__ && ! defined __NR_getdents64
12 > 137 attribute_hidden strong_alias(__getdents,__getdents64)
15 > I think that it's simpler to move in the proper place this statement.
17 Thanks, indeed. If we came into "#elif WORDSIZE == 32" block, above
18 condition never be true. So we can just move this statement out of
19 "#if...#elif...#elif...#endif" block. Here is a revised patch.
21 ------------------------------------------------------
22 From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
23 Subject: [PATCH] getdents: Fix mips64 build
25 Some archs (such as mips64) do not have getdents64 syscall but have
26 getdents syscall. Define alias for it.
28 This fixes regression from 0.9.30.1.
31 This is once done by commit e8b1c674. But after the commit 33bcf733
32 ("Use getdents syscall if kernel provide supports for this instead of
33 relying upon getdents64."), if __ASSUME_GETDENTS32_D_TYPE was defined
34 the alias for getdents64 is not defined. The macro
35 __ASSUME_GETDENTS32_D_TYPE had been effectively ignored until 0.9.30.1
36 but the commit 0f0f20ab ("Move kernel-features.h header from the
37 linuxthread directory to a common one...") really enables it.
39 Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
40 Signed-off-by: Khem Raj <raj.khem@gmail.com>
41 Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
43 libc/sysdeps/linux/common/getdents.c | 8 ++++----
44 1 files changed, 4 insertions(+), 4 deletions(-)
46 diff --git a/libc/sysdeps/linux/common/getdents.c b/libc/sysdeps/linux/common/getdents.c
47 index b518cc0..66a03b3 100644
48 --- a/libc/sysdeps/linux/common/getdents.c
49 +++ b/libc/sysdeps/linux/common/getdents.c
50 @@ -136,10 +136,6 @@ ssize_t __getdents (int fd, char *buf, size_t nbytes)
51 return (char *) dp - buf;
54 -#if defined __UCLIBC_HAS_LFS__ && ! defined __NR_getdents64
55 -attribute_hidden strong_alias(__getdents,__getdents64)
58 #elif __WORDSIZE == 32
60 /* Experimentally off - libc_hidden_proto(memmove) */
61 @@ -171,4 +167,8 @@ ssize_t __getdents (int fd, char *buf, size_t nbytes)
65 +#if defined __UCLIBC_HAS_LFS__ && ! defined __NR_getdents64
66 +attribute_hidden strong_alias(__getdents,__getdents64)