diff options
| author | Khem Raj <kraj@mvista.com> | 2009-04-09 08:51:43 +0000 |
|---|---|---|
| committer | Khem Raj <kraj@mvista.com> | 2009-04-09 08:51:43 +0000 |
| commit | 371dec2406805af1c832bc2e707ff799a90ca3d1 (patch) | |
| tree | 8a1728eb40be09ae5295d6e759d66abf8f1ea59e /ldso | |
| parent | b3ace9e7bf7b2962d9404463186c5db309afd21b (diff) | |
| download | uClibc-alpine-371dec2406805af1c832bc2e707ff799a90ca3d1.tar.bz2 uClibc-alpine-371dec2406805af1c832bc2e707ff799a90ca3d1.tar.xz | |
Merged revisions 26038 via svnmerge from
svn+ssh://svn.uclibc.org/svn/trunk/uClibc
........
r26038 | kraj | 2009-04-09 01:45:24 -0700 (Thu, 09 Apr 2009) | 2 lines
Fix the ifdef logic broken by last commit for !defined (__mcoldfire__)
........
Diffstat (limited to 'ldso')
| -rw-r--r-- | ldso/include/dl-syscall.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h index 0b0b0ef1d..897923e53 100644 --- a/ldso/include/dl-syscall.h +++ b/ldso/include/dl-syscall.h @@ -152,9 +152,8 @@ static __always_inline _syscall2(int, _dl_gettimeofday, struct timeval *, tv, # define __NR__dl_mmap __NR_mmap static __always_inline _syscall6(void *, _dl_mmap, void *, start, size_t, length, int, prot, int, flags, int, fd, off_t, offset); -#if !defined (__mcoldfire__) // Might be a kernel problem. failed on 2.6.25 /* then try mmap2() */ -#elif defined(__NR_mmap2) +#elif defined(__NR_mmap2) && !defined (__mcoldfire__) # define __NR___syscall_mmap2 __NR_mmap2 static __always_inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len, @@ -176,7 +175,6 @@ static __always_inline void * _dl_mmap(void * addr, unsigned long size, int prot return __syscall_mmap2(addr, size, prot, flags, fd, (off_t) (offset >> MMAP2_PAGE_SHIFT)); } -#endif /* finally, fall back to mmap(), syscall1() style */ #elif defined(__NR_mmap) |