mirror of
git://sourceware.org/git/glibc.git
synced 2025-04-12 14:21:18 +08:00
Update.
* sysdeps/unix/sysv/linux/powerpc/mmap64.c (__mmap64): Fix offset & PAGE_MASK case, reformat. * string/Makefile ($(objpfx)tst-svc.out): Fix rule to read input from stdin and setup environment.
This commit is contained in:
parent
cddad6b22e
commit
9f4b36ca59
@ -1,7 +1,10 @@
|
||||
2000-07-24 Andreas Jaeger <aj@suse.de>
|
||||
|
||||
* string/Makefile ($(objpfx)tst-svc.out): Fix rule to read from
|
||||
input from stdin and setup environment.
|
||||
* sysdeps/unix/sysv/linux/powerpc/mmap64.c (__mmap64): Fix offset
|
||||
& PAGE_MASK case, reformat.
|
||||
|
||||
* string/Makefile ($(objpfx)tst-svc.out): Fix rule to read input
|
||||
from stdin and setup environment.
|
||||
|
||||
2000-07-24 Andreas Schwab <schwab@suse.de>
|
||||
|
||||
|
@ -40,32 +40,33 @@ __ptr_t
|
||||
__mmap64 (__ptr_t addr, size_t len, int prot, int flags, int fd, off64_t offset)
|
||||
{
|
||||
#ifdef __NR_mmap2
|
||||
if (
|
||||
#ifndef __ASSUME_MMAP2_SYSCALL
|
||||
! have_no_mmap2 &&
|
||||
#endif
|
||||
! (offset & PAGE_MASK))
|
||||
if (! (offset & PAGE_MASK))
|
||||
{
|
||||
__set_errno (EINVAL);
|
||||
return MAP_FAILED;
|
||||
}
|
||||
|
||||
# ifndef __ASSUME_MMAP2_SYSCALL
|
||||
if (! have_no_mmap2)
|
||||
{
|
||||
#ifndef __ASSUME_MMAP2_SYSCALL
|
||||
int saved_errno = errno;
|
||||
#endif
|
||||
# endif
|
||||
/* This will be always 12, no matter what page size is. */
|
||||
__ptr_t result;
|
||||
__ptrvalue (result) = INLINE_SYSCALL (mmap2, 6, __ptrvalue (addr), len, prot,
|
||||
flags, fd, (off_t) (offset >> PAGE_SHIFT));
|
||||
#if __BOUNDED_POINTERS__
|
||||
# if __BOUNDED_POINTERS__
|
||||
__ptrlow (result) = __ptrvalue (result);
|
||||
__ptrhigh (result) = __ptrvalue (result) + len;
|
||||
#endif
|
||||
#ifndef __ASSUME_MMAP2_SYSCALL
|
||||
# endif
|
||||
# ifndef __ASSUME_MMAP2_SYSCALL
|
||||
if (result != (__ptr_t) -1 || errno != ENOSYS)
|
||||
#endif
|
||||
# endif
|
||||
return result;
|
||||
|
||||
#ifndef __ASSUME_MMAP2_SYSCALL
|
||||
# ifndef __ASSUME_MMAP2_SYSCALL
|
||||
__set_errno (saved_errno);
|
||||
have_no_mmap2 = 1;
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
if (offset != (off_t) offset || (offset + len) != (off_t) (offset + len))
|
||||
|
Loading…
x
Reference in New Issue
Block a user