diff --git a/linux-user/mips/syscall_nr.h b/linux-user/mips/syscall_nr.h
index e635aa2..3593e65 100644
--- a/linux-user/mips/syscall_nr.h
+++ b/linux-user/mips/syscall_nr.h
@@ -18,15 +18,15 @@
 #define TARGET_NR_time			(TARGET_NR_Linux +  13)
 #define TARGET_NR_mknod			(TARGET_NR_Linux +  14)
 #define TARGET_NR_chmod			(TARGET_NR_Linux +  15)
-#define TARGET_NR_lchown			(TARGET_NR_Linux +  16)
+#define TARGET_NR_lchown32			(TARGET_NR_Linux +  16)
 #define TARGET_NR_break			(TARGET_NR_Linux +  17)
 #define TARGET_NR_unused18			(TARGET_NR_Linux +  18)
 #define TARGET_NR_lseek			(TARGET_NR_Linux +  19)
 #define TARGET_NR_getpid			(TARGET_NR_Linux +  20)
 #define TARGET_NR_mount			(TARGET_NR_Linux +  21)
 #define TARGET_NR_umount			(TARGET_NR_Linux +  22)
-#define TARGET_NR_setuid			(TARGET_NR_Linux +  23)
-#define TARGET_NR_getuid			(TARGET_NR_Linux +  24)
+#define TARGET_NR_setuid32			(TARGET_NR_Linux +  23)
+#define TARGET_NR_getuid32			(TARGET_NR_Linux +  24)
 #define TARGET_NR_stime			(TARGET_NR_Linux +  25)
 #define TARGET_NR_ptrace			(TARGET_NR_Linux +  26)
 #define TARGET_NR_alarm			(TARGET_NR_Linux +  27)
@@ -48,11 +48,11 @@
 #define TARGET_NR_times			(TARGET_NR_Linux +  43)
 #define TARGET_NR_prof			(TARGET_NR_Linux +  44)
 #define TARGET_NR_brk			(TARGET_NR_Linux +  45)
-#define TARGET_NR_setgid			(TARGET_NR_Linux +  46)
-#define TARGET_NR_getgid			(TARGET_NR_Linux +  47)
+#define TARGET_NR_setgid32			(TARGET_NR_Linux +  46)
+#define TARGET_NR_getgid32			(TARGET_NR_Linux +  47)
 #define TARGET_NR_signal			(TARGET_NR_Linux +  48)
-#define TARGET_NR_geteuid			(TARGET_NR_Linux +  49)
-#define TARGET_NR_getegid			(TARGET_NR_Linux +  50)
+#define TARGET_NR_geteuid32			(TARGET_NR_Linux +  49)
+#define TARGET_NR_getegid32			(TARGET_NR_Linux +  50)
 #define TARGET_NR_acct			(TARGET_NR_Linux +  51)
 #define TARGET_NR_umount2			(TARGET_NR_Linux +  52)
 #define TARGET_NR_lock			(TARGET_NR_Linux +  53)
@@ -72,8 +72,8 @@
 #define TARGET_NR_sigaction			(TARGET_NR_Linux +  67)
 #define TARGET_NR_sgetmask			(TARGET_NR_Linux +  68)
 #define TARGET_NR_ssetmask			(TARGET_NR_Linux +  69)
-#define TARGET_NR_setreuid			(TARGET_NR_Linux +  70)
-#define TARGET_NR_setregid			(TARGET_NR_Linux +  71)
+#define TARGET_NR_setreuid32			(TARGET_NR_Linux +  70)
+#define TARGET_NR_setregid32			(TARGET_NR_Linux +  71)
 #define TARGET_NR_sigsuspend			(TARGET_NR_Linux +  72)
 #define TARGET_NR_sigpending			(TARGET_NR_Linux +  73)
 #define TARGET_NR_sethostname		(TARGET_NR_Linux +  74)
@@ -82,8 +82,8 @@
 #define TARGET_NR_getrusage			(TARGET_NR_Linux +  77)
 #define TARGET_NR_gettimeofday		(TARGET_NR_Linux +  78)
 #define TARGET_NR_settimeofday		(TARGET_NR_Linux +  79)
-#define TARGET_NR_getgroups			(TARGET_NR_Linux +  80)
-#define TARGET_NR_setgroups			(TARGET_NR_Linux +  81)
+#define TARGET_NR_getgroups32			(TARGET_NR_Linux +  80)
+#define TARGET_NR_setgroups32			(TARGET_NR_Linux +  81)
 #define TARGET_NR_reserved82			(TARGET_NR_Linux +  82)
 #define TARGET_NR_symlink			(TARGET_NR_Linux +  83)
 #define TARGET_NR_unused84			(TARGET_NR_Linux +  84)
@@ -97,7 +97,7 @@
 #define TARGET_NR_truncate			(TARGET_NR_Linux +  92)
 #define TARGET_NR_ftruncate			(TARGET_NR_Linux +  93)
 #define TARGET_NR_fchmod			(TARGET_NR_Linux +  94)
-#define TARGET_NR_fchown			(TARGET_NR_Linux +  95)
+#define TARGET_NR_fchown32			(TARGET_NR_Linux +  95)
 #define TARGET_NR_getpriority		(TARGET_NR_Linux +  96)
 #define TARGET_NR_setpriority		(TARGET_NR_Linux +  97)
 #define TARGET_NR_profil			(TARGET_NR_Linux +  98)
@@ -140,8 +140,8 @@
 #define TARGET_NR_sysfs			(TARGET_NR_Linux + 135)
 #define TARGET_NR_personality		(TARGET_NR_Linux + 136)
 #define TARGET_NR_afs_syscall		(TARGET_NR_Linux + 137) /* Syscall for Andrew File System */
-#define TARGET_NR_setfsuid			(TARGET_NR_Linux + 138)
-#define TARGET_NR_setfsgid			(TARGET_NR_Linux + 139)
+#define TARGET_NR_setfsuid32			(TARGET_NR_Linux + 138)
+#define TARGET_NR_setfsgid32			(TARGET_NR_Linux + 139)
 #define TARGET_NR__llseek			(TARGET_NR_Linux + 140)
 #define TARGET_NR_getdents			(TARGET_NR_Linux + 141)
 #define TARGET_NR__newselect			(TARGET_NR_Linux + 142)
@@ -187,13 +187,13 @@
 #define TARGET_NR_shutdown			(TARGET_NR_Linux + 182)
 #define TARGET_NR_socket			(TARGET_NR_Linux + 183)
 #define TARGET_NR_socketpair			(TARGET_NR_Linux + 184)
-#define TARGET_NR_setresuid			(TARGET_NR_Linux + 185)
-#define TARGET_NR_getresuid			(TARGET_NR_Linux + 186)
+#define TARGET_NR_setresuid32			(TARGET_NR_Linux + 185)
+#define TARGET_NR_getresuid32			(TARGET_NR_Linux + 186)
 #define TARGET_NR_query_module		(TARGET_NR_Linux + 187)
 #define TARGET_NR_poll			(TARGET_NR_Linux + 188)
 #define TARGET_NR_nfsservctl			(TARGET_NR_Linux + 189)
-#define TARGET_NR_setresgid			(TARGET_NR_Linux + 190)
-#define TARGET_NR_getresgid			(TARGET_NR_Linux + 191)
+#define TARGET_NR_setresgid32			(TARGET_NR_Linux + 190)
+#define TARGET_NR_getresgid32			(TARGET_NR_Linux + 191)
 #define TARGET_NR_prctl			(TARGET_NR_Linux + 192)
 #define TARGET_NR_rt_sigreturn		(TARGET_NR_Linux + 193)
 #define TARGET_NR_rt_sigaction		(TARGET_NR_Linux + 194)
@@ -204,7 +204,7 @@
 #define TARGET_NR_rt_sigsuspend		(TARGET_NR_Linux + 199)
 #define TARGET_NR_pread64			(TARGET_NR_Linux + 200)
 #define TARGET_NR_pwrite64			(TARGET_NR_Linux + 201)
-#define TARGET_NR_chown			(TARGET_NR_Linux + 202)
+#define TARGET_NR_chown32			(TARGET_NR_Linux + 202)
 #define TARGET_NR_getcwd			(TARGET_NR_Linux + 203)
 #define TARGET_NR_capget			(TARGET_NR_Linux + 204)
 #define TARGET_NR_capset			(TARGET_NR_Linux + 205)