d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only check for SYS_freebsd6_lseek if the syscall code is defined.

Browse Source 
Whether this is the right or best solution is unclear but it fixes the
build for now.
This commit is contained in:
Bjoern A. Zeeb 2016-03-14 14:55:15 +00:00
parent 69ab30910f
commit 61fc4ac3aa
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=296861
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/arm/arm/vm_machdep.c
View File

@ -40,6 +40,8 @@
* Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
*/
#include "opt_compat.h"
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@ -180,7 +182,7 @@ cpu_set_syscall_retval(struct thread *td, int error)
/*
* __syscall returns an off_t while most other syscalls return an
* int. As an off_t is 64-bits and an int is 32-bits we need to
* place the returned data into r1. As the lseek and frerebsd6_lseek
* place the returned data into r1. As the lseek and freebsd6_lseek
* syscalls also return an off_t they do not need this fixup.
*/
call = frame->tf_r7;
@ -189,8 +191,11 @@ cpu_set_syscall_retval(struct thread *td, int error)
register_t code = ap[_QUAD_LOWWORD];
if (td->td_proc->p_sysent->sv_mask)
code &= td->td_proc->p_sysent->sv_mask;
fixup = (code != SYS_freebsd6_lseek && code != SYS_lseek)
? 1 : 0;
fixup = (
#if defined(COMPAT_FREEBSD6) && defined(SYS_freebsd6_lseek)
code != SYS_freebsd6_lseek &&
#endif
code != SYS_lseek) ? 1 : 0;
}
#endif

7
sys/powerpc/powerpc/exec_machdep.c
View File

@ -879,8 +879,11 @@ cpu_set_syscall_retval(struct thread *td, int error)
int code = tf->fixreg[FIRSTARG + 1];
if (p->p_sysent->sv_mask)
code &= p->p_sysent->sv_mask;
fixup = (code != SYS_freebsd6_lseek && code != SYS_lseek) ?
1 : 0;
fixup = (
#if defined(COMPAT_FREEBSD6) && defined(SYS_freebsd6_lseek)
code != SYS_freebsd6_lseek &&
#endif
code != SYS_lseek) ? 1 : 0;
} else
fixup = 0;