Add x32 llseek.S

This commit is contained in:
H.J. Lu 2012-05-21 14:50:21 -07:00
parent 20c07380db
commit bbb3154bc9
4 changed files with 91 additions and 15 deletions

View File

@ -1,5 +1,11 @@
2012-05-21 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/unix/sysv/linux/x86_64/sysdep.h (SYSCALL_SET_ERRNO):
New macro. Use R*LP on int and pointer.
(SYSCALL_ERROR_HANDLER): Use SYSCALL_SET_ERRNO.
* sysdeps/unix/sysv/linux/x86_64/x32/llseek.S: New file.
* sysdeps/unix/sysv/linux/x86_64/x32/sysdep.h: Likewise.
* sysdeps/gnu/bits/utmp.h (struct lastlog): Check
[__WORDSIZE_TIME64_COMPAT32] instead of
[__WORDSIZE == 64 && __WORDSIZE_COMPAT32].

View File

@ -112,30 +112,32 @@
# define ret_ERRVAL ret
# ifndef PIC
# define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */
# elif RTLD_PRIVATE_ERRNO
# define SYSCALL_ERROR_HANDLER \
0: \
leaq rtld_errno(%rip), %rcx; \
# if defined PIC && defined RTLD_PRIVATE_ERRNO
# define SYSCALL_SET_ERRNO \
lea rtld_errno(%rip), %RCX_LP; \
xorl %edx, %edx; \
subq %rax, %rdx; \
movl %edx, (%rcx); \
orq $-1, %rax; \
jmp L(pseudo_end);
sub %RAX_LP, %RDX_LP; \
movl %edx, (%rcx)
# else
# ifndef NOT_IN_libc
# define SYSCALL_ERROR_ERRNO __libc_errno
# else
# define SYSCALL_ERROR_ERRNO errno
# endif
# define SYSCALL_ERROR_HANDLER \
0: \
# define SYSCALL_SET_ERRNO \
movq SYSCALL_ERROR_ERRNO@GOTTPOFF(%rip), %rcx;\
xorl %edx, %edx; \
subq %rax, %rdx; \
movl %edx, %fs:(%rcx); \
orq $-1, %rax; \
sub %RAX_LP, %RDX_LP; \
movl %edx, %fs:(%rcx)
# endif
# ifndef PIC
# define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */
# else
# define SYSCALL_ERROR_HANDLER \
0: \
SYSCALL_SET_ERRNO; \
or $-1, %RAX_LP; \
jmp L(pseudo_end);
# endif /* PIC */

View File

@ -0,0 +1,43 @@
/* The lseek system call with 64-bit offset. Linux/x32 version.
Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <sysdep-cancel.h>
/* Return -1LL in a full 64 bits. */
#undef SYSCALL_ERROR_HANDLER
#define SYSCALL_ERROR_HANDLER \
0: \
SYSCALL_SET_ERRNO; \
orq $-1, %rax; \
ret;
/* Always use our own error handler. */
#undef SYSCALL_ERROR_LABEL
#define SYSCALL_ERROR_LABEL 0f
PSEUDO (__libc_lseek64, lseek, 3)
ret
PSEUDO_END (__libc_lseek64)
weak_alias (__libc_lseek64, __lseek64)
libc_hidden_weak (__lseek64)
weak_alias (__libc_lseek64, lseek64)
libc_hidden_weak (lseek64)
weak_alias (__libc_lseek64, __lseek)
libc_hidden_weak (__lseek)
weak_alias (__libc_lseek64, lseek)

View File

@ -0,0 +1,25 @@
/* Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#ifndef _LINUX_X32_SYSDEP_H
#define _LINUX_X32_SYSDEP_H 1
/* There is some commonality. */
#include <sysdeps/unix/sysv/linux/x86_64/sysdep.h>
#include <sysdeps/x86_64/x32/sysdep.h>
#endif /* linux/x86_64/x32/sysdep.h */