Patchwork Merge mips64 and mipsn32

login
register
mail settings
Submitter Paul Brook
Date Feb. 10, 2012, 11:23 a.m.
Message ID <1328873011-25793-1-git-send-email-paul@codesourcery.com>
Download mbox | patch
Permalink /patch/140563/
State New
Headers show

Comments

Paul Brook - Feb. 10, 2012, 11:23 a.m.
Make MIPS N32 be a variant of mips64, rather than a new architecture in
its own right.  This matches how sparc/ppc work, and makes TARGET_MIPS64
the right thing to check for a 64-bit mips core.

As side-effect of this is that linux-user/mipsn32 gets merged into
linux-user/mips64.  I consider this to be a feature as anything differences
other than the syscall numbers are probably bugs.

Signed-off-by: Paul Brook <paul@codesourcery.com>
---
 configure                          |    3 +-
 linux-user/mips64/syscall.h        |   14 +-
 linux-user/mips64/syscall_nr.h     |  312 +-----------------------------------
 linux-user/mips64/syscall_nr32.h   |  311 +++++++++++++++++++++++++++++++++++
 linux-user/mips64/syscall_nr64.h   |  306 +++++++++++++++++++++++++++++++++++
 linux-user/mipsn32/syscall.h       |  224 --------------------------
 linux-user/mipsn32/syscall_nr.h    |  311 -----------------------------------
 linux-user/mipsn32/target_signal.h |   29 ----
 linux-user/mipsn32/termbits.h      |  245 ----------------------------
 linux-user/syscall_defs.h          |   79 +---------
 10 files changed, 636 insertions(+), 1198 deletions(-)
 create mode 100644 linux-user/mips64/syscall_nr32.h
 create mode 100644 linux-user/mips64/syscall_nr64.h
 delete mode 100644 linux-user/mipsn32/syscall.h
 delete mode 100644 linux-user/mipsn32/syscall_nr.h
 delete mode 100644 linux-user/mipsn32/target_signal.h
 delete mode 100644 linux-user/mipsn32/termbits.h
Andreas Färber - Feb. 10, 2012, 10:47 p.m.
Am 10.02.2012 12:23, schrieb Paul Brook:
> Make MIPS N32 be a variant of mips64, rather than a new architecture in
> its own right.  This matches how sparc/ppc work, and makes TARGET_MIPS64
> the right thing to check for a 64-bit mips core.
> 
> As side-effect of this is that linux-user/mipsn32 gets merged into
> linux-user/mips64.  I consider this to be a feature as anything differences
> other than the syscall numbers are probably bugs.
> 
> Signed-off-by: Paul Brook <paul@codesourcery.com>
> ---
>  configure                          |    3 +-
>  linux-user/mips64/syscall.h        |   14 +-
>  linux-user/mips64/syscall_nr.h     |  312 +-----------------------------------
>  linux-user/mips64/syscall_nr32.h   |  311 +++++++++++++++++++++++++++++++++++
>  linux-user/mips64/syscall_nr64.h   |  306 +++++++++++++++++++++++++++++++++++
>  linux-user/mipsn32/syscall.h       |  224 --------------------------
>  linux-user/mipsn32/syscall_nr.h    |  311 -----------------------------------
>  linux-user/mipsn32/target_signal.h |   29 ----
>  linux-user/mipsn32/termbits.h      |  245 ----------------------------
>  linux-user/syscall_defs.h          |   79 +---------
>  10 files changed, 636 insertions(+), 1198 deletions(-)
>  create mode 100644 linux-user/mips64/syscall_nr32.h
>  create mode 100644 linux-user/mips64/syscall_nr64.h
>  delete mode 100644 linux-user/mipsn32/syscall.h
>  delete mode 100644 linux-user/mipsn32/syscall_nr.h
>  delete mode 100644 linux-user/mipsn32/target_signal.h
>  delete mode 100644 linux-user/mipsn32/termbits.h

Note: Richard Henderson and me had been looking into code sharing among
the MIPS ABIs for signal handling in response to a half-done Octeon
mips64 patchset.

There's an unfinished RFC of mine from December or so, feel free to pick
that up or to come up with a better idea!

Andreas
Paul Brook - Feb. 10, 2012, 11:16 p.m.
> > Make MIPS N32 be a variant of mips64, rather than a new architecture in
> > its own right.  This matches how sparc/ppc work, and makes TARGET_MIPS64
> > the right thing to check for a 64-bit mips core.
> > 
> > As side-effect of this is that linux-user/mipsn32 gets merged into
> > linux-user/mips64.  I consider this to be a feature as anything
> > differences other than the syscall numbers are probably bugs.
>...
> Note: Richard Henderson and me had been looking into code sharing among
> the MIPS ABIs for signal handling in response to a half-done Octeon
> mips64 patchset.
> 
> There's an unfinished RFC of mine from December or so, feel free to pick
> that up or to come up with a better idea!

Yeah, I found those and have a couple of other patches I need to reconcile and 
push out.  I haven't looked at the signal handling bits.

Paul

Patch

diff --git a/configure b/configure
index faa65a8..7fd6f02 100755
--- a/configure
+++ b/configure
@@ -3491,9 +3491,10 @@  case "$target_arch2" in
     target_phys_bits=64
   ;;
   mipsn32|mipsn32el)
-    TARGET_ARCH=mipsn32
+    TARGET_ARCH=mips64
     TARGET_BASE_ARCH=mips
     echo "TARGET_ABI_MIPSN32=y" >> $config_target_mak
+    echo "TARGET_ABI32=y" >> $config_target_mak
     target_phys_bits=64
   ;;
   mips64|mips64el)
diff --git a/linux-user/mips64/syscall.h b/linux-user/mips64/syscall.h
index e436ea5..ebe98f2 100644
--- a/linux-user/mips64/syscall.h
+++ b/linux-user/mips64/syscall.h
@@ -4,15 +4,15 @@ 
 
 struct target_pt_regs {
 	/* Saved main processor registers. */
-	abi_ulong regs[32];
+	target_ulong regs[32];
 
 	/* Saved special registers. */
-	abi_ulong cp0_status;
-	abi_ulong lo;
-	abi_ulong hi;
-	abi_ulong cp0_badvaddr;
-	abi_ulong cp0_cause;
-	abi_ulong cp0_epc;
+	target_ulong cp0_status;
+	target_ulong lo;
+	target_ulong hi;
+	target_ulong cp0_badvaddr;
+	target_ulong cp0_cause;
+	target_ulong cp0_epc;
 };
 
 /* Target errno definitions taken from asm-mips/errno.h */
diff --git a/linux-user/mips64/syscall_nr.h b/linux-user/mips64/syscall_nr.h
index 36d27b5..fdccac4 100644
--- a/linux-user/mips64/syscall_nr.h
+++ b/linux-user/mips64/syscall_nr.h
@@ -1,306 +1,6 @@ 
-/*
- * Linux 64-bit syscalls are in the range from 5000 to 5999.
- */
-#define TARGET_NR_Linux			5000
-#define TARGET_NR_read			(TARGET_NR_Linux +   0)
-#define TARGET_NR_write			(TARGET_NR_Linux +   1)
-#define TARGET_NR_open			(TARGET_NR_Linux +   2)
-#define TARGET_NR_close			(TARGET_NR_Linux +   3)
-#define TARGET_NR_stat			(TARGET_NR_Linux +   4)
-#define TARGET_NR_fstat			(TARGET_NR_Linux +   5)
-#define TARGET_NR_lstat			(TARGET_NR_Linux +   6)
-#define TARGET_NR_poll			(TARGET_NR_Linux +   7)
-#define TARGET_NR_lseek			(TARGET_NR_Linux +   8)
-#define TARGET_NR_mmap			(TARGET_NR_Linux +   9)
-#define TARGET_NR_mprotect			(TARGET_NR_Linux +  10)
-#define TARGET_NR_munmap			(TARGET_NR_Linux +  11)
-#define TARGET_NR_brk			(TARGET_NR_Linux +  12)
-#define TARGET_NR_rt_sigaction		(TARGET_NR_Linux +  13)
-#define TARGET_NR_rt_sigprocmask		(TARGET_NR_Linux +  14)
-#define TARGET_NR_ioctl			(TARGET_NR_Linux +  15)
-#define TARGET_NR_pread64			(TARGET_NR_Linux +  16)
-#define TARGET_NR_pwrite64			(TARGET_NR_Linux +  17)
-#define TARGET_NR_readv			(TARGET_NR_Linux +  18)
-#define TARGET_NR_writev			(TARGET_NR_Linux +  19)
-#define TARGET_NR_access			(TARGET_NR_Linux +  20)
-#define TARGET_NR_pipe			(TARGET_NR_Linux +  21)
-#define TARGET_NR__newselect			(TARGET_NR_Linux +  22)
-#define TARGET_NR_sched_yield		(TARGET_NR_Linux +  23)
-#define TARGET_NR_mremap			(TARGET_NR_Linux +  24)
-#define TARGET_NR_msync			(TARGET_NR_Linux +  25)
-#define TARGET_NR_mincore			(TARGET_NR_Linux +  26)
-#define TARGET_NR_madvise			(TARGET_NR_Linux +  27)
-#define TARGET_NR_shmget			(TARGET_NR_Linux +  28)
-#define TARGET_NR_shmat			(TARGET_NR_Linux +  29)
-#define TARGET_NR_shmctl			(TARGET_NR_Linux +  30)
-#define TARGET_NR_dup			(TARGET_NR_Linux +  31)
-#define TARGET_NR_dup2			(TARGET_NR_Linux +  32)
-#define TARGET_NR_pause			(TARGET_NR_Linux +  33)
-#define TARGET_NR_nanosleep			(TARGET_NR_Linux +  34)
-#define TARGET_NR_getitimer			(TARGET_NR_Linux +  35)
-#define TARGET_NR_setitimer			(TARGET_NR_Linux +  36)
-#define TARGET_NR_alarm			(TARGET_NR_Linux +  37)
-#define TARGET_NR_getpid			(TARGET_NR_Linux +  38)
-#define TARGET_NR_sendfile			(TARGET_NR_Linux +  39)
-#define TARGET_NR_socket			(TARGET_NR_Linux +  40)
-#define TARGET_NR_connect			(TARGET_NR_Linux +  41)
-#define TARGET_NR_accept			(TARGET_NR_Linux +  42)
-#define TARGET_NR_sendto			(TARGET_NR_Linux +  43)
-#define TARGET_NR_recvfrom			(TARGET_NR_Linux +  44)
-#define TARGET_NR_sendmsg			(TARGET_NR_Linux +  45)
-#define TARGET_NR_recvmsg			(TARGET_NR_Linux +  46)
-#define TARGET_NR_shutdown			(TARGET_NR_Linux +  47)
-#define TARGET_NR_bind			(TARGET_NR_Linux +  48)
-#define TARGET_NR_listen			(TARGET_NR_Linux +  49)
-#define TARGET_NR_getsockname		(TARGET_NR_Linux +  50)
-#define TARGET_NR_getpeername		(TARGET_NR_Linux +  51)
-#define TARGET_NR_socketpair			(TARGET_NR_Linux +  52)
-#define TARGET_NR_setsockopt			(TARGET_NR_Linux +  53)
-#define TARGET_NR_getsockopt			(TARGET_NR_Linux +  54)
-#define TARGET_NR_clone			(TARGET_NR_Linux +  55)
-#define TARGET_NR_fork			(TARGET_NR_Linux +  56)
-#define TARGET_NR_execve			(TARGET_NR_Linux +  57)
-#define TARGET_NR_exit			(TARGET_NR_Linux +  58)
-#define TARGET_NR_wait4			(TARGET_NR_Linux +  59)
-#define TARGET_NR_kill			(TARGET_NR_Linux +  60)
-#define TARGET_NR_uname			(TARGET_NR_Linux +  61)
-#define TARGET_NR_semget			(TARGET_NR_Linux +  62)
-#define TARGET_NR_semop			(TARGET_NR_Linux +  63)
-#define TARGET_NR_semctl			(TARGET_NR_Linux +  64)
-#define TARGET_NR_shmdt			(TARGET_NR_Linux +  65)
-#define TARGET_NR_msgget			(TARGET_NR_Linux +  66)
-#define TARGET_NR_msgsnd			(TARGET_NR_Linux +  67)
-#define TARGET_NR_msgrcv			(TARGET_NR_Linux +  68)
-#define TARGET_NR_msgctl			(TARGET_NR_Linux +  69)
-#define TARGET_NR_fcntl			(TARGET_NR_Linux +  70)
-#define TARGET_NR_flock			(TARGET_NR_Linux +  71)
-#define TARGET_NR_fsync			(TARGET_NR_Linux +  72)
-#define TARGET_NR_fdatasync			(TARGET_NR_Linux +  73)
-#define TARGET_NR_truncate			(TARGET_NR_Linux +  74)
-#define TARGET_NR_ftruncate			(TARGET_NR_Linux +  75)
-#define TARGET_NR_getdents			(TARGET_NR_Linux +  76)
-#define TARGET_NR_getcwd			(TARGET_NR_Linux +  77)
-#define TARGET_NR_chdir			(TARGET_NR_Linux +  78)
-#define TARGET_NR_fchdir			(TARGET_NR_Linux +  79)
-#define TARGET_NR_rename			(TARGET_NR_Linux +  80)
-#define TARGET_NR_mkdir			(TARGET_NR_Linux +  81)
-#define TARGET_NR_rmdir			(TARGET_NR_Linux +  82)
-#define TARGET_NR_creat			(TARGET_NR_Linux +  83)
-#define TARGET_NR_link			(TARGET_NR_Linux +  84)
-#define TARGET_NR_unlink			(TARGET_NR_Linux +  85)
-#define TARGET_NR_symlink			(TARGET_NR_Linux +  86)
-#define TARGET_NR_readlink			(TARGET_NR_Linux +  87)
-#define TARGET_NR_chmod			(TARGET_NR_Linux +  88)
-#define TARGET_NR_fchmod			(TARGET_NR_Linux +  89)
-#define TARGET_NR_chown			(TARGET_NR_Linux +  90)
-#define TARGET_NR_fchown			(TARGET_NR_Linux +  91)
-#define TARGET_NR_lchown			(TARGET_NR_Linux +  92)
-#define TARGET_NR_umask			(TARGET_NR_Linux +  93)
-#define TARGET_NR_gettimeofday		(TARGET_NR_Linux +  94)
-#define TARGET_NR_getrlimit			(TARGET_NR_Linux +  95)
-#define TARGET_NR_getrusage			(TARGET_NR_Linux +  96)
-#define TARGET_NR_sysinfo			(TARGET_NR_Linux +  97)
-#define TARGET_NR_times			(TARGET_NR_Linux +  98)
-#define TARGET_NR_ptrace			(TARGET_NR_Linux +  99)
-#define TARGET_NR_getuid			(TARGET_NR_Linux + 100)
-#define TARGET_NR_syslog			(TARGET_NR_Linux + 101)
-#define TARGET_NR_getgid			(TARGET_NR_Linux + 102)
-#define TARGET_NR_setuid			(TARGET_NR_Linux + 103)
-#define TARGET_NR_setgid			(TARGET_NR_Linux + 104)
-#define TARGET_NR_geteuid			(TARGET_NR_Linux + 105)
-#define TARGET_NR_getegid			(TARGET_NR_Linux + 106)
-#define TARGET_NR_setpgid			(TARGET_NR_Linux + 107)
-#define TARGET_NR_getppid			(TARGET_NR_Linux + 108)
-#define TARGET_NR_getpgrp			(TARGET_NR_Linux + 109)
-#define TARGET_NR_setsid			(TARGET_NR_Linux + 110)
-#define TARGET_NR_setreuid			(TARGET_NR_Linux + 111)
-#define TARGET_NR_setregid			(TARGET_NR_Linux + 112)
-#define TARGET_NR_getgroups			(TARGET_NR_Linux + 113)
-#define TARGET_NR_setgroups			(TARGET_NR_Linux + 114)
-#define TARGET_NR_setresuid			(TARGET_NR_Linux + 115)
-#define TARGET_NR_getresuid			(TARGET_NR_Linux + 116)
-#define TARGET_NR_setresgid			(TARGET_NR_Linux + 117)
-#define TARGET_NR_getresgid			(TARGET_NR_Linux + 118)
-#define TARGET_NR_getpgid			(TARGET_NR_Linux + 119)
-#define TARGET_NR_setfsuid			(TARGET_NR_Linux + 120)
-#define TARGET_NR_setfsgid			(TARGET_NR_Linux + 121)
-#define TARGET_NR_getsid			(TARGET_NR_Linux + 122)
-#define TARGET_NR_capget			(TARGET_NR_Linux + 123)
-#define TARGET_NR_capset			(TARGET_NR_Linux + 124)
-#define TARGET_NR_rt_sigpending		(TARGET_NR_Linux + 125)
-#define TARGET_NR_rt_sigtimedwait		(TARGET_NR_Linux + 126)
-#define TARGET_NR_rt_sigqueueinfo		(TARGET_NR_Linux + 127)
-#define TARGET_NR_rt_sigsuspend		(TARGET_NR_Linux + 128)
-#define TARGET_NR_sigaltstack		(TARGET_NR_Linux + 129)
-#define TARGET_NR_utime			(TARGET_NR_Linux + 130)
-#define TARGET_NR_mknod			(TARGET_NR_Linux + 131)
-#define TARGET_NR_personality		(TARGET_NR_Linux + 132)
-#define TARGET_NR_ustat			(TARGET_NR_Linux + 133)
-#define TARGET_NR_statfs			(TARGET_NR_Linux + 134)
-#define TARGET_NR_fstatfs			(TARGET_NR_Linux + 135)
-#define TARGET_NR_sysfs			(TARGET_NR_Linux + 136)
-#define TARGET_NR_getpriority		(TARGET_NR_Linux + 137)
-#define TARGET_NR_setpriority		(TARGET_NR_Linux + 138)
-#define TARGET_NR_sched_setparam		(TARGET_NR_Linux + 139)
-#define TARGET_NR_sched_getparam		(TARGET_NR_Linux + 140)
-#define TARGET_NR_sched_setscheduler		(TARGET_NR_Linux + 141)
-#define TARGET_NR_sched_getscheduler		(TARGET_NR_Linux + 142)
-#define TARGET_NR_sched_get_priority_max	(TARGET_NR_Linux + 143)
-#define TARGET_NR_sched_get_priority_min	(TARGET_NR_Linux + 144)
-#define TARGET_NR_sched_rr_get_interval	(TARGET_NR_Linux + 145)
-#define TARGET_NR_mlock			(TARGET_NR_Linux + 146)
-#define TARGET_NR_munlock			(TARGET_NR_Linux + 147)
-#define TARGET_NR_mlockall			(TARGET_NR_Linux + 148)
-#define TARGET_NR_munlockall			(TARGET_NR_Linux + 149)
-#define TARGET_NR_vhangup			(TARGET_NR_Linux + 150)
-#define TARGET_NR_pivot_root			(TARGET_NR_Linux + 151)
-#define TARGET_NR__sysctl			(TARGET_NR_Linux + 152)
-#define TARGET_NR_prctl			(TARGET_NR_Linux + 153)
-#define TARGET_NR_adjtimex			(TARGET_NR_Linux + 154)
-#define TARGET_NR_setrlimit			(TARGET_NR_Linux + 155)
-#define TARGET_NR_chroot			(TARGET_NR_Linux + 156)
-#define TARGET_NR_sync			(TARGET_NR_Linux + 157)
-#define TARGET_NR_acct			(TARGET_NR_Linux + 158)
-#define TARGET_NR_settimeofday		(TARGET_NR_Linux + 159)
-#define TARGET_NR_mount			(TARGET_NR_Linux + 160)
-#define TARGET_NR_umount2			(TARGET_NR_Linux + 161)
-#define TARGET_NR_swapon			(TARGET_NR_Linux + 162)
-#define TARGET_NR_swapoff			(TARGET_NR_Linux + 163)
-#define TARGET_NR_reboot			(TARGET_NR_Linux + 164)
-#define TARGET_NR_sethostname		(TARGET_NR_Linux + 165)
-#define TARGET_NR_setdomainname		(TARGET_NR_Linux + 166)
-#define TARGET_NR_create_module		(TARGET_NR_Linux + 167)
-#define TARGET_NR_init_module		(TARGET_NR_Linux + 168)
-#define TARGET_NR_delete_module		(TARGET_NR_Linux + 169)
-#define TARGET_NR_get_kernel_syms		(TARGET_NR_Linux + 170)
-#define TARGET_NR_query_module		(TARGET_NR_Linux + 171)
-#define TARGET_NR_quotactl			(TARGET_NR_Linux + 172)
-#define TARGET_NR_nfsservctl			(TARGET_NR_Linux + 173)
-#define TARGET_NR_getpmsg			(TARGET_NR_Linux + 174)
-#define TARGET_NR_putpmsg			(TARGET_NR_Linux + 175)
-#define TARGET_NR_afs_syscall		(TARGET_NR_Linux + 176)
-#define TARGET_NR_reserved177		(TARGET_NR_Linux + 177)
-#define TARGET_NR_gettid			(TARGET_NR_Linux + 178)
-#define TARGET_NR_readahead			(TARGET_NR_Linux + 179)
-#define TARGET_NR_setxattr			(TARGET_NR_Linux + 180)
-#define TARGET_NR_lsetxattr			(TARGET_NR_Linux + 181)
-#define TARGET_NR_fsetxattr			(TARGET_NR_Linux + 182)
-#define TARGET_NR_getxattr			(TARGET_NR_Linux + 183)
-#define TARGET_NR_lgetxattr			(TARGET_NR_Linux + 184)
-#define TARGET_NR_fgetxattr			(TARGET_NR_Linux + 185)
-#define TARGET_NR_listxattr			(TARGET_NR_Linux + 186)
-#define TARGET_NR_llistxattr			(TARGET_NR_Linux + 187)
-#define TARGET_NR_flistxattr			(TARGET_NR_Linux + 188)
-#define TARGET_NR_removexattr		(TARGET_NR_Linux + 189)
-#define TARGET_NR_lremovexattr		(TARGET_NR_Linux + 190)
-#define TARGET_NR_fremovexattr		(TARGET_NR_Linux + 191)
-#define TARGET_NR_tkill			(TARGET_NR_Linux + 192)
-#define TARGET_NR_reserved193		(TARGET_NR_Linux + 193)
-#define TARGET_NR_futex			(TARGET_NR_Linux + 194)
-#define TARGET_NR_sched_setaffinity		(TARGET_NR_Linux + 195)
-#define TARGET_NR_sched_getaffinity		(TARGET_NR_Linux + 196)
-#define TARGET_NR_cacheflush			(TARGET_NR_Linux + 197)
-#define TARGET_NR_cachectl			(TARGET_NR_Linux + 198)
-#define TARGET_NR_sysmips			(TARGET_NR_Linux + 199)
-#define TARGET_NR_io_setup			(TARGET_NR_Linux + 200)
-#define TARGET_NR_io_destroy			(TARGET_NR_Linux + 201)
-#define TARGET_NR_io_getevents		(TARGET_NR_Linux + 202)
-#define TARGET_NR_io_submit			(TARGET_NR_Linux + 203)
-#define TARGET_NR_io_cancel			(TARGET_NR_Linux + 204)
-#define TARGET_NR_exit_group			(TARGET_NR_Linux + 205)
-#define TARGET_NR_lookup_dcookie		(TARGET_NR_Linux + 206)
-#define TARGET_NR_epoll_create		(TARGET_NR_Linux + 207)
-#define TARGET_NR_epoll_ctl			(TARGET_NR_Linux + 208)
-#define TARGET_NR_epoll_wait			(TARGET_NR_Linux + 209)
-#define TARGET_NR_remap_file_pages		(TARGET_NR_Linux + 210)
-#define TARGET_NR_rt_sigreturn		(TARGET_NR_Linux + 211)
-#define TARGET_NR_set_tid_address		(TARGET_NR_Linux + 212)
-#define TARGET_NR_restart_syscall		(TARGET_NR_Linux + 213)
-#define TARGET_NR_semtimedop			(TARGET_NR_Linux + 214)
-#define TARGET_NR_fadvise64			(TARGET_NR_Linux + 215)
-#define TARGET_NR_timer_create		(TARGET_NR_Linux + 216)
-#define TARGET_NR_timer_settime		(TARGET_NR_Linux + 217)
-#define TARGET_NR_timer_gettime		(TARGET_NR_Linux + 218)
-#define TARGET_NR_timer_getoverrun		(TARGET_NR_Linux + 219)
-#define TARGET_NR_timer_delete		(TARGET_NR_Linux + 220)
-#define TARGET_NR_clock_settime		(TARGET_NR_Linux + 221)
-#define TARGET_NR_clock_gettime		(TARGET_NR_Linux + 222)
-#define TARGET_NR_clock_getres		(TARGET_NR_Linux + 223)
-#define TARGET_NR_clock_nanosleep		(TARGET_NR_Linux + 224)
-#define TARGET_NR_tgkill			(TARGET_NR_Linux + 225)
-#define TARGET_NR_utimes			(TARGET_NR_Linux + 226)
-#define TARGET_NR_mbind			(TARGET_NR_Linux + 227)
-#define TARGET_NR_get_mempolicy		(TARGET_NR_Linux + 228)
-#define TARGET_NR_set_mempolicy		(TARGET_NR_Linux + 229)
-#define TARGET_NR_mq_open			(TARGET_NR_Linux + 230)
-#define TARGET_NR_mq_unlink			(TARGET_NR_Linux + 231)
-#define TARGET_NR_mq_timedsend		(TARGET_NR_Linux + 232)
-#define TARGET_NR_mq_timedreceive		(TARGET_NR_Linux + 233)
-#define TARGET_NR_mq_notify			(TARGET_NR_Linux + 234)
-#define TARGET_NR_mq_getsetattr		(TARGET_NR_Linux + 235)
-#define TARGET_NR_vserver			(TARGET_NR_Linux + 236)
-#define TARGET_NR_waitid			(TARGET_NR_Linux + 237)
-/* #define TARGET_NR_sys_setaltroot		(TARGET_NR_Linux + 238) */
-#define TARGET_NR_add_key			(TARGET_NR_Linux + 239)
-#define TARGET_NR_request_key		(TARGET_NR_Linux + 240)
-#define TARGET_NR_keyctl			(TARGET_NR_Linux + 241)
-#define TARGET_NR_set_thread_area		(TARGET_NR_Linux + 242)
-#define TARGET_NR_inotify_init		(TARGET_NR_Linux + 243)
-#define TARGET_NR_inotify_add_watch		(TARGET_NR_Linux + 244)
-#define TARGET_NR_inotify_rm_watch		(TARGET_NR_Linux + 245)
-#define TARGET_NR_migrate_pages		(TARGET_NR_Linux + 246)
-#define TARGET_NR_openat			(TARGET_NR_Linux + 247)
-#define TARGET_NR_mkdirat			(TARGET_NR_Linux + 248)
-#define TARGET_NR_mknodat			(TARGET_NR_Linux + 249)
-#define TARGET_NR_fchownat			(TARGET_NR_Linux + 250)
-#define TARGET_NR_futimesat			(TARGET_NR_Linux + 251)
-#define TARGET_NR_newfstatat			(TARGET_NR_Linux + 252)
-#define TARGET_NR_unlinkat			(TARGET_NR_Linux + 253)
-#define TARGET_NR_renameat			(TARGET_NR_Linux + 254)
-#define TARGET_NR_linkat			(TARGET_NR_Linux + 255)
-#define TARGET_NR_symlinkat			(TARGET_NR_Linux + 256)
-#define TARGET_NR_readlinkat			(TARGET_NR_Linux + 257)
-#define TARGET_NR_fchmodat			(TARGET_NR_Linux + 258)
-#define TARGET_NR_faccessat			(TARGET_NR_Linux + 259)
-#define TARGET_NR_pselect6			(TARGET_NR_Linux + 260)
-#define TARGET_NR_ppoll			(TARGET_NR_Linux + 261)
-#define TARGET_NR_unshare			(TARGET_NR_Linux + 262)
-#define TARGET_NR_splice			(TARGET_NR_Linux + 263)
-#define TARGET_NR_sync_file_range		(TARGET_NR_Linux + 264)
-#define TARGET_NR_tee			(TARGET_NR_Linux + 265)
-#define TARGET_NR_vmsplice			(TARGET_NR_Linux + 266)
-#define TARGET_NR_move_pages			(TARGET_NR_Linux + 267)
-#define TARGET_NR_set_robust_list		(TARGET_NR_Linux + 268)
-#define TARGET_NR_get_robust_list		(TARGET_NR_Linux + 269)
-#define TARGET_NR_kexec_load			(TARGET_NR_Linux + 270)
-#define TARGET_NR_getcpu			(TARGET_NR_Linux + 271)
-#define TARGET_NR_epoll_pwait		(TARGET_NR_Linux + 272)
-#define TARGET_NR_ioprio_set			(TARGET_NR_Linux + 273)
-#define TARGET_NR_ioprio_get			(TARGET_NR_Linux + 274)
-#define TARGET_NR_utimensat			(TARGET_NR_Linux + 275)
-#define TARGET_NR_signalfd			(TARGET_NR_Linux + 276)
-#define TARGET_NR_timerfd			(TARGET_NR_Linux + 277)
-#define TARGET_NR_eventfd			(TARGET_NR_Linux + 278)
-#define TARGET_NR_fallocate			(TARGET_NR_Linux + 279)
-#define TARGET_NR_timerfd_create		(TARGET_NR_Linux + 280)
-#define TARGET_NR_timerfd_gettime		(TARGET_NR_Linux + 281)
-#define TARGET_NR_timerfd_settime		(TARGET_NR_Linux + 282)
-#define TARGET_NR_signalfd4			(TARGET_NR_Linux + 283)
-#define TARGET_NR_eventfd2			(TARGET_NR_Linux + 284)
-#define TARGET_NR_epoll_create1		(TARGET_NR_Linux + 285)
-#define TARGET_NR_dup3				(TARGET_NR_Linux + 286)
-#define TARGET_NR_pipe2			(TARGET_NR_Linux + 287)
-#define TARGET_NR_inotify_init1		(TARGET_NR_Linux + 288)
-#define TARGET_NR_preadv                        (TARGET_NR_Linux + 289)
-#define TARGET_NR_pwritev                       (TARGET_NR_Linux + 290)
-#define TARGET_NR_rt_tgsigqueueinfo             (TARGET_NR_Linux + 291)
-#define TARGET_NR_perf_event_open               (TARGET_NR_Linux + 292)
-#define TARGET_NR_accept4                       (TARGET_NR_Linux + 293)
-#define TARGET_NR_recvmmsg                      (TARGET_NR_Linux + 294)
-#define TARGET_NR_fanotify_init                 (TARGET_NR_Linux + 295)
-#define TARGET_NR_fanotify_mark                 (TARGET_NR_Linux + 296)
-#define TARGET_NR_prlimit64                     (TARGET_NR_Linux + 297)
-#define TARGET_NR_name_to_handle_at             (TARGET_NR_Linux + 298)
-#define TARGET_NR_open_by_handle_at             (TARGET_NR_Linux + 299)
-#define TARGET_NR_clock_adjtime                 (TARGET_NR_Linux + 300)
-#define TARGET_NR_syncfs                        (TARGET_NR_Linux + 301)
+#ifdef TARGET_ABI32
+#include "syscall_nr32.h"
+#else
+#include "syscall_nr64.h"
+#endif
+
diff --git a/linux-user/mips64/syscall_nr32.h b/linux-user/mips64/syscall_nr32.h
new file mode 100644
index 0000000..4e1aca3
--- /dev/null
+++ b/linux-user/mips64/syscall_nr32.h
@@ -0,0 +1,311 @@ 
+/*
+ * Linux N32 syscalls are in the range from 6000 to 6999.
+ */
+#define TARGET_NR_Linux			6000
+#define TARGET_NR_read			(TARGET_NR_Linux +   0)
+#define TARGET_NR_write			(TARGET_NR_Linux +   1)
+#define TARGET_NR_open			(TARGET_NR_Linux +   2)
+#define TARGET_NR_close			(TARGET_NR_Linux +   3)
+#define TARGET_NR_stat			(TARGET_NR_Linux +   4)
+#define TARGET_NR_fstat			(TARGET_NR_Linux +   5)
+#define TARGET_NR_lstat			(TARGET_NR_Linux +   6)
+#define TARGET_NR_poll			(TARGET_NR_Linux +   7)
+#define TARGET_NR_lseek			(TARGET_NR_Linux +   8)
+#define TARGET_NR_mmap			(TARGET_NR_Linux +   9)
+#define TARGET_NR_mprotect			(TARGET_NR_Linux +  10)
+#define TARGET_NR_munmap			(TARGET_NR_Linux +  11)
+#define TARGET_NR_brk			(TARGET_NR_Linux +  12)
+#define TARGET_NR_rt_sigaction		(TARGET_NR_Linux +  13)
+#define TARGET_NR_rt_sigprocmask		(TARGET_NR_Linux +  14)
+#define TARGET_NR_ioctl			(TARGET_NR_Linux +  15)
+#define TARGET_NR_pread64			(TARGET_NR_Linux +  16)
+#define TARGET_NR_pwrite64			(TARGET_NR_Linux +  17)
+#define TARGET_NR_readv			(TARGET_NR_Linux +  18)
+#define TARGET_NR_writev			(TARGET_NR_Linux +  19)
+#define TARGET_NR_access			(TARGET_NR_Linux +  20)
+#define TARGET_NR_pipe			(TARGET_NR_Linux +  21)
+#define TARGET_NR__newselect			(TARGET_NR_Linux +  22)
+#define TARGET_NR_sched_yield		(TARGET_NR_Linux +  23)
+#define TARGET_NR_mremap			(TARGET_NR_Linux +  24)
+#define TARGET_NR_msync			(TARGET_NR_Linux +  25)
+#define TARGET_NR_mincore			(TARGET_NR_Linux +  26)
+#define TARGET_NR_madvise			(TARGET_NR_Linux +  27)
+#define TARGET_NR_shmget			(TARGET_NR_Linux +  28)
+#define TARGET_NR_shmat			(TARGET_NR_Linux +  29)
+#define TARGET_NR_shmctl			(TARGET_NR_Linux +  30)
+#define TARGET_NR_dup			(TARGET_NR_Linux +  31)
+#define TARGET_NR_dup2			(TARGET_NR_Linux +  32)
+#define TARGET_NR_pause			(TARGET_NR_Linux +  33)
+#define TARGET_NR_nanosleep			(TARGET_NR_Linux +  34)
+#define TARGET_NR_getitimer			(TARGET_NR_Linux +  35)
+#define TARGET_NR_setitimer			(TARGET_NR_Linux +  36)
+#define TARGET_NR_alarm			(TARGET_NR_Linux +  37)
+#define TARGET_NR_getpid			(TARGET_NR_Linux +  38)
+#define TARGET_NR_sendfile			(TARGET_NR_Linux +  39)
+#define TARGET_NR_socket			(TARGET_NR_Linux +  40)
+#define TARGET_NR_connect			(TARGET_NR_Linux +  41)
+#define TARGET_NR_accept			(TARGET_NR_Linux +  42)
+#define TARGET_NR_sendto			(TARGET_NR_Linux +  43)
+#define TARGET_NR_recvfrom			(TARGET_NR_Linux +  44)
+#define TARGET_NR_sendmsg			(TARGET_NR_Linux +  45)
+#define TARGET_NR_recvmsg			(TARGET_NR_Linux +  46)
+#define TARGET_NR_shutdown			(TARGET_NR_Linux +  47)
+#define TARGET_NR_bind			(TARGET_NR_Linux +  48)
+#define TARGET_NR_listen			(TARGET_NR_Linux +  49)
+#define TARGET_NR_getsockname		(TARGET_NR_Linux +  50)
+#define TARGET_NR_getpeername		(TARGET_NR_Linux +  51)
+#define TARGET_NR_socketpair			(TARGET_NR_Linux +  52)
+#define TARGET_NR_setsockopt			(TARGET_NR_Linux +  53)
+#define TARGET_NR_getsockopt			(TARGET_NR_Linux +  54)
+#define TARGET_NR_clone			(TARGET_NR_Linux +  55)
+#define TARGET_NR_fork			(TARGET_NR_Linux +  56)
+#define TARGET_NR_execve			(TARGET_NR_Linux +  57)
+#define TARGET_NR_exit			(TARGET_NR_Linux +  58)
+#define TARGET_NR_wait4			(TARGET_NR_Linux +  59)
+#define TARGET_NR_kill			(TARGET_NR_Linux +  60)
+#define TARGET_NR_uname			(TARGET_NR_Linux +  61)
+#define TARGET_NR_semget			(TARGET_NR_Linux +  62)
+#define TARGET_NR_semop			(TARGET_NR_Linux +  63)
+#define TARGET_NR_semctl			(TARGET_NR_Linux +  64)
+#define TARGET_NR_shmdt			(TARGET_NR_Linux +  65)
+#define TARGET_NR_msgget			(TARGET_NR_Linux +  66)
+#define TARGET_NR_msgsnd			(TARGET_NR_Linux +  67)
+#define TARGET_NR_msgrcv			(TARGET_NR_Linux +  68)
+#define TARGET_NR_msgctl			(TARGET_NR_Linux +  69)
+#define TARGET_NR_fcntl			(TARGET_NR_Linux +  70)
+#define TARGET_NR_flock			(TARGET_NR_Linux +  71)
+#define TARGET_NR_fsync			(TARGET_NR_Linux +  72)
+#define TARGET_NR_fdatasync			(TARGET_NR_Linux +  73)
+#define TARGET_NR_truncate			(TARGET_NR_Linux +  74)
+#define TARGET_NR_ftruncate			(TARGET_NR_Linux +  75)
+#define TARGET_NR_getdents			(TARGET_NR_Linux +  76)
+#define TARGET_NR_getcwd			(TARGET_NR_Linux +  77)
+#define TARGET_NR_chdir			(TARGET_NR_Linux +  78)
+#define TARGET_NR_fchdir			(TARGET_NR_Linux +  79)
+#define TARGET_NR_rename			(TARGET_NR_Linux +  80)
+#define TARGET_NR_mkdir			(TARGET_NR_Linux +  81)
+#define TARGET_NR_rmdir			(TARGET_NR_Linux +  82)
+#define TARGET_NR_creat			(TARGET_NR_Linux +  83)
+#define TARGET_NR_link			(TARGET_NR_Linux +  84)
+#define TARGET_NR_unlink			(TARGET_NR_Linux +  85)
+#define TARGET_NR_symlink			(TARGET_NR_Linux +  86)
+#define TARGET_NR_readlink			(TARGET_NR_Linux +  87)
+#define TARGET_NR_chmod			(TARGET_NR_Linux +  88)
+#define TARGET_NR_fchmod			(TARGET_NR_Linux +  89)
+#define TARGET_NR_chown			(TARGET_NR_Linux +  90)
+#define TARGET_NR_fchown			(TARGET_NR_Linux +  91)
+#define TARGET_NR_lchown			(TARGET_NR_Linux +  92)
+#define TARGET_NR_umask			(TARGET_NR_Linux +  93)
+#define TARGET_NR_gettimeofday		(TARGET_NR_Linux +  94)
+#define TARGET_NR_getrlimit			(TARGET_NR_Linux +  95)
+#define TARGET_NR_getrusage			(TARGET_NR_Linux +  96)
+#define TARGET_NR_sysinfo			(TARGET_NR_Linux +  97)
+#define TARGET_NR_times			(TARGET_NR_Linux +  98)
+#define TARGET_NR_ptrace			(TARGET_NR_Linux +  99)
+#define TARGET_NR_getuid			(TARGET_NR_Linux + 100)
+#define TARGET_NR_syslog			(TARGET_NR_Linux + 101)
+#define TARGET_NR_getgid			(TARGET_NR_Linux + 102)
+#define TARGET_NR_setuid			(TARGET_NR_Linux + 103)
+#define TARGET_NR_setgid			(TARGET_NR_Linux + 104)
+#define TARGET_NR_geteuid			(TARGET_NR_Linux + 105)
+#define TARGET_NR_getegid			(TARGET_NR_Linux + 106)
+#define TARGET_NR_setpgid			(TARGET_NR_Linux + 107)
+#define TARGET_NR_getppid			(TARGET_NR_Linux + 108)
+#define TARGET_NR_getpgrp			(TARGET_NR_Linux + 109)
+#define TARGET_NR_setsid			(TARGET_NR_Linux + 110)
+#define TARGET_NR_setreuid			(TARGET_NR_Linux + 111)
+#define TARGET_NR_setregid			(TARGET_NR_Linux + 112)
+#define TARGET_NR_getgroups			(TARGET_NR_Linux + 113)
+#define TARGET_NR_setgroups			(TARGET_NR_Linux + 114)
+#define TARGET_NR_setresuid			(TARGET_NR_Linux + 115)
+#define TARGET_NR_getresuid			(TARGET_NR_Linux + 116)
+#define TARGET_NR_setresgid			(TARGET_NR_Linux + 117)
+#define TARGET_NR_getresgid			(TARGET_NR_Linux + 118)
+#define TARGET_NR_getpgid			(TARGET_NR_Linux + 119)
+#define TARGET_NR_setfsuid			(TARGET_NR_Linux + 120)
+#define TARGET_NR_setfsgid			(TARGET_NR_Linux + 121)
+#define TARGET_NR_getsid			(TARGET_NR_Linux + 122)
+#define TARGET_NR_capget			(TARGET_NR_Linux + 123)
+#define TARGET_NR_capset			(TARGET_NR_Linux + 124)
+#define TARGET_NR_rt_sigpending		(TARGET_NR_Linux + 125)
+#define TARGET_NR_rt_sigtimedwait		(TARGET_NR_Linux + 126)
+#define TARGET_NR_rt_sigqueueinfo		(TARGET_NR_Linux + 127)
+#define TARGET_NR_rt_sigsuspend		(TARGET_NR_Linux + 128)
+#define TARGET_NR_sigaltstack		(TARGET_NR_Linux + 129)
+#define TARGET_NR_utime			(TARGET_NR_Linux + 130)
+#define TARGET_NR_mknod			(TARGET_NR_Linux + 131)
+#define TARGET_NR_personality		(TARGET_NR_Linux + 132)
+#define TARGET_NR_ustat			(TARGET_NR_Linux + 133)
+#define TARGET_NR_statfs			(TARGET_NR_Linux + 134)
+#define TARGET_NR_fstatfs			(TARGET_NR_Linux + 135)
+#define TARGET_NR_sysfs			(TARGET_NR_Linux + 136)
+#define TARGET_NR_getpriority		(TARGET_NR_Linux + 137)
+#define TARGET_NR_setpriority		(TARGET_NR_Linux + 138)
+#define TARGET_NR_sched_setparam		(TARGET_NR_Linux + 139)
+#define TARGET_NR_sched_getparam		(TARGET_NR_Linux + 140)
+#define TARGET_NR_sched_setscheduler		(TARGET_NR_Linux + 141)
+#define TARGET_NR_sched_getscheduler		(TARGET_NR_Linux + 142)
+#define TARGET_NR_sched_get_priority_max	(TARGET_NR_Linux + 143)
+#define TARGET_NR_sched_get_priority_min	(TARGET_NR_Linux + 144)
+#define TARGET_NR_sched_rr_get_interval	(TARGET_NR_Linux + 145)
+#define TARGET_NR_mlock			(TARGET_NR_Linux + 146)
+#define TARGET_NR_munlock			(TARGET_NR_Linux + 147)
+#define TARGET_NR_mlockall			(TARGET_NR_Linux + 148)
+#define TARGET_NR_munlockall			(TARGET_NR_Linux + 149)
+#define TARGET_NR_vhangup			(TARGET_NR_Linux + 150)
+#define TARGET_NR_pivot_root			(TARGET_NR_Linux + 151)
+#define TARGET_NR__sysctl			(TARGET_NR_Linux + 152)
+#define TARGET_NR_prctl			(TARGET_NR_Linux + 153)
+#define TARGET_NR_adjtimex			(TARGET_NR_Linux + 154)
+#define TARGET_NR_setrlimit			(TARGET_NR_Linux + 155)
+#define TARGET_NR_chroot			(TARGET_NR_Linux + 156)
+#define TARGET_NR_sync			(TARGET_NR_Linux + 157)
+#define TARGET_NR_acct			(TARGET_NR_Linux + 158)
+#define TARGET_NR_settimeofday		(TARGET_NR_Linux + 159)
+#define TARGET_NR_mount			(TARGET_NR_Linux + 160)
+#define TARGET_NR_umount2			(TARGET_NR_Linux + 161)
+#define TARGET_NR_swapon			(TARGET_NR_Linux + 162)
+#define TARGET_NR_swapoff			(TARGET_NR_Linux + 163)
+#define TARGET_NR_reboot			(TARGET_NR_Linux + 164)
+#define TARGET_NR_sethostname		(TARGET_NR_Linux + 165)
+#define TARGET_NR_setdomainname		(TARGET_NR_Linux + 166)
+#define TARGET_NR_create_module		(TARGET_NR_Linux + 167)
+#define TARGET_NR_init_module		(TARGET_NR_Linux + 168)
+#define TARGET_NR_delete_module		(TARGET_NR_Linux + 169)
+#define TARGET_NR_get_kernel_syms		(TARGET_NR_Linux + 170)
+#define TARGET_NR_query_module		(TARGET_NR_Linux + 171)
+#define TARGET_NR_quotactl			(TARGET_NR_Linux + 172)
+#define TARGET_NR_nfsservctl			(TARGET_NR_Linux + 173)
+#define TARGET_NR_getpmsg			(TARGET_NR_Linux + 174)
+#define TARGET_NR_putpmsg			(TARGET_NR_Linux + 175)
+#define TARGET_NR_afs_syscall		(TARGET_NR_Linux + 176)
+#define TARGET_NR_reserved177		(TARGET_NR_Linux + 177)
+#define TARGET_NR_gettid			(TARGET_NR_Linux + 178)
+#define TARGET_NR_readahead			(TARGET_NR_Linux + 179)
+#define TARGET_NR_setxattr			(TARGET_NR_Linux + 180)
+#define TARGET_NR_lsetxattr			(TARGET_NR_Linux + 181)
+#define TARGET_NR_fsetxattr			(TARGET_NR_Linux + 182)
+#define TARGET_NR_getxattr			(TARGET_NR_Linux + 183)
+#define TARGET_NR_lgetxattr			(TARGET_NR_Linux + 184)
+#define TARGET_NR_fgetxattr			(TARGET_NR_Linux + 185)
+#define TARGET_NR_listxattr			(TARGET_NR_Linux + 186)
+#define TARGET_NR_llistxattr			(TARGET_NR_Linux + 187)
+#define TARGET_NR_flistxattr			(TARGET_NR_Linux + 188)
+#define TARGET_NR_removexattr		(TARGET_NR_Linux + 189)
+#define TARGET_NR_lremovexattr		(TARGET_NR_Linux + 190)
+#define TARGET_NR_fremovexattr		(TARGET_NR_Linux + 191)
+#define TARGET_NR_tkill			(TARGET_NR_Linux + 192)
+#define TARGET_NR_reserved193		(TARGET_NR_Linux + 193)
+#define TARGET_NR_futex			(TARGET_NR_Linux + 194)
+#define TARGET_NR_sched_setaffinity		(TARGET_NR_Linux + 195)
+#define TARGET_NR_sched_getaffinity		(TARGET_NR_Linux + 196)
+#define TARGET_NR_cacheflush			(TARGET_NR_Linux + 197)
+#define TARGET_NR_cachectl			(TARGET_NR_Linux + 198)
+#define TARGET_NR_sysmips			(TARGET_NR_Linux + 199)
+#define TARGET_NR_io_setup			(TARGET_NR_Linux + 200)
+#define TARGET_NR_io_destroy			(TARGET_NR_Linux + 201)
+#define TARGET_NR_io_getevents		(TARGET_NR_Linux + 202)
+#define TARGET_NR_io_submit			(TARGET_NR_Linux + 203)
+#define TARGET_NR_io_cancel			(TARGET_NR_Linux + 204)
+#define TARGET_NR_exit_group			(TARGET_NR_Linux + 205)
+#define TARGET_NR_lookup_dcookie		(TARGET_NR_Linux + 206)
+#define TARGET_NR_epoll_create		(TARGET_NR_Linux + 207)
+#define TARGET_NR_epoll_ctl			(TARGET_NR_Linux + 208)
+#define TARGET_NR_epoll_wait			(TARGET_NR_Linux + 209)
+#define TARGET_NR_remap_file_pages		(TARGET_NR_Linux + 210)
+#define TARGET_NR_rt_sigreturn		(TARGET_NR_Linux + 211)
+#define TARGET_NR_fcntl64			(TARGET_NR_Linux + 212)
+#define TARGET_NR_set_tid_address		(TARGET_NR_Linux + 213)
+#define TARGET_NR_restart_syscall		(TARGET_NR_Linux + 214)
+#define TARGET_NR_semtimedop			(TARGET_NR_Linux + 215)
+#define TARGET_NR_fadvise64			(TARGET_NR_Linux + 216)
+#define TARGET_NR_statfs64			(TARGET_NR_Linux + 217)
+#define TARGET_NR_fstatfs64			(TARGET_NR_Linux + 218)
+#define TARGET_NR_sendfile64			(TARGET_NR_Linux + 219)
+#define TARGET_NR_timer_create		(TARGET_NR_Linux + 220)
+#define TARGET_NR_timer_settime		(TARGET_NR_Linux + 221)
+#define TARGET_NR_timer_gettime		(TARGET_NR_Linux + 222)
+#define TARGET_NR_timer_getoverrun		(TARGET_NR_Linux + 223)
+#define TARGET_NR_timer_delete		(TARGET_NR_Linux + 224)
+#define TARGET_NR_clock_settime		(TARGET_NR_Linux + 225)
+#define TARGET_NR_clock_gettime		(TARGET_NR_Linux + 226)
+#define TARGET_NR_clock_getres		(TARGET_NR_Linux + 227)
+#define TARGET_NR_clock_nanosleep		(TARGET_NR_Linux + 228)
+#define TARGET_NR_tgkill			(TARGET_NR_Linux + 229)
+#define TARGET_NR_utimes			(TARGET_NR_Linux + 230)
+#define TARGET_NR_mbind			(TARGET_NR_Linux + 231)
+#define TARGET_NR_get_mempolicy		(TARGET_NR_Linux + 232)
+#define TARGET_NR_set_mempolicy		(TARGET_NR_Linux + 233)
+#define TARGET_NR_mq_open			(TARGET_NR_Linux + 234)
+#define TARGET_NR_mq_unlink			(TARGET_NR_Linux + 235)
+#define TARGET_NR_mq_timedsend		(TARGET_NR_Linux + 236)
+#define TARGET_NR_mq_timedreceive		(TARGET_NR_Linux + 237)
+#define TARGET_NR_mq_notify			(TARGET_NR_Linux + 238)
+#define TARGET_NR_mq_getsetattr		(TARGET_NR_Linux + 239)
+#define TARGET_NR_vserver			(TARGET_NR_Linux + 240)
+#define TARGET_NR_waitid			(TARGET_NR_Linux + 241)
+/* #define TARGET_NR_sys_setaltroot		(TARGET_NR_Linux + 242) */
+#define TARGET_NR_add_key			(TARGET_NR_Linux + 243)
+#define TARGET_NR_request_key		(TARGET_NR_Linux + 244)
+#define TARGET_NR_keyctl			(TARGET_NR_Linux + 245)
+#define TARGET_NR_set_thread_area		(TARGET_NR_Linux + 246)
+#define TARGET_NR_inotify_init		(TARGET_NR_Linux + 247)
+#define TARGET_NR_inotify_add_watch		(TARGET_NR_Linux + 248)
+#define TARGET_NR_inotify_rm_watch		(TARGET_NR_Linux + 249)
+#define TARGET_NR_migrate_pages		(TARGET_NR_Linux + 250)
+#define TARGET_NR_openat			(TARGET_NR_Linux + 251)
+#define TARGET_NR_mkdirat			(TARGET_NR_Linux + 252)
+#define TARGET_NR_mknodat			(TARGET_NR_Linux + 253)
+#define TARGET_NR_fchownat			(TARGET_NR_Linux + 254)
+#define TARGET_NR_futimesat			(TARGET_NR_Linux + 255)
+#define TARGET_NR_newfstatat			(TARGET_NR_Linux + 256)
+#define TARGET_NR_unlinkat			(TARGET_NR_Linux + 257)
+#define TARGET_NR_renameat			(TARGET_NR_Linux + 258)
+#define TARGET_NR_linkat			(TARGET_NR_Linux + 259)
+#define TARGET_NR_symlinkat			(TARGET_NR_Linux + 260)
+#define TARGET_NR_readlinkat			(TARGET_NR_Linux + 261)
+#define TARGET_NR_fchmodat			(TARGET_NR_Linux + 262)
+#define TARGET_NR_faccessat			(TARGET_NR_Linux + 263)
+#define TARGET_NR_pselect6			(TARGET_NR_Linux + 264)
+#define TARGET_NR_ppoll			(TARGET_NR_Linux + 265)
+#define TARGET_NR_unshare			(TARGET_NR_Linux + 266)
+#define TARGET_NR_splice			(TARGET_NR_Linux + 267)
+#define TARGET_NR_sync_file_range		(TARGET_NR_Linux + 268)
+#define TARGET_NR_tee			(TARGET_NR_Linux + 269)
+#define TARGET_NR_vmsplice			(TARGET_NR_Linux + 270)
+#define TARGET_NR_move_pages			(TARGET_NR_Linux + 271)
+#define TARGET_NR_set_robust_list		(TARGET_NR_Linux + 272)
+#define TARGET_NR_get_robust_list		(TARGET_NR_Linux + 273)
+#define TARGET_NR_kexec_load			(TARGET_NR_Linux + 274)
+#define TARGET_NR_getcpu			(TARGET_NR_Linux + 275)
+#define TARGET_NR_epoll_pwait		(TARGET_NR_Linux + 276)
+#define TARGET_NR_ioprio_set			(TARGET_NR_Linux + 277)
+#define TARGET_NR_ioprio_get			(TARGET_NR_Linux + 278)
+#define TARGET_NR_utimensat			(TARGET_NR_Linux + 279)
+#define TARGET_NR_signalfd			(TARGET_NR_Linux + 280)
+#define TARGET_NR_timerfd			(TARGET_NR_Linux + 281)
+#define TARGET_NR_eventfd			(TARGET_NR_Linux + 282)
+#define TARGET_NR_fallocate			(TARGET_NR_Linux + 283)
+#define TARGET_NR_timerfd_create		(TARGET_NR_Linux + 284)
+#define TARGET_NR_timerfd_gettime		(TARGET_NR_Linux + 285)
+#define TARGET_NR_timerfd_settime		(TARGET_NR_Linux + 286)
+#define TARGET_NR_signalfd4			(TARGET_NR_Linux + 287)
+#define TARGET_NR_eventfd2			(TARGET_NR_Linux + 288)
+#define TARGET_NR_epoll_create1		(TARGET_NR_Linux + 289)
+#define TARGET_NR_dup3				(TARGET_NR_Linux + 290)
+#define TARGET_NR_pipe2			(TARGET_NR_Linux + 291)
+#define TARGET_NR_inotify_init1		(TARGET_NR_Linux + 292)
+#define TARGET_NR_preadv                        (TARGET_NR_Linux + 293)
+#define TARGET_NR_pwritev                       (TARGET_NR_Linux + 294)
+#define TARGET_NR_rt_tgsigqueueinfo             (TARGET_NR_Linux + 295)
+#define TARGET_NR_perf_event_open               (TARGET_NR_Linux + 296)
+#define TARGET_NR_accept4                       (TARGET_NR_Linux + 297)
+#define TARGET_NR_recvmmsg                      (TARGET_NR_Linux + 298)
+#define TARGET_NR_getdents64                    (TARGET_NR_Linux + 299)
+#define TARGET_NR_fanotify_init                 (TARGET_NR_Linux + 300)
+#define TARGET_NR_fanotify_mark                 (TARGET_NR_Linux + 301)
+#define TARGET_NR_prlimit64                     (TARGET_NR_Linux + 302)
+#define TARGET_NR_name_to_handle_at             (TARGET_NR_Linux + 303)
+#define TARGET_NR_open_by_handle_at             (TARGET_NR_Linux + 304)
+#define TARGET_NR_clock_adjtime                 (TARGET_NR_Linux + 305)
+#define TARGET_NR_syncfs                        (TARGET_NR_Linux + 306)
diff --git a/linux-user/mips64/syscall_nr64.h b/linux-user/mips64/syscall_nr64.h
new file mode 100644
index 0000000..36d27b5
--- /dev/null
+++ b/linux-user/mips64/syscall_nr64.h
@@ -0,0 +1,306 @@ 
+/*
+ * Linux 64-bit syscalls are in the range from 5000 to 5999.
+ */
+#define TARGET_NR_Linux			5000
+#define TARGET_NR_read			(TARGET_NR_Linux +   0)
+#define TARGET_NR_write			(TARGET_NR_Linux +   1)
+#define TARGET_NR_open			(TARGET_NR_Linux +   2)
+#define TARGET_NR_close			(TARGET_NR_Linux +   3)
+#define TARGET_NR_stat			(TARGET_NR_Linux +   4)
+#define TARGET_NR_fstat			(TARGET_NR_Linux +   5)
+#define TARGET_NR_lstat			(TARGET_NR_Linux +   6)
+#define TARGET_NR_poll			(TARGET_NR_Linux +   7)
+#define TARGET_NR_lseek			(TARGET_NR_Linux +   8)
+#define TARGET_NR_mmap			(TARGET_NR_Linux +   9)
+#define TARGET_NR_mprotect			(TARGET_NR_Linux +  10)
+#define TARGET_NR_munmap			(TARGET_NR_Linux +  11)
+#define TARGET_NR_brk			(TARGET_NR_Linux +  12)
+#define TARGET_NR_rt_sigaction		(TARGET_NR_Linux +  13)
+#define TARGET_NR_rt_sigprocmask		(TARGET_NR_Linux +  14)
+#define TARGET_NR_ioctl			(TARGET_NR_Linux +  15)
+#define TARGET_NR_pread64			(TARGET_NR_Linux +  16)
+#define TARGET_NR_pwrite64			(TARGET_NR_Linux +  17)
+#define TARGET_NR_readv			(TARGET_NR_Linux +  18)
+#define TARGET_NR_writev			(TARGET_NR_Linux +  19)
+#define TARGET_NR_access			(TARGET_NR_Linux +  20)
+#define TARGET_NR_pipe			(TARGET_NR_Linux +  21)
+#define TARGET_NR__newselect			(TARGET_NR_Linux +  22)
+#define TARGET_NR_sched_yield		(TARGET_NR_Linux +  23)
+#define TARGET_NR_mremap			(TARGET_NR_Linux +  24)
+#define TARGET_NR_msync			(TARGET_NR_Linux +  25)
+#define TARGET_NR_mincore			(TARGET_NR_Linux +  26)
+#define TARGET_NR_madvise			(TARGET_NR_Linux +  27)
+#define TARGET_NR_shmget			(TARGET_NR_Linux +  28)
+#define TARGET_NR_shmat			(TARGET_NR_Linux +  29)
+#define TARGET_NR_shmctl			(TARGET_NR_Linux +  30)
+#define TARGET_NR_dup			(TARGET_NR_Linux +  31)
+#define TARGET_NR_dup2			(TARGET_NR_Linux +  32)
+#define TARGET_NR_pause			(TARGET_NR_Linux +  33)
+#define TARGET_NR_nanosleep			(TARGET_NR_Linux +  34)
+#define TARGET_NR_getitimer			(TARGET_NR_Linux +  35)
+#define TARGET_NR_setitimer			(TARGET_NR_Linux +  36)
+#define TARGET_NR_alarm			(TARGET_NR_Linux +  37)
+#define TARGET_NR_getpid			(TARGET_NR_Linux +  38)
+#define TARGET_NR_sendfile			(TARGET_NR_Linux +  39)
+#define TARGET_NR_socket			(TARGET_NR_Linux +  40)
+#define TARGET_NR_connect			(TARGET_NR_Linux +  41)
+#define TARGET_NR_accept			(TARGET_NR_Linux +  42)
+#define TARGET_NR_sendto			(TARGET_NR_Linux +  43)
+#define TARGET_NR_recvfrom			(TARGET_NR_Linux +  44)
+#define TARGET_NR_sendmsg			(TARGET_NR_Linux +  45)
+#define TARGET_NR_recvmsg			(TARGET_NR_Linux +  46)
+#define TARGET_NR_shutdown			(TARGET_NR_Linux +  47)
+#define TARGET_NR_bind			(TARGET_NR_Linux +  48)
+#define TARGET_NR_listen			(TARGET_NR_Linux +  49)
+#define TARGET_NR_getsockname		(TARGET_NR_Linux +  50)
+#define TARGET_NR_getpeername		(TARGET_NR_Linux +  51)
+#define TARGET_NR_socketpair			(TARGET_NR_Linux +  52)
+#define TARGET_NR_setsockopt			(TARGET_NR_Linux +  53)
+#define TARGET_NR_getsockopt			(TARGET_NR_Linux +  54)
+#define TARGET_NR_clone			(TARGET_NR_Linux +  55)
+#define TARGET_NR_fork			(TARGET_NR_Linux +  56)
+#define TARGET_NR_execve			(TARGET_NR_Linux +  57)
+#define TARGET_NR_exit			(TARGET_NR_Linux +  58)
+#define TARGET_NR_wait4			(TARGET_NR_Linux +  59)
+#define TARGET_NR_kill			(TARGET_NR_Linux +  60)
+#define TARGET_NR_uname			(TARGET_NR_Linux +  61)
+#define TARGET_NR_semget			(TARGET_NR_Linux +  62)
+#define TARGET_NR_semop			(TARGET_NR_Linux +  63)
+#define TARGET_NR_semctl			(TARGET_NR_Linux +  64)
+#define TARGET_NR_shmdt			(TARGET_NR_Linux +  65)
+#define TARGET_NR_msgget			(TARGET_NR_Linux +  66)
+#define TARGET_NR_msgsnd			(TARGET_NR_Linux +  67)
+#define TARGET_NR_msgrcv			(TARGET_NR_Linux +  68)
+#define TARGET_NR_msgctl			(TARGET_NR_Linux +  69)
+#define TARGET_NR_fcntl			(TARGET_NR_Linux +  70)
+#define TARGET_NR_flock			(TARGET_NR_Linux +  71)
+#define TARGET_NR_fsync			(TARGET_NR_Linux +  72)
+#define TARGET_NR_fdatasync			(TARGET_NR_Linux +  73)
+#define TARGET_NR_truncate			(TARGET_NR_Linux +  74)
+#define TARGET_NR_ftruncate			(TARGET_NR_Linux +  75)
+#define TARGET_NR_getdents			(TARGET_NR_Linux +  76)
+#define TARGET_NR_getcwd			(TARGET_NR_Linux +  77)
+#define TARGET_NR_chdir			(TARGET_NR_Linux +  78)
+#define TARGET_NR_fchdir			(TARGET_NR_Linux +  79)
+#define TARGET_NR_rename			(TARGET_NR_Linux +  80)
+#define TARGET_NR_mkdir			(TARGET_NR_Linux +  81)
+#define TARGET_NR_rmdir			(TARGET_NR_Linux +  82)
+#define TARGET_NR_creat			(TARGET_NR_Linux +  83)
+#define TARGET_NR_link			(TARGET_NR_Linux +  84)
+#define TARGET_NR_unlink			(TARGET_NR_Linux +  85)
+#define TARGET_NR_symlink			(TARGET_NR_Linux +  86)
+#define TARGET_NR_readlink			(TARGET_NR_Linux +  87)
+#define TARGET_NR_chmod			(TARGET_NR_Linux +  88)
+#define TARGET_NR_fchmod			(TARGET_NR_Linux +  89)
+#define TARGET_NR_chown			(TARGET_NR_Linux +  90)
+#define TARGET_NR_fchown			(TARGET_NR_Linux +  91)
+#define TARGET_NR_lchown			(TARGET_NR_Linux +  92)
+#define TARGET_NR_umask			(TARGET_NR_Linux +  93)
+#define TARGET_NR_gettimeofday		(TARGET_NR_Linux +  94)
+#define TARGET_NR_getrlimit			(TARGET_NR_Linux +  95)
+#define TARGET_NR_getrusage			(TARGET_NR_Linux +  96)
+#define TARGET_NR_sysinfo			(TARGET_NR_Linux +  97)
+#define TARGET_NR_times			(TARGET_NR_Linux +  98)
+#define TARGET_NR_ptrace			(TARGET_NR_Linux +  99)
+#define TARGET_NR_getuid			(TARGET_NR_Linux + 100)
+#define TARGET_NR_syslog			(TARGET_NR_Linux + 101)
+#define TARGET_NR_getgid			(TARGET_NR_Linux + 102)
+#define TARGET_NR_setuid			(TARGET_NR_Linux + 103)
+#define TARGET_NR_setgid			(TARGET_NR_Linux + 104)
+#define TARGET_NR_geteuid			(TARGET_NR_Linux + 105)
+#define TARGET_NR_getegid			(TARGET_NR_Linux + 106)
+#define TARGET_NR_setpgid			(TARGET_NR_Linux + 107)
+#define TARGET_NR_getppid			(TARGET_NR_Linux + 108)
+#define TARGET_NR_getpgrp			(TARGET_NR_Linux + 109)
+#define TARGET_NR_setsid			(TARGET_NR_Linux + 110)
+#define TARGET_NR_setreuid			(TARGET_NR_Linux + 111)
+#define TARGET_NR_setregid			(TARGET_NR_Linux + 112)
+#define TARGET_NR_getgroups			(TARGET_NR_Linux + 113)
+#define TARGET_NR_setgroups			(TARGET_NR_Linux + 114)
+#define TARGET_NR_setresuid			(TARGET_NR_Linux + 115)
+#define TARGET_NR_getresuid			(TARGET_NR_Linux + 116)
+#define TARGET_NR_setresgid			(TARGET_NR_Linux + 117)
+#define TARGET_NR_getresgid			(TARGET_NR_Linux + 118)
+#define TARGET_NR_getpgid			(TARGET_NR_Linux + 119)
+#define TARGET_NR_setfsuid			(TARGET_NR_Linux + 120)
+#define TARGET_NR_setfsgid			(TARGET_NR_Linux + 121)
+#define TARGET_NR_getsid			(TARGET_NR_Linux + 122)
+#define TARGET_NR_capget			(TARGET_NR_Linux + 123)
+#define TARGET_NR_capset			(TARGET_NR_Linux + 124)
+#define TARGET_NR_rt_sigpending		(TARGET_NR_Linux + 125)
+#define TARGET_NR_rt_sigtimedwait		(TARGET_NR_Linux + 126)
+#define TARGET_NR_rt_sigqueueinfo		(TARGET_NR_Linux + 127)
+#define TARGET_NR_rt_sigsuspend		(TARGET_NR_Linux + 128)
+#define TARGET_NR_sigaltstack		(TARGET_NR_Linux + 129)
+#define TARGET_NR_utime			(TARGET_NR_Linux + 130)
+#define TARGET_NR_mknod			(TARGET_NR_Linux + 131)
+#define TARGET_NR_personality		(TARGET_NR_Linux + 132)
+#define TARGET_NR_ustat			(TARGET_NR_Linux + 133)
+#define TARGET_NR_statfs			(TARGET_NR_Linux + 134)
+#define TARGET_NR_fstatfs			(TARGET_NR_Linux + 135)
+#define TARGET_NR_sysfs			(TARGET_NR_Linux + 136)
+#define TARGET_NR_getpriority		(TARGET_NR_Linux + 137)
+#define TARGET_NR_setpriority		(TARGET_NR_Linux + 138)
+#define TARGET_NR_sched_setparam		(TARGET_NR_Linux + 139)
+#define TARGET_NR_sched_getparam		(TARGET_NR_Linux + 140)
+#define TARGET_NR_sched_setscheduler		(TARGET_NR_Linux + 141)
+#define TARGET_NR_sched_getscheduler		(TARGET_NR_Linux + 142)
+#define TARGET_NR_sched_get_priority_max	(TARGET_NR_Linux + 143)
+#define TARGET_NR_sched_get_priority_min	(TARGET_NR_Linux + 144)
+#define TARGET_NR_sched_rr_get_interval	(TARGET_NR_Linux + 145)
+#define TARGET_NR_mlock			(TARGET_NR_Linux + 146)
+#define TARGET_NR_munlock			(TARGET_NR_Linux + 147)
+#define TARGET_NR_mlockall			(TARGET_NR_Linux + 148)
+#define TARGET_NR_munlockall			(TARGET_NR_Linux + 149)
+#define TARGET_NR_vhangup			(TARGET_NR_Linux + 150)
+#define TARGET_NR_pivot_root			(TARGET_NR_Linux + 151)
+#define TARGET_NR__sysctl			(TARGET_NR_Linux + 152)
+#define TARGET_NR_prctl			(TARGET_NR_Linux + 153)
+#define TARGET_NR_adjtimex			(TARGET_NR_Linux + 154)
+#define TARGET_NR_setrlimit			(TARGET_NR_Linux + 155)
+#define TARGET_NR_chroot			(TARGET_NR_Linux + 156)
+#define TARGET_NR_sync			(TARGET_NR_Linux + 157)
+#define TARGET_NR_acct			(TARGET_NR_Linux + 158)
+#define TARGET_NR_settimeofday		(TARGET_NR_Linux + 159)
+#define TARGET_NR_mount			(TARGET_NR_Linux + 160)
+#define TARGET_NR_umount2			(TARGET_NR_Linux + 161)
+#define TARGET_NR_swapon			(TARGET_NR_Linux + 162)
+#define TARGET_NR_swapoff			(TARGET_NR_Linux + 163)
+#define TARGET_NR_reboot			(TARGET_NR_Linux + 164)
+#define TARGET_NR_sethostname		(TARGET_NR_Linux + 165)
+#define TARGET_NR_setdomainname		(TARGET_NR_Linux + 166)
+#define TARGET_NR_create_module		(TARGET_NR_Linux + 167)
+#define TARGET_NR_init_module		(TARGET_NR_Linux + 168)
+#define TARGET_NR_delete_module		(TARGET_NR_Linux + 169)
+#define TARGET_NR_get_kernel_syms		(TARGET_NR_Linux + 170)
+#define TARGET_NR_query_module		(TARGET_NR_Linux + 171)
+#define TARGET_NR_quotactl			(TARGET_NR_Linux + 172)
+#define TARGET_NR_nfsservctl			(TARGET_NR_Linux + 173)
+#define TARGET_NR_getpmsg			(TARGET_NR_Linux + 174)
+#define TARGET_NR_putpmsg			(TARGET_NR_Linux + 175)
+#define TARGET_NR_afs_syscall		(TARGET_NR_Linux + 176)
+#define TARGET_NR_reserved177		(TARGET_NR_Linux + 177)
+#define TARGET_NR_gettid			(TARGET_NR_Linux + 178)
+#define TARGET_NR_readahead			(TARGET_NR_Linux + 179)
+#define TARGET_NR_setxattr			(TARGET_NR_Linux + 180)
+#define TARGET_NR_lsetxattr			(TARGET_NR_Linux + 181)
+#define TARGET_NR_fsetxattr			(TARGET_NR_Linux + 182)
+#define TARGET_NR_getxattr			(TARGET_NR_Linux + 183)
+#define TARGET_NR_lgetxattr			(TARGET_NR_Linux + 184)
+#define TARGET_NR_fgetxattr			(TARGET_NR_Linux + 185)
+#define TARGET_NR_listxattr			(TARGET_NR_Linux + 186)
+#define TARGET_NR_llistxattr			(TARGET_NR_Linux + 187)
+#define TARGET_NR_flistxattr			(TARGET_NR_Linux + 188)
+#define TARGET_NR_removexattr		(TARGET_NR_Linux + 189)
+#define TARGET_NR_lremovexattr		(TARGET_NR_Linux + 190)
+#define TARGET_NR_fremovexattr		(TARGET_NR_Linux + 191)
+#define TARGET_NR_tkill			(TARGET_NR_Linux + 192)
+#define TARGET_NR_reserved193		(TARGET_NR_Linux + 193)
+#define TARGET_NR_futex			(TARGET_NR_Linux + 194)
+#define TARGET_NR_sched_setaffinity		(TARGET_NR_Linux + 195)
+#define TARGET_NR_sched_getaffinity		(TARGET_NR_Linux + 196)
+#define TARGET_NR_cacheflush			(TARGET_NR_Linux + 197)
+#define TARGET_NR_cachectl			(TARGET_NR_Linux + 198)
+#define TARGET_NR_sysmips			(TARGET_NR_Linux + 199)
+#define TARGET_NR_io_setup			(TARGET_NR_Linux + 200)
+#define TARGET_NR_io_destroy			(TARGET_NR_Linux + 201)
+#define TARGET_NR_io_getevents		(TARGET_NR_Linux + 202)
+#define TARGET_NR_io_submit			(TARGET_NR_Linux + 203)
+#define TARGET_NR_io_cancel			(TARGET_NR_Linux + 204)
+#define TARGET_NR_exit_group			(TARGET_NR_Linux + 205)
+#define TARGET_NR_lookup_dcookie		(TARGET_NR_Linux + 206)
+#define TARGET_NR_epoll_create		(TARGET_NR_Linux + 207)
+#define TARGET_NR_epoll_ctl			(TARGET_NR_Linux + 208)
+#define TARGET_NR_epoll_wait			(TARGET_NR_Linux + 209)
+#define TARGET_NR_remap_file_pages		(TARGET_NR_Linux + 210)
+#define TARGET_NR_rt_sigreturn		(TARGET_NR_Linux + 211)
+#define TARGET_NR_set_tid_address		(TARGET_NR_Linux + 212)
+#define TARGET_NR_restart_syscall		(TARGET_NR_Linux + 213)
+#define TARGET_NR_semtimedop			(TARGET_NR_Linux + 214)
+#define TARGET_NR_fadvise64			(TARGET_NR_Linux + 215)
+#define TARGET_NR_timer_create		(TARGET_NR_Linux + 216)
+#define TARGET_NR_timer_settime		(TARGET_NR_Linux + 217)
+#define TARGET_NR_timer_gettime		(TARGET_NR_Linux + 218)
+#define TARGET_NR_timer_getoverrun		(TARGET_NR_Linux + 219)
+#define TARGET_NR_timer_delete		(TARGET_NR_Linux + 220)
+#define TARGET_NR_clock_settime		(TARGET_NR_Linux + 221)
+#define TARGET_NR_clock_gettime		(TARGET_NR_Linux + 222)
+#define TARGET_NR_clock_getres		(TARGET_NR_Linux + 223)
+#define TARGET_NR_clock_nanosleep		(TARGET_NR_Linux + 224)
+#define TARGET_NR_tgkill			(TARGET_NR_Linux + 225)
+#define TARGET_NR_utimes			(TARGET_NR_Linux + 226)
+#define TARGET_NR_mbind			(TARGET_NR_Linux + 227)
+#define TARGET_NR_get_mempolicy		(TARGET_NR_Linux + 228)
+#define TARGET_NR_set_mempolicy		(TARGET_NR_Linux + 229)
+#define TARGET_NR_mq_open			(TARGET_NR_Linux + 230)
+#define TARGET_NR_mq_unlink			(TARGET_NR_Linux + 231)
+#define TARGET_NR_mq_timedsend		(TARGET_NR_Linux + 232)
+#define TARGET_NR_mq_timedreceive		(TARGET_NR_Linux + 233)
+#define TARGET_NR_mq_notify			(TARGET_NR_Linux + 234)
+#define TARGET_NR_mq_getsetattr		(TARGET_NR_Linux + 235)
+#define TARGET_NR_vserver			(TARGET_NR_Linux + 236)
+#define TARGET_NR_waitid			(TARGET_NR_Linux + 237)
+/* #define TARGET_NR_sys_setaltroot		(TARGET_NR_Linux + 238) */
+#define TARGET_NR_add_key			(TARGET_NR_Linux + 239)
+#define TARGET_NR_request_key		(TARGET_NR_Linux + 240)
+#define TARGET_NR_keyctl			(TARGET_NR_Linux + 241)
+#define TARGET_NR_set_thread_area		(TARGET_NR_Linux + 242)
+#define TARGET_NR_inotify_init		(TARGET_NR_Linux + 243)
+#define TARGET_NR_inotify_add_watch		(TARGET_NR_Linux + 244)
+#define TARGET_NR_inotify_rm_watch		(TARGET_NR_Linux + 245)
+#define TARGET_NR_migrate_pages		(TARGET_NR_Linux + 246)
+#define TARGET_NR_openat			(TARGET_NR_Linux + 247)
+#define TARGET_NR_mkdirat			(TARGET_NR_Linux + 248)
+#define TARGET_NR_mknodat			(TARGET_NR_Linux + 249)
+#define TARGET_NR_fchownat			(TARGET_NR_Linux + 250)
+#define TARGET_NR_futimesat			(TARGET_NR_Linux + 251)
+#define TARGET_NR_newfstatat			(TARGET_NR_Linux + 252)
+#define TARGET_NR_unlinkat			(TARGET_NR_Linux + 253)
+#define TARGET_NR_renameat			(TARGET_NR_Linux + 254)
+#define TARGET_NR_linkat			(TARGET_NR_Linux + 255)
+#define TARGET_NR_symlinkat			(TARGET_NR_Linux + 256)
+#define TARGET_NR_readlinkat			(TARGET_NR_Linux + 257)
+#define TARGET_NR_fchmodat			(TARGET_NR_Linux + 258)
+#define TARGET_NR_faccessat			(TARGET_NR_Linux + 259)
+#define TARGET_NR_pselect6			(TARGET_NR_Linux + 260)
+#define TARGET_NR_ppoll			(TARGET_NR_Linux + 261)
+#define TARGET_NR_unshare			(TARGET_NR_Linux + 262)
+#define TARGET_NR_splice			(TARGET_NR_Linux + 263)
+#define TARGET_NR_sync_file_range		(TARGET_NR_Linux + 264)
+#define TARGET_NR_tee			(TARGET_NR_Linux + 265)
+#define TARGET_NR_vmsplice			(TARGET_NR_Linux + 266)
+#define TARGET_NR_move_pages			(TARGET_NR_Linux + 267)
+#define TARGET_NR_set_robust_list		(TARGET_NR_Linux + 268)
+#define TARGET_NR_get_robust_list		(TARGET_NR_Linux + 269)
+#define TARGET_NR_kexec_load			(TARGET_NR_Linux + 270)
+#define TARGET_NR_getcpu			(TARGET_NR_Linux + 271)
+#define TARGET_NR_epoll_pwait		(TARGET_NR_Linux + 272)
+#define TARGET_NR_ioprio_set			(TARGET_NR_Linux + 273)
+#define TARGET_NR_ioprio_get			(TARGET_NR_Linux + 274)
+#define TARGET_NR_utimensat			(TARGET_NR_Linux + 275)
+#define TARGET_NR_signalfd			(TARGET_NR_Linux + 276)
+#define TARGET_NR_timerfd			(TARGET_NR_Linux + 277)
+#define TARGET_NR_eventfd			(TARGET_NR_Linux + 278)
+#define TARGET_NR_fallocate			(TARGET_NR_Linux + 279)
+#define TARGET_NR_timerfd_create		(TARGET_NR_Linux + 280)
+#define TARGET_NR_timerfd_gettime		(TARGET_NR_Linux + 281)
+#define TARGET_NR_timerfd_settime		(TARGET_NR_Linux + 282)
+#define TARGET_NR_signalfd4			(TARGET_NR_Linux + 283)
+#define TARGET_NR_eventfd2			(TARGET_NR_Linux + 284)
+#define TARGET_NR_epoll_create1		(TARGET_NR_Linux + 285)
+#define TARGET_NR_dup3				(TARGET_NR_Linux + 286)
+#define TARGET_NR_pipe2			(TARGET_NR_Linux + 287)
+#define TARGET_NR_inotify_init1		(TARGET_NR_Linux + 288)
+#define TARGET_NR_preadv                        (TARGET_NR_Linux + 289)
+#define TARGET_NR_pwritev                       (TARGET_NR_Linux + 290)
+#define TARGET_NR_rt_tgsigqueueinfo             (TARGET_NR_Linux + 291)
+#define TARGET_NR_perf_event_open               (TARGET_NR_Linux + 292)
+#define TARGET_NR_accept4                       (TARGET_NR_Linux + 293)
+#define TARGET_NR_recvmmsg                      (TARGET_NR_Linux + 294)
+#define TARGET_NR_fanotify_init                 (TARGET_NR_Linux + 295)
+#define TARGET_NR_fanotify_mark                 (TARGET_NR_Linux + 296)
+#define TARGET_NR_prlimit64                     (TARGET_NR_Linux + 297)
+#define TARGET_NR_name_to_handle_at             (TARGET_NR_Linux + 298)
+#define TARGET_NR_open_by_handle_at             (TARGET_NR_Linux + 299)
+#define TARGET_NR_clock_adjtime                 (TARGET_NR_Linux + 300)
+#define TARGET_NR_syncfs                        (TARGET_NR_Linux + 301)
diff --git a/linux-user/mipsn32/syscall.h b/linux-user/mipsn32/syscall.h
deleted file mode 100644
index ebe98f2..0000000
--- a/linux-user/mipsn32/syscall.h
+++ /dev/null
@@ -1,224 +0,0 @@ 
-
-/* this struct defines the way the registers are stored on the
-   stack during a system call. */
-
-struct target_pt_regs {
-	/* Saved main processor registers. */
-	target_ulong regs[32];
-
-	/* Saved special registers. */
-	target_ulong cp0_status;
-	target_ulong lo;
-	target_ulong hi;
-	target_ulong cp0_badvaddr;
-	target_ulong cp0_cause;
-	target_ulong cp0_epc;
-};
-
-/* Target errno definitions taken from asm-mips/errno.h */
-#undef TARGET_ENOMSG
-#define TARGET_ENOMSG          35      /* Identifier removed */
-#undef TARGET_EIDRM
-#define TARGET_EIDRM           36      /* Identifier removed */
-#undef TARGET_ECHRNG
-#define TARGET_ECHRNG          37      /* Channel number out of range */
-#undef TARGET_EL2NSYNC
-#define TARGET_EL2NSYNC        38      /* Level 2 not synchronized */
-#undef TARGET_EL3HLT
-#define TARGET_EL3HLT          39      /* Level 3 halted */
-#undef TARGET_EL3RST
-#define TARGET_EL3RST          40      /* Level 3 reset */
-#undef TARGET_ELNRNG
-#define TARGET_ELNRNG          41      /* Link number out of range */
-#undef TARGET_EUNATCH
-#define TARGET_EUNATCH         42      /* Protocol driver not attached */
-#undef TARGET_ENOCSI
-#define TARGET_ENOCSI          43      /* No CSI structure available */
-#undef TARGET_EL2HLT
-#define TARGET_EL2HLT          44      /* Level 2 halted */
-#undef TARGET_EDEADLK
-#define TARGET_EDEADLK         45      /* Resource deadlock would occur */
-#undef TARGET_ENOLCK
-#define TARGET_ENOLCK          46      /* No record locks available */
-#undef TARGET_EBADE
-#define TARGET_EBADE           50      /* Invalid exchange */
-#undef TARGET_EBADR
-#define TARGET_EBADR           51      /* Invalid request descriptor */
-#undef TARGET_EXFULL
-#define TARGET_EXFULL          52      /* TARGET_Exchange full */
-#undef TARGET_ENOANO
-#define TARGET_ENOANO          53      /* No anode */
-#undef TARGET_EBADRQC
-#define TARGET_EBADRQC         54      /* Invalid request code */
-#undef TARGET_EBADSLT
-#define TARGET_EBADSLT         55      /* Invalid slot */
-#undef TARGET_EDEADLOCK
-#define TARGET_EDEADLOCK       56      /* File locking deadlock error */
-#undef TARGET_EBFONT
-#define TARGET_EBFONT          59      /* Bad font file format */
-#undef TARGET_ENOSTR
-#define TARGET_ENOSTR          60      /* Device not a stream */
-#undef TARGET_ENODATA
-#define TARGET_ENODATA         61      /* No data available */
-#undef TARGET_ETIME
-#define TARGET_ETIME           62      /* Timer expired */
-#undef TARGET_ENOSR
-#define TARGET_ENOSR           63      /* Out of streams resources */
-#undef TARGET_ENONET
-#define TARGET_ENONET          64      /* Machine is not on the network */
-#undef TARGET_ENOPKG
-#define TARGET_ENOPKG          65      /* Package not installed */
-#undef TARGET_EREMOTE
-#define TARGET_EREMOTE         66      /* Object is remote */
-#undef TARGET_ENOLINK
-#define TARGET_ENOLINK         67      /* Link has been severed */
-#undef TARGET_EADV
-#define TARGET_EADV            68      /* Advertise error */
-#undef TARGET_ESRMNT
-#define TARGET_ESRMNT          69      /* Srmount error */
-#undef TARGET_ECOMM
-#define TARGET_ECOMM           70      /* Communication error on send */
-#undef TARGET_EPROTO
-#define TARGET_EPROTO          71      /* Protocol error */
-#undef TARGET_EDOTDOT
-#define TARGET_EDOTDOT         73      /* RFS specific error */
-#undef TARGET_EMULTIHOP
-#define TARGET_EMULTIHOP       74      /* Multihop attempted */
-#undef TARGET_EBADMSG
-#define TARGET_EBADMSG         77      /* Not a data message */
-#undef TARGET_ENAMETOOLONG
-#define TARGET_ENAMETOOLONG    78      /* File name too long */
-#undef TARGET_EOVERFLOW
-#define TARGET_EOVERFLOW       79      /* Value too large for defined data type */
-#undef TARGET_ENOTUNIQ
-#define TARGET_ENOTUNIQ        80      /* Name not unique on network */
-#undef TARGET_EBADFD
-#define TARGET_EBADFD          81      /* File descriptor in bad state */
-#undef TARGET_EREMCHG
-#define TARGET_EREMCHG         82      /* Remote address changed */
-#undef TARGET_ELIBACC
-#define TARGET_ELIBACC         83      /* Can not access a needed shared library */
-#undef TARGET_ELIBBAD
-#define TARGET_ELIBBAD         84      /* Accessing a corrupted shared library */
-#undef TARGET_ELIBSCN
-#define TARGET_ELIBSCN         85      /* .lib section in a.out corrupted */
-#undef TARGET_ELIBMAX
-#define TARGET_ELIBMAX         86      /* Attempting to link in too many shared libraries */
-#undef TARGET_ELIBEXEC
-#define TARGET_ELIBEXEC        87      /* Cannot exec a shared library directly */
-#undef TARGET_EILSEQ
-#define TARGET_EILSEQ          88      /* Illegal byte sequence */
-#undef TARGET_ENOSYS
-#define TARGET_ENOSYS          89      /* Function not implemented */
-#undef TARGET_ELOOP
-#define TARGET_ELOOP           90      /* Too many symbolic links encountered */
-#undef TARGET_ERESTART
-#define TARGET_ERESTART        91      /* Interrupted system call should be restarted */
-#undef TARGET_ESTRPIPE
-#define TARGET_ESTRPIPE        92      /* Streams pipe error */
-#undef TARGET_ENOTEMPTY
-#define TARGET_ENOTEMPTY       93      /* Directory not empty */
-#undef TARGET_EUSERS
-#define TARGET_EUSERS          94      /* Too many users */
-#undef TARGET_ENOTSOCK
-#define TARGET_ENOTSOCK        95      /* Socket operation on non-socket */
-#undef TARGET_EDESTADDRREQ
-#define TARGET_EDESTADDRREQ    96      /* Destination address required */
-#undef TARGET_EMSGSIZE
-#define TARGET_EMSGSIZE        97      /* Message too long */
-#undef TARGET_EPROTOTYPE
-#define TARGET_EPROTOTYPE      98      /* Protocol wrong type for socket */
-#undef TARGET_ENOPROTOOPT
-#define TARGET_ENOPROTOOPT     99      /* Protocol not available */
-#undef TARGET_EPROTONOSUPPORT
-#define TARGET_EPROTONOSUPPORT 120     /* Protocol not supported */
-#undef TARGET_ESOCKTNOSUPPORT
-#define TARGET_ESOCKTNOSUPPORT 121     /* Socket type not supported */
-#undef TARGET_EOPNOTSUPP
-#define TARGET_EOPNOTSUPP      122     /* Operation not supported on transport endpoint */
-#undef TARGET_EPFNOSUPPORT
-#define TARGET_EPFNOSUPPORT    123     /* Protocol family not supported */
-#undef TARGET_EAFNOSUPPORT
-#define TARGET_EAFNOSUPPORT    124     /* Address family not supported by protocol */
-#undef TARGET_EADDRINUSE
-#define TARGET_EADDRINUSE      125     /* Address already in use */
-#undef TARGET_EADDRNOTAVAIL
-#define TARGET_EADDRNOTAVAIL   126     /* Cannot assign requested address */
-#undef TARGET_ENETDOWN
-#define TARGET_ENETDOWN        127     /* Network is down */
-#undef TARGET_ENETUNREACH
-#define TARGET_ENETUNREACH     128     /* Network is unreachable */
-#undef TARGET_ENETRESET
-#define TARGET_ENETRESET       129     /* Network dropped connection because of reset */
-#undef TARGET_ECONNABORTED
-#define TARGET_ECONNABORTED    130     /* Software caused connection abort */
-#undef TARGET_ECONNRESET
-#define TARGET_ECONNRESET      131     /* Connection reset by peer */
-#undef TARGET_ENOBUFS
-#define TARGET_ENOBUFS         132     /* No buffer space available */
-#undef TARGET_EISCONN
-#define TARGET_EISCONN         133     /* Transport endpoint is already connected */
-#undef TARGET_ENOTCONN
-#define TARGET_ENOTCONN        134     /* Transport endpoint is not connected */
-#undef TARGET_EUCLEAN
-#define TARGET_EUCLEAN         135     /* Structure needs cleaning */
-#undef TARGET_ENOTNAM
-#define TARGET_ENOTNAM         137     /* Not a XENIX named type file */
-#undef TARGET_ENAVAIL
-#define TARGET_ENAVAIL         138     /* No XENIX semaphores available */
-#undef TARGET_EISNAM
-#define TARGET_EISNAM          139     /* Is a named type file */
-#undef TARGET_EREMOTEIO
-#define TARGET_EREMOTEIO       140     /* Remote I/O error */
-#undef TARGET_EINIT
-#define TARGET_EINIT           141     /* Reserved */
-#undef TARGET_EREMDEV
-#define TARGET_EREMDEV         142     /* TARGET_Error 142 */
-#undef TARGET_ESHUTDOWN
-#define TARGET_ESHUTDOWN       143     /* Cannot send after transport endpoint shutdown */
-#undef TARGET_ETOOMANYREFS
-#define TARGET_ETOOMANYREFS    144     /* Too many references: cannot splice */
-#undef TARGET_ETIMEDOUT
-#define TARGET_ETIMEDOUT       145     /* Connection timed out */
-#undef TARGET_ECONNREFUSED
-#define TARGET_ECONNREFUSED    146     /* Connection refused */
-#undef TARGET_EHOSTDOWN
-#define TARGET_EHOSTDOWN       147     /* Host is down */
-#undef TARGET_EHOSTUNREACH
-#define TARGET_EHOSTUNREACH    148     /* No route to host */
-#undef TARGET_EALREADY
-#define TARGET_EALREADY        149     /* Operation already in progress */
-#undef TARGET_EINPROGRESS
-#define TARGET_EINPROGRESS     150     /* Operation now in progress */
-#undef TARGET_ESTALE
-#define TARGET_ESTALE          151     /* Stale NFS file handle */
-#undef TARGET_ECANCELED
-#define TARGET_ECANCELED       158     /* AIO operation canceled */
-/*
- * These error are Linux extensions.
- */
-#undef TARGET_ENOMEDIUM
-#define TARGET_ENOMEDIUM       159     /* No medium found */
-#undef TARGET_EMEDIUMTYPE
-#define TARGET_EMEDIUMTYPE     160     /* Wrong medium type */
-#undef TARGET_ENOKEY
-#define TARGET_ENOKEY          161     /* Required key not available */
-#undef TARGET_EKEYEXPIRED
-#define TARGET_EKEYEXPIRED     162     /* Key has expired */
-#undef TARGET_EKEYREVOKED
-#define TARGET_EKEYREVOKED     163     /* Key has been revoked */
-#undef TARGET_EKEYREJECTED
-#define TARGET_EKEYREJECTED    164     /* Key was rejected by service */
-
-/* for robust mutexes */
-#undef TARGET_EOWNERDEAD
-#define TARGET_EOWNERDEAD      165     /* Owner died */
-#undef TARGET_ENOTRECOVERABLE
-#define TARGET_ENOTRECOVERABLE 166     /* State not recoverable */
-
-
-
-/* Nasty hack: define a fake errno value for use by sigreturn. */
-#define TARGET_QEMU_ESIGRETURN 255
-
-#define UNAME_MACHINE "mips64"
diff --git a/linux-user/mipsn32/syscall_nr.h b/linux-user/mipsn32/syscall_nr.h
deleted file mode 100644
index 4e1aca3..0000000
--- a/linux-user/mipsn32/syscall_nr.h
+++ /dev/null
@@ -1,311 +0,0 @@ 
-/*
- * Linux N32 syscalls are in the range from 6000 to 6999.
- */
-#define TARGET_NR_Linux			6000
-#define TARGET_NR_read			(TARGET_NR_Linux +   0)
-#define TARGET_NR_write			(TARGET_NR_Linux +   1)
-#define TARGET_NR_open			(TARGET_NR_Linux +   2)
-#define TARGET_NR_close			(TARGET_NR_Linux +   3)
-#define TARGET_NR_stat			(TARGET_NR_Linux +   4)
-#define TARGET_NR_fstat			(TARGET_NR_Linux +   5)
-#define TARGET_NR_lstat			(TARGET_NR_Linux +   6)
-#define TARGET_NR_poll			(TARGET_NR_Linux +   7)
-#define TARGET_NR_lseek			(TARGET_NR_Linux +   8)
-#define TARGET_NR_mmap			(TARGET_NR_Linux +   9)
-#define TARGET_NR_mprotect			(TARGET_NR_Linux +  10)
-#define TARGET_NR_munmap			(TARGET_NR_Linux +  11)
-#define TARGET_NR_brk			(TARGET_NR_Linux +  12)
-#define TARGET_NR_rt_sigaction		(TARGET_NR_Linux +  13)
-#define TARGET_NR_rt_sigprocmask		(TARGET_NR_Linux +  14)
-#define TARGET_NR_ioctl			(TARGET_NR_Linux +  15)
-#define TARGET_NR_pread64			(TARGET_NR_Linux +  16)
-#define TARGET_NR_pwrite64			(TARGET_NR_Linux +  17)
-#define TARGET_NR_readv			(TARGET_NR_Linux +  18)
-#define TARGET_NR_writev			(TARGET_NR_Linux +  19)
-#define TARGET_NR_access			(TARGET_NR_Linux +  20)
-#define TARGET_NR_pipe			(TARGET_NR_Linux +  21)
-#define TARGET_NR__newselect			(TARGET_NR_Linux +  22)
-#define TARGET_NR_sched_yield		(TARGET_NR_Linux +  23)
-#define TARGET_NR_mremap			(TARGET_NR_Linux +  24)
-#define TARGET_NR_msync			(TARGET_NR_Linux +  25)
-#define TARGET_NR_mincore			(TARGET_NR_Linux +  26)
-#define TARGET_NR_madvise			(TARGET_NR_Linux +  27)
-#define TARGET_NR_shmget			(TARGET_NR_Linux +  28)
-#define TARGET_NR_shmat			(TARGET_NR_Linux +  29)
-#define TARGET_NR_shmctl			(TARGET_NR_Linux +  30)
-#define TARGET_NR_dup			(TARGET_NR_Linux +  31)
-#define TARGET_NR_dup2			(TARGET_NR_Linux +  32)
-#define TARGET_NR_pause			(TARGET_NR_Linux +  33)
-#define TARGET_NR_nanosleep			(TARGET_NR_Linux +  34)
-#define TARGET_NR_getitimer			(TARGET_NR_Linux +  35)
-#define TARGET_NR_setitimer			(TARGET_NR_Linux +  36)
-#define TARGET_NR_alarm			(TARGET_NR_Linux +  37)
-#define TARGET_NR_getpid			(TARGET_NR_Linux +  38)
-#define TARGET_NR_sendfile			(TARGET_NR_Linux +  39)
-#define TARGET_NR_socket			(TARGET_NR_Linux +  40)
-#define TARGET_NR_connect			(TARGET_NR_Linux +  41)
-#define TARGET_NR_accept			(TARGET_NR_Linux +  42)
-#define TARGET_NR_sendto			(TARGET_NR_Linux +  43)
-#define TARGET_NR_recvfrom			(TARGET_NR_Linux +  44)
-#define TARGET_NR_sendmsg			(TARGET_NR_Linux +  45)
-#define TARGET_NR_recvmsg			(TARGET_NR_Linux +  46)
-#define TARGET_NR_shutdown			(TARGET_NR_Linux +  47)
-#define TARGET_NR_bind			(TARGET_NR_Linux +  48)
-#define TARGET_NR_listen			(TARGET_NR_Linux +  49)
-#define TARGET_NR_getsockname		(TARGET_NR_Linux +  50)
-#define TARGET_NR_getpeername		(TARGET_NR_Linux +  51)
-#define TARGET_NR_socketpair			(TARGET_NR_Linux +  52)
-#define TARGET_NR_setsockopt			(TARGET_NR_Linux +  53)
-#define TARGET_NR_getsockopt			(TARGET_NR_Linux +  54)
-#define TARGET_NR_clone			(TARGET_NR_Linux +  55)
-#define TARGET_NR_fork			(TARGET_NR_Linux +  56)
-#define TARGET_NR_execve			(TARGET_NR_Linux +  57)
-#define TARGET_NR_exit			(TARGET_NR_Linux +  58)
-#define TARGET_NR_wait4			(TARGET_NR_Linux +  59)
-#define TARGET_NR_kill			(TARGET_NR_Linux +  60)
-#define TARGET_NR_uname			(TARGET_NR_Linux +  61)
-#define TARGET_NR_semget			(TARGET_NR_Linux +  62)
-#define TARGET_NR_semop			(TARGET_NR_Linux +  63)
-#define TARGET_NR_semctl			(TARGET_NR_Linux +  64)
-#define TARGET_NR_shmdt			(TARGET_NR_Linux +  65)
-#define TARGET_NR_msgget			(TARGET_NR_Linux +  66)
-#define TARGET_NR_msgsnd			(TARGET_NR_Linux +  67)
-#define TARGET_NR_msgrcv			(TARGET_NR_Linux +  68)
-#define TARGET_NR_msgctl			(TARGET_NR_Linux +  69)
-#define TARGET_NR_fcntl			(TARGET_NR_Linux +  70)
-#define TARGET_NR_flock			(TARGET_NR_Linux +  71)
-#define TARGET_NR_fsync			(TARGET_NR_Linux +  72)
-#define TARGET_NR_fdatasync			(TARGET_NR_Linux +  73)
-#define TARGET_NR_truncate			(TARGET_NR_Linux +  74)
-#define TARGET_NR_ftruncate			(TARGET_NR_Linux +  75)
-#define TARGET_NR_getdents			(TARGET_NR_Linux +  76)
-#define TARGET_NR_getcwd			(TARGET_NR_Linux +  77)
-#define TARGET_NR_chdir			(TARGET_NR_Linux +  78)
-#define TARGET_NR_fchdir			(TARGET_NR_Linux +  79)
-#define TARGET_NR_rename			(TARGET_NR_Linux +  80)
-#define TARGET_NR_mkdir			(TARGET_NR_Linux +  81)
-#define TARGET_NR_rmdir			(TARGET_NR_Linux +  82)
-#define TARGET_NR_creat			(TARGET_NR_Linux +  83)
-#define TARGET_NR_link			(TARGET_NR_Linux +  84)
-#define TARGET_NR_unlink			(TARGET_NR_Linux +  85)
-#define TARGET_NR_symlink			(TARGET_NR_Linux +  86)
-#define TARGET_NR_readlink			(TARGET_NR_Linux +  87)
-#define TARGET_NR_chmod			(TARGET_NR_Linux +  88)
-#define TARGET_NR_fchmod			(TARGET_NR_Linux +  89)
-#define TARGET_NR_chown			(TARGET_NR_Linux +  90)
-#define TARGET_NR_fchown			(TARGET_NR_Linux +  91)
-#define TARGET_NR_lchown			(TARGET_NR_Linux +  92)
-#define TARGET_NR_umask			(TARGET_NR_Linux +  93)
-#define TARGET_NR_gettimeofday		(TARGET_NR_Linux +  94)
-#define TARGET_NR_getrlimit			(TARGET_NR_Linux +  95)
-#define TARGET_NR_getrusage			(TARGET_NR_Linux +  96)
-#define TARGET_NR_sysinfo			(TARGET_NR_Linux +  97)
-#define TARGET_NR_times			(TARGET_NR_Linux +  98)
-#define TARGET_NR_ptrace			(TARGET_NR_Linux +  99)
-#define TARGET_NR_getuid			(TARGET_NR_Linux + 100)
-#define TARGET_NR_syslog			(TARGET_NR_Linux + 101)
-#define TARGET_NR_getgid			(TARGET_NR_Linux + 102)
-#define TARGET_NR_setuid			(TARGET_NR_Linux + 103)
-#define TARGET_NR_setgid			(TARGET_NR_Linux + 104)
-#define TARGET_NR_geteuid			(TARGET_NR_Linux + 105)
-#define TARGET_NR_getegid			(TARGET_NR_Linux + 106)
-#define TARGET_NR_setpgid			(TARGET_NR_Linux + 107)
-#define TARGET_NR_getppid			(TARGET_NR_Linux + 108)
-#define TARGET_NR_getpgrp			(TARGET_NR_Linux + 109)
-#define TARGET_NR_setsid			(TARGET_NR_Linux + 110)
-#define TARGET_NR_setreuid			(TARGET_NR_Linux + 111)
-#define TARGET_NR_setregid			(TARGET_NR_Linux + 112)
-#define TARGET_NR_getgroups			(TARGET_NR_Linux + 113)
-#define TARGET_NR_setgroups			(TARGET_NR_Linux + 114)
-#define TARGET_NR_setresuid			(TARGET_NR_Linux + 115)
-#define TARGET_NR_getresuid			(TARGET_NR_Linux + 116)
-#define TARGET_NR_setresgid			(TARGET_NR_Linux + 117)
-#define TARGET_NR_getresgid			(TARGET_NR_Linux + 118)
-#define TARGET_NR_getpgid			(TARGET_NR_Linux + 119)
-#define TARGET_NR_setfsuid			(TARGET_NR_Linux + 120)
-#define TARGET_NR_setfsgid			(TARGET_NR_Linux + 121)
-#define TARGET_NR_getsid			(TARGET_NR_Linux + 122)
-#define TARGET_NR_capget			(TARGET_NR_Linux + 123)
-#define TARGET_NR_capset			(TARGET_NR_Linux + 124)
-#define TARGET_NR_rt_sigpending		(TARGET_NR_Linux + 125)
-#define TARGET_NR_rt_sigtimedwait		(TARGET_NR_Linux + 126)
-#define TARGET_NR_rt_sigqueueinfo		(TARGET_NR_Linux + 127)
-#define TARGET_NR_rt_sigsuspend		(TARGET_NR_Linux + 128)
-#define TARGET_NR_sigaltstack		(TARGET_NR_Linux + 129)
-#define TARGET_NR_utime			(TARGET_NR_Linux + 130)
-#define TARGET_NR_mknod			(TARGET_NR_Linux + 131)
-#define TARGET_NR_personality		(TARGET_NR_Linux + 132)
-#define TARGET_NR_ustat			(TARGET_NR_Linux + 133)
-#define TARGET_NR_statfs			(TARGET_NR_Linux + 134)
-#define TARGET_NR_fstatfs			(TARGET_NR_Linux + 135)
-#define TARGET_NR_sysfs			(TARGET_NR_Linux + 136)
-#define TARGET_NR_getpriority		(TARGET_NR_Linux + 137)
-#define TARGET_NR_setpriority		(TARGET_NR_Linux + 138)
-#define TARGET_NR_sched_setparam		(TARGET_NR_Linux + 139)
-#define TARGET_NR_sched_getparam		(TARGET_NR_Linux + 140)
-#define TARGET_NR_sched_setscheduler		(TARGET_NR_Linux + 141)
-#define TARGET_NR_sched_getscheduler		(TARGET_NR_Linux + 142)
-#define TARGET_NR_sched_get_priority_max	(TARGET_NR_Linux + 143)
-#define TARGET_NR_sched_get_priority_min	(TARGET_NR_Linux + 144)
-#define TARGET_NR_sched_rr_get_interval	(TARGET_NR_Linux + 145)
-#define TARGET_NR_mlock			(TARGET_NR_Linux + 146)
-#define TARGET_NR_munlock			(TARGET_NR_Linux + 147)
-#define TARGET_NR_mlockall			(TARGET_NR_Linux + 148)
-#define TARGET_NR_munlockall			(TARGET_NR_Linux + 149)
-#define TARGET_NR_vhangup			(TARGET_NR_Linux + 150)
-#define TARGET_NR_pivot_root			(TARGET_NR_Linux + 151)
-#define TARGET_NR__sysctl			(TARGET_NR_Linux + 152)
-#define TARGET_NR_prctl			(TARGET_NR_Linux + 153)
-#define TARGET_NR_adjtimex			(TARGET_NR_Linux + 154)
-#define TARGET_NR_setrlimit			(TARGET_NR_Linux + 155)
-#define TARGET_NR_chroot			(TARGET_NR_Linux + 156)
-#define TARGET_NR_sync			(TARGET_NR_Linux + 157)
-#define TARGET_NR_acct			(TARGET_NR_Linux + 158)
-#define TARGET_NR_settimeofday		(TARGET_NR_Linux + 159)
-#define TARGET_NR_mount			(TARGET_NR_Linux + 160)
-#define TARGET_NR_umount2			(TARGET_NR_Linux + 161)
-#define TARGET_NR_swapon			(TARGET_NR_Linux + 162)
-#define TARGET_NR_swapoff			(TARGET_NR_Linux + 163)
-#define TARGET_NR_reboot			(TARGET_NR_Linux + 164)
-#define TARGET_NR_sethostname		(TARGET_NR_Linux + 165)
-#define TARGET_NR_setdomainname		(TARGET_NR_Linux + 166)
-#define TARGET_NR_create_module		(TARGET_NR_Linux + 167)
-#define TARGET_NR_init_module		(TARGET_NR_Linux + 168)
-#define TARGET_NR_delete_module		(TARGET_NR_Linux + 169)
-#define TARGET_NR_get_kernel_syms		(TARGET_NR_Linux + 170)
-#define TARGET_NR_query_module		(TARGET_NR_Linux + 171)
-#define TARGET_NR_quotactl			(TARGET_NR_Linux + 172)
-#define TARGET_NR_nfsservctl			(TARGET_NR_Linux + 173)
-#define TARGET_NR_getpmsg			(TARGET_NR_Linux + 174)
-#define TARGET_NR_putpmsg			(TARGET_NR_Linux + 175)
-#define TARGET_NR_afs_syscall		(TARGET_NR_Linux + 176)
-#define TARGET_NR_reserved177		(TARGET_NR_Linux + 177)
-#define TARGET_NR_gettid			(TARGET_NR_Linux + 178)
-#define TARGET_NR_readahead			(TARGET_NR_Linux + 179)
-#define TARGET_NR_setxattr			(TARGET_NR_Linux + 180)
-#define TARGET_NR_lsetxattr			(TARGET_NR_Linux + 181)
-#define TARGET_NR_fsetxattr			(TARGET_NR_Linux + 182)
-#define TARGET_NR_getxattr			(TARGET_NR_Linux + 183)
-#define TARGET_NR_lgetxattr			(TARGET_NR_Linux + 184)
-#define TARGET_NR_fgetxattr			(TARGET_NR_Linux + 185)
-#define TARGET_NR_listxattr			(TARGET_NR_Linux + 186)
-#define TARGET_NR_llistxattr			(TARGET_NR_Linux + 187)
-#define TARGET_NR_flistxattr			(TARGET_NR_Linux + 188)
-#define TARGET_NR_removexattr		(TARGET_NR_Linux + 189)
-#define TARGET_NR_lremovexattr		(TARGET_NR_Linux + 190)
-#define TARGET_NR_fremovexattr		(TARGET_NR_Linux + 191)
-#define TARGET_NR_tkill			(TARGET_NR_Linux + 192)
-#define TARGET_NR_reserved193		(TARGET_NR_Linux + 193)
-#define TARGET_NR_futex			(TARGET_NR_Linux + 194)
-#define TARGET_NR_sched_setaffinity		(TARGET_NR_Linux + 195)
-#define TARGET_NR_sched_getaffinity		(TARGET_NR_Linux + 196)
-#define TARGET_NR_cacheflush			(TARGET_NR_Linux + 197)
-#define TARGET_NR_cachectl			(TARGET_NR_Linux + 198)
-#define TARGET_NR_sysmips			(TARGET_NR_Linux + 199)
-#define TARGET_NR_io_setup			(TARGET_NR_Linux + 200)
-#define TARGET_NR_io_destroy			(TARGET_NR_Linux + 201)
-#define TARGET_NR_io_getevents		(TARGET_NR_Linux + 202)
-#define TARGET_NR_io_submit			(TARGET_NR_Linux + 203)
-#define TARGET_NR_io_cancel			(TARGET_NR_Linux + 204)
-#define TARGET_NR_exit_group			(TARGET_NR_Linux + 205)
-#define TARGET_NR_lookup_dcookie		(TARGET_NR_Linux + 206)
-#define TARGET_NR_epoll_create		(TARGET_NR_Linux + 207)
-#define TARGET_NR_epoll_ctl			(TARGET_NR_Linux + 208)
-#define TARGET_NR_epoll_wait			(TARGET_NR_Linux + 209)
-#define TARGET_NR_remap_file_pages		(TARGET_NR_Linux + 210)
-#define TARGET_NR_rt_sigreturn		(TARGET_NR_Linux + 211)
-#define TARGET_NR_fcntl64			(TARGET_NR_Linux + 212)
-#define TARGET_NR_set_tid_address		(TARGET_NR_Linux + 213)
-#define TARGET_NR_restart_syscall		(TARGET_NR_Linux + 214)
-#define TARGET_NR_semtimedop			(TARGET_NR_Linux + 215)
-#define TARGET_NR_fadvise64			(TARGET_NR_Linux + 216)
-#define TARGET_NR_statfs64			(TARGET_NR_Linux + 217)
-#define TARGET_NR_fstatfs64			(TARGET_NR_Linux + 218)
-#define TARGET_NR_sendfile64			(TARGET_NR_Linux + 219)
-#define TARGET_NR_timer_create		(TARGET_NR_Linux + 220)
-#define TARGET_NR_timer_settime		(TARGET_NR_Linux + 221)
-#define TARGET_NR_timer_gettime		(TARGET_NR_Linux + 222)
-#define TARGET_NR_timer_getoverrun		(TARGET_NR_Linux + 223)
-#define TARGET_NR_timer_delete		(TARGET_NR_Linux + 224)
-#define TARGET_NR_clock_settime		(TARGET_NR_Linux + 225)
-#define TARGET_NR_clock_gettime		(TARGET_NR_Linux + 226)
-#define TARGET_NR_clock_getres		(TARGET_NR_Linux + 227)
-#define TARGET_NR_clock_nanosleep		(TARGET_NR_Linux + 228)
-#define TARGET_NR_tgkill			(TARGET_NR_Linux + 229)
-#define TARGET_NR_utimes			(TARGET_NR_Linux + 230)
-#define TARGET_NR_mbind			(TARGET_NR_Linux + 231)
-#define TARGET_NR_get_mempolicy		(TARGET_NR_Linux + 232)
-#define TARGET_NR_set_mempolicy		(TARGET_NR_Linux + 233)
-#define TARGET_NR_mq_open			(TARGET_NR_Linux + 234)
-#define TARGET_NR_mq_unlink			(TARGET_NR_Linux + 235)
-#define TARGET_NR_mq_timedsend		(TARGET_NR_Linux + 236)
-#define TARGET_NR_mq_timedreceive		(TARGET_NR_Linux + 237)
-#define TARGET_NR_mq_notify			(TARGET_NR_Linux + 238)
-#define TARGET_NR_mq_getsetattr		(TARGET_NR_Linux + 239)
-#define TARGET_NR_vserver			(TARGET_NR_Linux + 240)
-#define TARGET_NR_waitid			(TARGET_NR_Linux + 241)
-/* #define TARGET_NR_sys_setaltroot		(TARGET_NR_Linux + 242) */
-#define TARGET_NR_add_key			(TARGET_NR_Linux + 243)
-#define TARGET_NR_request_key		(TARGET_NR_Linux + 244)
-#define TARGET_NR_keyctl			(TARGET_NR_Linux + 245)
-#define TARGET_NR_set_thread_area		(TARGET_NR_Linux + 246)
-#define TARGET_NR_inotify_init		(TARGET_NR_Linux + 247)
-#define TARGET_NR_inotify_add_watch		(TARGET_NR_Linux + 248)
-#define TARGET_NR_inotify_rm_watch		(TARGET_NR_Linux + 249)
-#define TARGET_NR_migrate_pages		(TARGET_NR_Linux + 250)
-#define TARGET_NR_openat			(TARGET_NR_Linux + 251)
-#define TARGET_NR_mkdirat			(TARGET_NR_Linux + 252)
-#define TARGET_NR_mknodat			(TARGET_NR_Linux + 253)
-#define TARGET_NR_fchownat			(TARGET_NR_Linux + 254)
-#define TARGET_NR_futimesat			(TARGET_NR_Linux + 255)
-#define TARGET_NR_newfstatat			(TARGET_NR_Linux + 256)
-#define TARGET_NR_unlinkat			(TARGET_NR_Linux + 257)
-#define TARGET_NR_renameat			(TARGET_NR_Linux + 258)
-#define TARGET_NR_linkat			(TARGET_NR_Linux + 259)
-#define TARGET_NR_symlinkat			(TARGET_NR_Linux + 260)
-#define TARGET_NR_readlinkat			(TARGET_NR_Linux + 261)
-#define TARGET_NR_fchmodat			(TARGET_NR_Linux + 262)
-#define TARGET_NR_faccessat			(TARGET_NR_Linux + 263)
-#define TARGET_NR_pselect6			(TARGET_NR_Linux + 264)
-#define TARGET_NR_ppoll			(TARGET_NR_Linux + 265)
-#define TARGET_NR_unshare			(TARGET_NR_Linux + 266)
-#define TARGET_NR_splice			(TARGET_NR_Linux + 267)
-#define TARGET_NR_sync_file_range		(TARGET_NR_Linux + 268)
-#define TARGET_NR_tee			(TARGET_NR_Linux + 269)
-#define TARGET_NR_vmsplice			(TARGET_NR_Linux + 270)
-#define TARGET_NR_move_pages			(TARGET_NR_Linux + 271)
-#define TARGET_NR_set_robust_list		(TARGET_NR_Linux + 272)
-#define TARGET_NR_get_robust_list		(TARGET_NR_Linux + 273)
-#define TARGET_NR_kexec_load			(TARGET_NR_Linux + 274)
-#define TARGET_NR_getcpu			(TARGET_NR_Linux + 275)
-#define TARGET_NR_epoll_pwait		(TARGET_NR_Linux + 276)
-#define TARGET_NR_ioprio_set			(TARGET_NR_Linux + 277)
-#define TARGET_NR_ioprio_get			(TARGET_NR_Linux + 278)
-#define TARGET_NR_utimensat			(TARGET_NR_Linux + 279)
-#define TARGET_NR_signalfd			(TARGET_NR_Linux + 280)
-#define TARGET_NR_timerfd			(TARGET_NR_Linux + 281)
-#define TARGET_NR_eventfd			(TARGET_NR_Linux + 282)
-#define TARGET_NR_fallocate			(TARGET_NR_Linux + 283)
-#define TARGET_NR_timerfd_create		(TARGET_NR_Linux + 284)
-#define TARGET_NR_timerfd_gettime		(TARGET_NR_Linux + 285)
-#define TARGET_NR_timerfd_settime		(TARGET_NR_Linux + 286)
-#define TARGET_NR_signalfd4			(TARGET_NR_Linux + 287)
-#define TARGET_NR_eventfd2			(TARGET_NR_Linux + 288)
-#define TARGET_NR_epoll_create1		(TARGET_NR_Linux + 289)
-#define TARGET_NR_dup3				(TARGET_NR_Linux + 290)
-#define TARGET_NR_pipe2			(TARGET_NR_Linux + 291)
-#define TARGET_NR_inotify_init1		(TARGET_NR_Linux + 292)
-#define TARGET_NR_preadv                        (TARGET_NR_Linux + 293)
-#define TARGET_NR_pwritev                       (TARGET_NR_Linux + 294)
-#define TARGET_NR_rt_tgsigqueueinfo             (TARGET_NR_Linux + 295)
-#define TARGET_NR_perf_event_open               (TARGET_NR_Linux + 296)
-#define TARGET_NR_accept4                       (TARGET_NR_Linux + 297)
-#define TARGET_NR_recvmmsg                      (TARGET_NR_Linux + 298)
-#define TARGET_NR_getdents64                    (TARGET_NR_Linux + 299)
-#define TARGET_NR_fanotify_init                 (TARGET_NR_Linux + 300)
-#define TARGET_NR_fanotify_mark                 (TARGET_NR_Linux + 301)
-#define TARGET_NR_prlimit64                     (TARGET_NR_Linux + 302)
-#define TARGET_NR_name_to_handle_at             (TARGET_NR_Linux + 303)
-#define TARGET_NR_open_by_handle_at             (TARGET_NR_Linux + 304)
-#define TARGET_NR_clock_adjtime                 (TARGET_NR_Linux + 305)
-#define TARGET_NR_syncfs                        (TARGET_NR_Linux + 306)
diff --git a/linux-user/mipsn32/target_signal.h b/linux-user/mipsn32/target_signal.h
deleted file mode 100644
index ff20d9e..0000000
--- a/linux-user/mipsn32/target_signal.h
+++ /dev/null
@@ -1,29 +0,0 @@ 
-#ifndef TARGET_SIGNAL_H
-#define TARGET_SIGNAL_H
-
-#include "cpu.h"
-
-/* this struct defines a stack used during syscall handling */
-
-typedef struct target_sigaltstack {
-	int32_t ss_sp;
-	uint32_t ss_size;
-	int32_t ss_flags;
-} target_stack_t;
-
-
-/*
- * sigaltstack controls
- */
-#define TARGET_SS_ONSTACK     1
-#define TARGET_SS_DISABLE     2
-
-#define TARGET_MINSIGSTKSZ    2048
-#define TARGET_SIGSTKSZ       8192
-
-static inline target_ulong get_sp_from_cpustate(CPUMIPSState *state)
-{
-    return state->active_tc.gpr[29];
-}
-
-#endif /* TARGET_SIGNAL_H */
diff --git a/linux-user/mipsn32/termbits.h b/linux-user/mipsn32/termbits.h
deleted file mode 100644
index d3a6cf8..0000000
--- a/linux-user/mipsn32/termbits.h
+++ /dev/null
@@ -1,245 +0,0 @@ 
-/* from asm/termbits.h */
-
-#define TARGET_NCCS 23
-
-struct target_termios {
-    unsigned int c_iflag;               /* input mode flags */
-    unsigned int c_oflag;               /* output mode flags */
-    unsigned int c_cflag;               /* control mode flags */
-    unsigned int c_lflag;               /* local mode flags */
-    unsigned char c_line;                    /* line discipline */
-    unsigned char c_cc[TARGET_NCCS];                /* control characters */
-};
-
-/* c_iflag bits */
-#define TARGET_IGNBRK  0000001
-#define TARGET_BRKINT  0000002
-#define TARGET_IGNPAR  0000004
-#define TARGET_PARMRK  0000010
-#define TARGET_INPCK   0000020
-#define TARGET_ISTRIP  0000040
-#define TARGET_INLCR   0000100
-#define TARGET_IGNCR   0000200
-#define TARGET_ICRNL   0000400
-#define TARGET_IUCLC   0001000
-#define TARGET_IXON    0002000
-#define TARGET_IXANY   0004000
-#define TARGET_IXOFF   0010000
-#define TARGET_IMAXBEL 0020000
-#define TARGET_IUTF8   0040000
-
-/* c_oflag bits */
-#define TARGET_OPOST   0000001
-#define TARGET_OLCUC   0000002
-#define TARGET_ONLCR   0000004
-#define TARGET_OCRNL   0000010
-#define TARGET_ONOCR   0000020
-#define TARGET_ONLRET  0000040
-#define TARGET_OFILL   0000100
-#define TARGET_OFDEL   0000200
-#define TARGET_NLDLY   0000400
-#define   TARGET_NL0   0000000
-#define   TARGET_NL1   0000400
-#define TARGET_CRDLY   0003000
-#define   TARGET_CR0   0000000
-#define   TARGET_CR1   0001000
-#define   TARGET_CR2   0002000
-#define   TARGET_CR3   0003000
-#define TARGET_TABDLY  0014000
-#define   TARGET_TAB0  0000000
-#define   TARGET_TAB1  0004000
-#define   TARGET_TAB2  0010000
-#define   TARGET_TAB3  0014000
-#define   TARGET_XTABS 0014000
-#define TARGET_BSDLY   0020000
-#define   TARGET_BS0   0000000
-#define   TARGET_BS1   0020000
-#define TARGET_VTDLY   0040000
-#define   TARGET_VT0   0000000
-#define   TARGET_VT1   0040000
-#define TARGET_FFDLY   0100000
-#define   TARGET_FF0   0000000
-#define   TARGET_FF1   0100000
-
-/* c_cflag bit meaning */
-#define TARGET_CBAUD   0010017
-#define  TARGET_B0     0000000         /* hang up */
-#define  TARGET_B50    0000001
-#define  TARGET_B75    0000002
-#define  TARGET_B110   0000003
-#define  TARGET_B134   0000004
-#define  TARGET_B150   0000005
-#define  TARGET_B200   0000006
-#define  TARGET_B300   0000007
-#define  TARGET_B600   0000010
-#define  TARGET_B1200  0000011
-#define  TARGET_B1800  0000012
-#define  TARGET_B2400  0000013
-#define  TARGET_B4800  0000014
-#define  TARGET_B9600  0000015
-#define  TARGET_B19200 0000016
-#define  TARGET_B38400 0000017
-#define TARGET_EXTA B19200
-#define TARGET_EXTB B38400
-#define TARGET_CSIZE   0000060
-#define   TARGET_CS5   0000000
-#define   TARGET_CS6   0000020
-#define   TARGET_CS7   0000040
-#define   TARGET_CS8   0000060
-#define TARGET_CSTOPB  0000100
-#define TARGET_CREAD   0000200
-#define TARGET_PARENB  0000400
-#define TARGET_PARODD  0001000
-#define TARGET_HUPCL   0002000
-#define TARGET_CLOCAL  0004000
-#define TARGET_CBAUDEX 0010000
-#define  TARGET_BOTHER   0010000
-#define  TARGET_B57600   0010001
-#define  TARGET_B115200  0010002
-#define  TARGET_B230400  0010003
-#define  TARGET_B460800  0010004
-#define  TARGET_B500000  0010005
-#define  TARGET_B576000  0010006
-#define  TARGET_B921600  0010007
-#define  TARGET_B1000000 0010010
-#define  TARGET_B1152000 0010011
-#define  TARGET_B1500000 0010012
-#define  TARGET_B2000000 0010013
-#define  TARGET_B2500000 0010014
-#define  TARGET_B3000000 0010015
-#define  TARGET_B3500000 0010016
-#define  TARGET_B4000000 0010017
-#define TARGET_CIBAUD    002003600000  /* input baud rate (not used) */
-#define TARGET_CMSPAR    010000000000  /* mark or space (stick) parity */
-#define TARGET_CRTSCTS   020000000000  /* flow control */
-
-/* c_lflag bits */
-#define TARGET_ISIG    0000001
-#define TARGET_ICANON  0000002
-#define TARGET_XCASE   0000004
-#define TARGET_ECHO    0000010
-#define TARGET_ECHOE   0000020
-#define TARGET_ECHOK   0000040
-#define TARGET_ECHONL  0000100
-#define TARGET_NOFLSH  0000200
-#define TARGET_IEXTEN  0000400
-#define TARGET_ECHOCTL 0001000
-#define TARGET_ECHOPRT 0002000
-#define TARGET_ECHOKE  0004000
-#define TARGET_FLUSHO  0010000
-#define TARGET_PENDIN  0040000
-#define TARGET_TOSTOP  0100000
-#define TARGET_ITOSTOP TARGET_TOSTOP
-
-/* c_cc character offsets */
-#define TARGET_VINTR	0
-#define TARGET_VQUIT	1
-#define TARGET_VERASE	2
-#define TARGET_VKILL	3
-#define TARGET_VMIN	4
-#define TARGET_VTIME	5
-#define TARGET_VEOL2	6
-#define TARGET_VSWTC	7
-#define TARGET_VSTART	8
-#define TARGET_VSTOP	9
-#define TARGET_VSUSP	10
-/* VDSUSP not supported */
-#define TARGET_VREPRINT	12
-#define TARGET_VDISCARD	13
-#define TARGET_VWERASE	14
-#define TARGET_VLNEXT	15
-#define TARGET_VEOF	16
-#define TARGET_VEOL	17
-
-/* ioctls */
-
-#define TARGET_TCGETA		0x5401
-#define TARGET_TCSETA		0x5402	/* Clashes with SNDCTL_TMR_START sound ioctl */
-#define TARGET_TCSETAW		0x5403
-#define TARGET_TCSETAF		0x5404
-
-#define TARGET_TCSBRK		0x5405
-#define TARGET_TCXONC		0x5406
-#define TARGET_TCFLSH		0x5407
-
-#define TARGET_TCGETS		0x540d
-#define TARGET_TCSETS		0x540e
-#define TARGET_TCSETSW		0x540f
-#define TARGET_TCSETSF		0x5410
-
-#define TARGET_TIOCEXCL	0x740d		/* set exclusive use of tty */
-#define TARGET_TIOCNXCL	0x740e		/* reset exclusive use of tty */
-#define TARGET_TIOCOUTQ	0x7472		/* output queue size */
-#define TARGET_TIOCSTI	0x5472		/* simulate terminal input */
-#define TARGET_TIOCMGET	0x741d		/* get all modem bits */
-#define TARGET_TIOCMBIS	0x741b		/* bis modem bits */
-#define TARGET_TIOCMBIC	0x741c		/* bic modem bits */
-#define TARGET_TIOCMSET	0x741a		/* set all modem bits */
-#define TARGET_TIOCPKT		0x5470		/* pty: set/clear packet mode */
-#define	 TARGET_TIOCPKT_DATA		0x00	/* data packet */
-#define	 TARGET_TIOCPKT_FLUSHREAD	0x01	/* flush packet */
-#define	 TARGET_TIOCPKT_FLUSHWRITE	0x02	/* flush packet */
-#define	 TARGET_TIOCPKT_STOP		0x04	/* stop output */
-#define	 TARGET_TIOCPKT_START		0x08	/* start output */
-#define	 TARGET_TIOCPKT_NOSTOP		0x10	/* no more ^S, ^Q */
-#define	 TARGET_TIOCPKT_DOSTOP		0x20	/* now do ^S ^Q */
-/* #define  TIOCPKT_IOCTL		0x40	state change of pty driver */
-#define TARGET_TIOCSWINSZ	TARGET_IOW('t', 103, struct winsize)	/* set window size */
-#define TARGET_TIOCGWINSZ	TARGET_IOR('t', 104, struct winsize)	/* get window size */
-#define TARGET_TIOCNOTTY	0x5471		/* void tty association */
-#define TARGET_TIOCSETD	0x7401
-#define TARGET_TIOCGETD	0x7400
-
-#define TARGET_FIOCLEX		0x6601
-#define TARGET_FIONCLEX	0x6602
-#define TARGET_FIOASYNC	0x667d
-#define TARGET_FIONBIO		0x667e
-#define TARGET_FIOQSIZE	0x667f
-
-#define TARGET_TIOCGLTC	0x7474			/* get special local chars */
-#define TARGET_TIOCSLTC	0x7475			/* set special local chars */
-#define TARGET_TIOCSPGRP	TARGET_IOW('t', 118, int)	/* set pgrp of tty */
-#define TARGET_TIOCGPGRP	TARGET_IOR('t', 119, int)	/* get pgrp of tty */
-#define TARGET_TIOCCONS	TARGET_IOW('t', 120, int)	/* become virtual console */
-
-#define TARGET_FIONREAD	0x467f
-#define TARGET_TIOCINQ		TARGET_FIONREAD
-
-#define TARGET_TIOCGETP        0x7408
-#define TARGET_TIOCSETP        0x7409
-#define TARGET_TIOCSETN        0x740a			/* TIOCSETP wo flush */
-
-/* #define TARGET_TIOCSETA	TARGET_IOW('t', 20, struct termios) set termios struct */
-/* #define TARGET_TIOCSETAW	TARGET_IOW('t', 21, struct termios) drain output, set */
-/* #define TARGET_TIOCSETAF	TARGET_IOW('t', 22, struct termios) drn out, fls in, set */
-/* #define TARGET_TIOCGETD	TARGET_IOR('t', 26, int)	get line discipline */
-/* #define TARGET_TIOCSETD	TARGET_IOW('t', 27, int)	set line discipline */
-						/* 127-124 compat */
-
-#define TARGET_TIOCSBRK	0x5427  /* BSD compatibility */
-#define TARGET_TIOCCBRK	0x5428  /* BSD compatibility */
-#define TARGET_TIOCGSID	0x7416  /* Return the session ID of FD */
-#define TARGET_TIOCGPTN	TARGET_IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
-#define TARGET_TIOCSPTLCK	TARGET_IOW('T',0x31, int)  /* Lock/unlock Pty */
-
-/* I hope the range from 0x5480 on is free ... */
-#define TARGET_TIOCSCTTY	0x5480		/* become controlling tty */
-#define TARGET_TIOCGSOFTCAR	0x5481
-#define TARGET_TIOCSSOFTCAR	0x5482
-#define TARGET_TIOCLINUX	0x5483
-#define TARGET_TIOCGSERIAL	0x5484
-#define TARGET_TIOCSSERIAL	0x5485
-#define TARGET_TCSBRKP		0x5486	/* Needed for POSIX tcsendbreak() */
-#define TARGET_TIOCSERCONFIG	0x5488
-#define TARGET_TIOCSERGWILD	0x5489
-#define TARGET_TIOCSERSWILD	0x548a
-#define TARGET_TIOCGLCKTRMIOS	0x548b
-#define TARGET_TIOCSLCKTRMIOS	0x548c
-#define TARGET_TIOCSERGSTRUCT	0x548d /* For debugging only */
-#define TARGET_TIOCSERGETLSR   0x548e /* Get line status register */
-#define TARGET_TIOCSERGETMULTI 0x548f /* Get multiport config  */
-#define TARGET_TIOCSERSETMULTI 0x5490 /* Set multiport config */
-#define TARGET_TIOCMIWAIT      0x5491 /* wait for a change on serial input line(s) */
-#define TARGET_TIOCGICOUNT     0x5492 /* read serial port inline interrupt counts */
-#define TARGET_TIOCGHAYESESP	0x5493 /* Get Hayes ESP configuration */
-#define TARGET_TIOCSHAYESESP	0x5494 /* Set Hayes ESP configuration */
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 41f0ff8..3e90884 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -1435,14 +1435,14 @@  struct target_stat64 {
 	unsigned long long	st_ino;
 } QEMU_PACKED;
 
-#elif defined(TARGET_ABI_MIPSN64)
+#elif defined(TARGET_MIPS64)
 
 /* The memory layout is the same as of struct stat64 of the 32-bit kernel.  */
 struct target_stat {
 	unsigned int		st_dev;
 	unsigned int		st_pad0[3]; /* Reserved for st_dev expansion */
 
-	abi_ulong		st_ino;
+	target_ulong		st_ino;
 
 	unsigned int		st_mode;
 	unsigned int		st_nlink;
@@ -1453,7 +1453,7 @@  struct target_stat {
 	unsigned int		st_rdev;
 	unsigned int		st_pad1[3]; /* Reserved for st_rdev expansion */
 
-	abi_ulong		st_size;
+	target_long		st_size;
 
 	/*
 	 * Actually this should be timestruc_t st_atime, st_mtime and st_ctime
@@ -1471,78 +1471,7 @@  struct target_stat {
 	unsigned int		st_blksize;
 	unsigned int		st_pad2;
 
-	abi_ulong		st_blocks;
-};
-
-#elif defined(TARGET_ABI_MIPSN32)
-
-struct target_stat {
-	unsigned	st_dev;
-	int		st_pad1[3];		/* Reserved for network id */
-	unsigned int	st_ino;
-	unsigned int	st_mode;
-	unsigned int	st_nlink;
-	int		st_uid;
-	int		st_gid;
-	unsigned 	st_rdev;
-	unsigned int	st_pad2[2];
-	unsigned int	st_size;
-	unsigned int	st_pad3;
-	/*
-	 * Actually this should be timestruc_t st_atime, st_mtime and st_ctime
-	 * but we don't have it under Linux.
-	 */
-	unsigned int		target_st_atime;
-	unsigned int		target_st_atime_nsec;
-	unsigned int		target_st_mtime;
-	unsigned int		target_st_mtime_nsec;
-	unsigned int		target_st_ctime;
-	unsigned int		target_st_ctime_nsec;
-	unsigned int		st_blksize;
-	unsigned int		st_blocks;
-	unsigned int		st_pad4[14];
-};
-
-/*
- * This matches struct stat64 in glibc2.1, hence the absolutely insane
- * amounts of padding around dev_t's.  The memory layout is the same as of
- * struct stat of the 64-bit kernel.
- */
-
-struct target_stat64 {
-	unsigned int	st_dev;
-	unsigned int	st_pad0[3];	/* Reserved for st_dev expansion  */
-
-	target_ulong	st_ino;
-
-        unsigned int	st_mode;
-        unsigned int	st_nlink;
-
-	int		st_uid;
-	int		st_gid;
-
-	unsigned int	st_rdev;
-	unsigned int	st_pad1[3];	/* Reserved for st_rdev expansion  */
-
-	int		st_size;
-
-	/*
-	 * Actually this should be timestruc_t st_atime, st_mtime and st_ctime
-	 * but we don't have it under Linux.
-	 */
-	int		target_st_atime;
-	unsigned int	target_st_atime_nsec;	/* Reserved for st_atime expansion  */
-
-	int		target_st_mtime;
-	unsigned int	target_st_mtime_nsec;	/* Reserved for st_mtime expansion  */
-
-	int		target_st_ctime;
-	unsigned int	target_st_ctime_nsec;	/* Reserved for st_ctime expansion  */
-
-	unsigned int	st_blksize;
-	unsigned int	st_pad2;
-
-	int		st_blocks;
+	target_ulong		st_blocks;
 };
 
 #elif defined(TARGET_ABI_MIPSO32)