From e64b6392143f7ee01b3ea867bf61647ef4e1d727 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 25 Sep 2008 12:59:13 +0000 Subject: - fix !LFS case for i386 --- libc/sysdeps/linux/i386/posix_fadvise.c | 6 ++++-- libc/sysdeps/linux/i386/posix_fadvise64.S | 13 ++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'libc') diff --git a/libc/sysdeps/linux/i386/posix_fadvise.c b/libc/sysdeps/linux/i386/posix_fadvise.c index 5406213b8..25373bcd5 100644 --- a/libc/sysdeps/linux/i386/posix_fadvise.c +++ b/libc/sysdeps/linux/i386/posix_fadvise.c @@ -13,11 +13,13 @@ #if defined __NR_fadvise64_64 || defined __NR_fadvise64 -libc_hidden_proto(posix_fadvise64) +extern int __libc_posix_fadvise64 (int, __off64_t, __off64_t, int ) __THROW; + +libc_hidden_proto(__libc_posix_fadvise64) libc_hidden_proto(posix_fadvise) int posix_fadvise(int fd, off_t offset, off_t len, int advice) { - if (posix_fadvise64(fd, offset, len, advice) != 0) + if (__libc_posix_fadvise64(fd, offset, len, advice) != 0) return errno; return 0; } diff --git a/libc/sysdeps/linux/i386/posix_fadvise64.S b/libc/sysdeps/linux/i386/posix_fadvise64.S index da3f36394..53aa75a9b 100644 --- a/libc/sysdeps/linux/i386/posix_fadvise64.S +++ b/libc/sysdeps/linux/i386/posix_fadvise64.S @@ -23,9 +23,9 @@ #include .text -.global posix_fadvise64 -.type posix_fadvise64,%function -posix_fadvise64: +.global __libc_posix_fadvise64 +.type __libc_posix_fadvise64,%function +__libc_posix_fadvise64: #if defined __NR_fadvise64_64 && defined __UCLIBC_HAS_LFS__ /* Save regs */ pushl %ebp @@ -92,7 +92,10 @@ overflow: /* Successful; return the syscall's value. */ ret -.size posix_fadvise64,.-posix_fadvise64 +.size __libc_posix_fadvise64,.-__libc_posix_fadvise64 -libc_hidden_def(posix_fadvise64) +libc_hidden_def(__libc_posix_fadvise64) +#if defined __UCLIBC_HAS_LFS__ +weak_alias(__libc_posix_fadvise64,posix_fadvise64) +#endif -- cgit v1.2.3