sim: m32r: namespace Linux syscall table

The use of __NR_ defines in here conflicts a lot with the standard
host syscalls, sometimes leading to build errors (when the numbers
happen to be the same we get duplicate case handlers), and other
times leading to misbehavior (where the m32r syscall # is not what
is actually checked).

Namespace these using the standard that we already use: change the
__NR_ to TARGET_LINUX_SYS_ with a simple `sed`.

Also add a few missing includes so the code at least compiles.

3 files changed, 377 insertions, 370 deletions

diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index af8339a..5243cda 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,8 @@
+2021-07-01  Mike Frysinger  <vapier@gentoo.org>
+
+	* syscall.h: Change __NR_ prefix on all symbols to TARGET_LINUX_SYS_.
+	* traps-linux.c: Likewise.  Include sim/callback.h & stdlib.h.
+
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac: Delete SIM_AC_OPTION_SCACHE call.
diff --git a/sim/m32r/syscall.h b/sim/m32r/syscall.h
index 3f4252a..8f0bf8d 100644
--- a/sim/m32r/syscall.h
+++ b/sim/m32r/syscall.h
@@ -2,280 +2,280 @@
  * This file contains the system call numbers.
  */
 
-#define __NR_exit		  1
-#define __NR_fork		  2
-#define __NR_read		  3
-#define __NR_write		  4
-#define __NR_open		  5
-#define __NR_close		  6
-#define __NR_waitpid		  7
-#define __NR_creat		  8
-#define __NR_link		  9
-#define __NR_unlink		 10
-#define __NR_execve		 11
-#define __NR_chdir		 12
-#define __NR_time		 13
-#define __NR_mknod		 14
-#define __NR_chmod		 15
-#define __NR_lchown		 16
-#define __NR_break		 17
-#define __NR_oldstat		 18
-#define __NR_lseek		 19
-#define __NR_getpid		 20
-#define __NR_mount		 21
-#define __NR_umount		 22
-#define __NR_setuid		 23
-#define __NR_getuid		 24
-#define __NR_stime		 25
-#define __NR_ptrace		 26
-#define __NR_alarm		 27
-#define __NR_oldfstat		 28
-#define __NR_pause		 29
-#define __NR_utime		 30
-#define __NR_stty		 31
-#define __NR_gtty		 32
-#define __NR_access		 33
-#define __NR_nice		 34
-#define __NR_ftime		 35
-#define __NR_sync		 36
-#define __NR_kill		 37
-#define __NR_rename		 38
-#define __NR_mkdir		 39
-#define __NR_rmdir		 40
-#define __NR_dup		 41
-#define __NR_pipe		 42
-#define __NR_times		 43
-#define __NR_prof		 44
-#define __NR_brk		 45
-#define __NR_setgid		 46
-#define __NR_getgid		 47
-#define __NR_signal		 48
-#define __NR_geteuid		 49
-#define __NR_getegid		 50
-#define __NR_acct		 51
-#define __NR_umount2		 52
-#define __NR_lock		 53
-#define __NR_ioctl		 54
-#define __NR_fcntl		 55
-#define __NR_mpx		 56
-#define __NR_setpgid		 57
-#define __NR_ulimit		 58
-#define __NR_oldolduname	 59
-#define __NR_umask		 60
-#define __NR_chroot		 61
-#define __NR_ustat		 62
-#define __NR_dup2		 63
-#define __NR_getppid		 64
-#define __NR_getpgrp		 65
-#define __NR_setsid		 66
-#define __NR_sigaction		 67
-#define __NR_sgetmask		 68
-#define __NR_ssetmask		 69
-#define __NR_setreuid		 70
-#define __NR_setregid		 71
-#define __NR_sigsuspend		 72
-#define __NR_sigpending		 73
-#define __NR_sethostname	 74
-#define __NR_setrlimit		 75
-#define __NR_getrlimit		 76
-#define __NR_getrusage		 77
-#define __NR_gettimeofday	 78
-#define __NR_settimeofday	 79
-#define __NR_getgroups		 80
-#define __NR_setgroups		 81
-#define __NR_select		 82
-#define __NR_symlink		 83
-#define __NR_oldlstat		 84
-#define __NR_readlink		 85
-#define __NR_uselib		 86
-#define __NR_swapon		 87
-#define __NR_reboot		 88
-#define __NR_readdir		 89
-#define __NR_mmap		 90
-#define __NR_munmap		 91
-#define __NR_truncate		 92
-#define __NR_ftruncate		 93
-#define __NR_fchmod		 94
-#define __NR_fchown		 95
-#define __NR_getpriority	 96
-#define __NR_setpriority	 97
-#define __NR_profil		 98
-#define __NR_statfs		 99
-#define __NR_fstatfs		100
-#define __NR_ioperm		101
-#define __NR_socketcall		102
-#define __NR_syslog		103
-#define __NR_setitimer		104
-#define __NR_getitimer		105
-#define __NR_stat		106
-#define __NR_lstat		107
-#define __NR_fstat		108
-#define __NR_olduname		109
-#define __NR_iopl		110
-#define __NR_vhangup		111
-#define __NR_idle		112
-#define __NR_vm86old		113
-#define __NR_wait4		114
-#define __NR_swapoff		115
-#define __NR_sysinfo		116
-#define __NR_ipc		117
-#define __NR_fsync		118
-#define __NR_sigreturn		119
-#define __NR_clone		120
-#define __NR_setdomainname	121
-#define __NR_uname		122
-#define __NR_modify_ldt		123
-#define __NR_adjtimex		124
-#define __NR_mprotect		125
-#define __NR_sigprocmask	126
-#define __NR_create_module	127
-#define __NR_init_module	128
-#define __NR_delete_module	129
-#define __NR_get_kernel_syms	130
-#define __NR_quotactl		131
-#define __NR_getpgid		132
-#define __NR_fchdir		133
-#define __NR_bdflush		134
-#define __NR_sysfs		135
-#define __NR_personality	136
-#define __NR_afs_syscall	137 /* Syscall for Andrew File System */
-#define __NR_setfsuid		138
-#define __NR_setfsgid		139
-#define __NR__llseek		140
-#define __NR_getdents		141
-#define __NR__newselect		142
-#define __NR_flock		143
-#define __NR_msync		144
-#define __NR_readv		145
-#define __NR_writev		146
-#define __NR_getsid		147
-#define __NR_fdatasync		148
-#define __NR__sysctl		149
-#define __NR_mlock		150
-#define __NR_munlock		151
-#define __NR_mlockall		152
-#define __NR_munlockall		153
-#define __NR_sched_setparam		154
-#define __NR_sched_getparam		155
-#define __NR_sched_setscheduler		156
-#define __NR_sched_getscheduler		157
-#define __NR_sched_yield		158
-#define __NR_sched_get_priority_max	159
-#define __NR_sched_get_priority_min	160
-#define __NR_sched_rr_get_interval	161
-#define __NR_nanosleep		162
-#define __NR_mremap		163
-#define __NR_setresuid		164
-#define __NR_getresuid		165
-#define __NR_vm86		166
-#define __NR_query_module	167
-#define __NR_poll		168
-#define __NR_nfsservctl		169
-#define __NR_setresgid		170
-#define __NR_getresgid		171
-#define __NR_prctl              172
-#define __NR_rt_sigreturn	173
-#define __NR_rt_sigaction	174
-#define __NR_rt_sigprocmask	175
-#define __NR_rt_sigpending	176
-#define __NR_rt_sigtimedwait	177
-#define __NR_rt_sigqueueinfo	178
-#define __NR_rt_sigsuspend	179
-#define __NR_pread		180
-#define __NR_pwrite		181
-#define __NR_chown		182
-#define __NR_getcwd		183
-#define __NR_capget		184
-#define __NR_capset		185
-#define __NR_sigaltstack	186
-#define __NR_sendfile		187
-#define __NR_getpmsg		188	/* some people actually want streams */
-#define __NR_putpmsg		189	/* some people actually want streams */
-#define __NR_vfork		190
+#define TARGET_LINUX_SYS_exit		  1
+#define TARGET_LINUX_SYS_fork		  2
+#define TARGET_LINUX_SYS_read		  3
+#define TARGET_LINUX_SYS_write		  4
+#define TARGET_LINUX_SYS_open		  5
+#define TARGET_LINUX_SYS_close		  6
+#define TARGET_LINUX_SYS_waitpid		  7
+#define TARGET_LINUX_SYS_creat		  8
+#define TARGET_LINUX_SYS_link		  9
+#define TARGET_LINUX_SYS_unlink		 10
+#define TARGET_LINUX_SYS_execve		 11
+#define TARGET_LINUX_SYS_chdir		 12
+#define TARGET_LINUX_SYS_time		 13
+#define TARGET_LINUX_SYS_mknod		 14
+#define TARGET_LINUX_SYS_chmod		 15
+#define TARGET_LINUX_SYS_lchown		 16
+#define TARGET_LINUX_SYS_break		 17
+#define TARGET_LINUX_SYS_oldstat		 18
+#define TARGET_LINUX_SYS_lseek		 19
+#define TARGET_LINUX_SYS_getpid		 20
+#define TARGET_LINUX_SYS_mount		 21
+#define TARGET_LINUX_SYS_umount		 22
+#define TARGET_LINUX_SYS_setuid		 23
+#define TARGET_LINUX_SYS_getuid		 24
+#define TARGET_LINUX_SYS_stime		 25
+#define TARGET_LINUX_SYS_ptrace		 26
+#define TARGET_LINUX_SYS_alarm		 27
+#define TARGET_LINUX_SYS_oldfstat		 28
+#define TARGET_LINUX_SYS_pause		 29
+#define TARGET_LINUX_SYS_utime		 30
+#define TARGET_LINUX_SYS_stty		 31
+#define TARGET_LINUX_SYS_gtty		 32
+#define TARGET_LINUX_SYS_access		 33
+#define TARGET_LINUX_SYS_nice		 34
+#define TARGET_LINUX_SYS_ftime		 35
+#define TARGET_LINUX_SYS_sync		 36
+#define TARGET_LINUX_SYS_kill		 37
+#define TARGET_LINUX_SYS_rename		 38
+#define TARGET_LINUX_SYS_mkdir		 39
+#define TARGET_LINUX_SYS_rmdir		 40
+#define TARGET_LINUX_SYS_dup		 41
+#define TARGET_LINUX_SYS_pipe		 42
+#define TARGET_LINUX_SYS_times		 43
+#define TARGET_LINUX_SYS_prof		 44
+#define TARGET_LINUX_SYS_brk		 45
+#define TARGET_LINUX_SYS_setgid		 46
+#define TARGET_LINUX_SYS_getgid		 47
+#define TARGET_LINUX_SYS_signal		 48
+#define TARGET_LINUX_SYS_geteuid		 49
+#define TARGET_LINUX_SYS_getegid		 50
+#define TARGET_LINUX_SYS_acct		 51
+#define TARGET_LINUX_SYS_umount2		 52
+#define TARGET_LINUX_SYS_lock		 53
+#define TARGET_LINUX_SYS_ioctl		 54
+#define TARGET_LINUX_SYS_fcntl		 55
+#define TARGET_LINUX_SYS_mpx		 56
+#define TARGET_LINUX_SYS_setpgid		 57
+#define TARGET_LINUX_SYS_ulimit		 58
+#define TARGET_LINUX_SYS_oldolduname	 59
+#define TARGET_LINUX_SYS_umask		 60
+#define TARGET_LINUX_SYS_chroot		 61
+#define TARGET_LINUX_SYS_ustat		 62
+#define TARGET_LINUX_SYS_dup2		 63
+#define TARGET_LINUX_SYS_getppid		 64
+#define TARGET_LINUX_SYS_getpgrp		 65
+#define TARGET_LINUX_SYS_setsid		 66
+#define TARGET_LINUX_SYS_sigaction		 67
+#define TARGET_LINUX_SYS_sgetmask		 68
+#define TARGET_LINUX_SYS_ssetmask		 69
+#define TARGET_LINUX_SYS_setreuid		 70
+#define TARGET_LINUX_SYS_setregid		 71
+#define TARGET_LINUX_SYS_sigsuspend		 72
+#define TARGET_LINUX_SYS_sigpending		 73
+#define TARGET_LINUX_SYS_sethostname	 74
+#define TARGET_LINUX_SYS_setrlimit		 75
+#define TARGET_LINUX_SYS_getrlimit		 76
+#define TARGET_LINUX_SYS_getrusage		 77
+#define TARGET_LINUX_SYS_gettimeofday	 78
+#define TARGET_LINUX_SYS_settimeofday	 79
+#define TARGET_LINUX_SYS_getgroups		 80
+#define TARGET_LINUX_SYS_setgroups		 81
+#define TARGET_LINUX_SYS_select		 82
+#define TARGET_LINUX_SYS_symlink		 83
+#define TARGET_LINUX_SYS_oldlstat		 84
+#define TARGET_LINUX_SYS_readlink		 85
+#define TARGET_LINUX_SYS_uselib		 86
+#define TARGET_LINUX_SYS_swapon		 87
+#define TARGET_LINUX_SYS_reboot		 88
+#define TARGET_LINUX_SYS_readdir		 89
+#define TARGET_LINUX_SYS_mmap		 90
+#define TARGET_LINUX_SYS_munmap		 91
+#define TARGET_LINUX_SYS_truncate		 92
+#define TARGET_LINUX_SYS_ftruncate		 93
+#define TARGET_LINUX_SYS_fchmod		 94
+#define TARGET_LINUX_SYS_fchown		 95
+#define TARGET_LINUX_SYS_getpriority	 96
+#define TARGET_LINUX_SYS_setpriority	 97
+#define TARGET_LINUX_SYS_profil		 98
+#define TARGET_LINUX_SYS_statfs		 99
+#define TARGET_LINUX_SYS_fstatfs		100
+#define TARGET_LINUX_SYS_ioperm		101
+#define TARGET_LINUX_SYS_socketcall		102
+#define TARGET_LINUX_SYS_syslog		103
+#define TARGET_LINUX_SYS_setitimer		104
+#define TARGET_LINUX_SYS_getitimer		105
+#define TARGET_LINUX_SYS_stat		106
+#define TARGET_LINUX_SYS_lstat		107
+#define TARGET_LINUX_SYS_fstat		108
+#define TARGET_LINUX_SYS_olduname		109
+#define TARGET_LINUX_SYS_iopl		110
+#define TARGET_LINUX_SYS_vhangup		111
+#define TARGET_LINUX_SYS_idle		112
+#define TARGET_LINUX_SYS_vm86old		113
+#define TARGET_LINUX_SYS_wait4		114
+#define TARGET_LINUX_SYS_swapoff		115
+#define TARGET_LINUX_SYS_sysinfo		116
+#define TARGET_LINUX_SYS_ipc		117
+#define TARGET_LINUX_SYS_fsync		118
+#define TARGET_LINUX_SYS_sigreturn		119
+#define TARGET_LINUX_SYS_clone		120
+#define TARGET_LINUX_SYS_setdomainname	121
+#define TARGET_LINUX_SYS_uname		122
+#define TARGET_LINUX_SYS_modify_ldt		123
+#define TARGET_LINUX_SYS_adjtimex		124
+#define TARGET_LINUX_SYS_mprotect		125
+#define TARGET_LINUX_SYS_sigprocmask	126
+#define TARGET_LINUX_SYS_create_module	127
+#define TARGET_LINUX_SYS_init_module	128
+#define TARGET_LINUX_SYS_delete_module	129
+#define TARGET_LINUX_SYS_get_kernel_syms	130
+#define TARGET_LINUX_SYS_quotactl		131
+#define TARGET_LINUX_SYS_getpgid		132
+#define TARGET_LINUX_SYS_fchdir		133
+#define TARGET_LINUX_SYS_bdflush		134
+#define TARGET_LINUX_SYS_sysfs		135
+#define TARGET_LINUX_SYS_personality	136
+#define TARGET_LINUX_SYS_afs_syscall	137 /* Syscall for Andrew File System */
+#define TARGET_LINUX_SYS_setfsuid		138
+#define TARGET_LINUX_SYS_setfsgid		139
+#define TARGET_LINUX_SYS__llseek		140
+#define TARGET_LINUX_SYS_getdents		141
+#define TARGET_LINUX_SYS__newselect		142
+#define TARGET_LINUX_SYS_flock		143
+#define TARGET_LINUX_SYS_msync		144
+#define TARGET_LINUX_SYS_readv		145
+#define TARGET_LINUX_SYS_writev		146
+#define TARGET_LINUX_SYS_getsid		147
+#define TARGET_LINUX_SYS_fdatasync		148
+#define TARGET_LINUX_SYS__sysctl		149
+#define TARGET_LINUX_SYS_mlock		150
+#define TARGET_LINUX_SYS_munlock		151
+#define TARGET_LINUX_SYS_mlockall		152
+#define TARGET_LINUX_SYS_munlockall		153
+#define TARGET_LINUX_SYS_sched_setparam		154
+#define TARGET_LINUX_SYS_sched_getparam		155
+#define TARGET_LINUX_SYS_sched_setscheduler		156
+#define TARGET_LINUX_SYS_sched_getscheduler		157
+#define TARGET_LINUX_SYS_sched_yield		158
+#define TARGET_LINUX_SYS_sched_get_priority_max	159
+#define TARGET_LINUX_SYS_sched_get_priority_min	160
+#define TARGET_LINUX_SYS_sched_rr_get_interval	161
+#define TARGET_LINUX_SYS_nanosleep		162
+#define TARGET_LINUX_SYS_mremap		163
+#define TARGET_LINUX_SYS_setresuid		164
+#define TARGET_LINUX_SYS_getresuid		165
+#define TARGET_LINUX_SYS_vm86		166
+#define TARGET_LINUX_SYS_query_module	167
+#define TARGET_LINUX_SYS_poll		168
+#define TARGET_LINUX_SYS_nfsservctl		169
+#define TARGET_LINUX_SYS_setresgid		170
+#define TARGET_LINUX_SYS_getresgid		171
+#define TARGET_LINUX_SYS_prctl              172
+#define TARGET_LINUX_SYS_rt_sigreturn	173
+#define TARGET_LINUX_SYS_rt_sigaction	174
+#define TARGET_LINUX_SYS_rt_sigprocmask	175
+#define TARGET_LINUX_SYS_rt_sigpending	176
+#define TARGET_LINUX_SYS_rt_sigtimedwait	177
+#define TARGET_LINUX_SYS_rt_sigqueueinfo	178
+#define TARGET_LINUX_SYS_rt_sigsuspend	179
+#define TARGET_LINUX_SYS_pread		180
+#define TARGET_LINUX_SYS_pwrite		181
+#define TARGET_LINUX_SYS_chown		182
+#define TARGET_LINUX_SYS_getcwd		183
+#define TARGET_LINUX_SYS_capget		184
+#define TARGET_LINUX_SYS_capset		185
+#define TARGET_LINUX_SYS_sigaltstack	186
+#define TARGET_LINUX_SYS_sendfile		187
+#define TARGET_LINUX_SYS_getpmsg		188	/* some people actually want streams */
+#define TARGET_LINUX_SYS_putpmsg		189	/* some people actually want streams */
+#define TARGET_LINUX_SYS_vfork		190
 
-#define __NR_pread64		180
-#define __NR_pwrite64		181
+#define TARGET_LINUX_SYS_pread64		180
+#define TARGET_LINUX_SYS_pwrite64		181
 
-#define __NR_ugetrlimit		191	/* SuS compliant getrlimit */
-#define __NR_mmap2		192
-#define __NR_truncate64		193
-#define __NR_ftruncate64	194
-#define __NR_stat64		195
-#define __NR_lstat64		196
-#define __NR_fstat64		197
-#define __NR_lchown32		198
-#define __NR_getuid32		199
-#define __NR_getgid32		200
-#define __NR_geteuid32		201
-#define __NR_getegid32		202
-#define __NR_setreuid32		203
-#define __NR_setregid32		204
-#define __NR_getgroups32	205
-#define __NR_setgroups32	206
-#define __NR_fchown32		207
-#define __NR_setresuid32	208
-#define __NR_getresuid32	209
-#define __NR_setresgid32	210
-#define __NR_getresgid32	211
-#define __NR_chown32		212
-#define __NR_setuid32		213
-#define __NR_setgid32		214
-#define __NR_setfsuid32		215
-#define __NR_setfsgid32		216
-#define __NR_pivot_root		217
-#define __NR_mincore		218
-#define __NR_madvise		219
-#define __NR_madvise1		219	/* delete when C lib stub is removed */
-#define __NR_getdents64		220
-#define __NR_fcntl64		221
+#define TARGET_LINUX_SYS_ugetrlimit		191	/* SuS compliant getrlimit */
+#define TARGET_LINUX_SYS_mmap2		192
+#define TARGET_LINUX_SYS_truncate64		193
+#define TARGET_LINUX_SYS_ftruncate64	194
+#define TARGET_LINUX_SYS_stat64		195
+#define TARGET_LINUX_SYS_lstat64		196
+#define TARGET_LINUX_SYS_fstat64		197
+#define TARGET_LINUX_SYS_lchown32		198
+#define TARGET_LINUX_SYS_getuid32		199
+#define TARGET_LINUX_SYS_getgid32		200
+#define TARGET_LINUX_SYS_geteuid32		201
+#define TARGET_LINUX_SYS_getegid32		202
+#define TARGET_LINUX_SYS_setreuid32		203
+#define TARGET_LINUX_SYS_setregid32		204
+#define TARGET_LINUX_SYS_getgroups32	205
+#define TARGET_LINUX_SYS_setgroups32	206
+#define TARGET_LINUX_SYS_fchown32		207
+#define TARGET_LINUX_SYS_setresuid32	208
+#define TARGET_LINUX_SYS_getresuid32	209
+#define TARGET_LINUX_SYS_setresgid32	210
+#define TARGET_LINUX_SYS_getresgid32	211
+#define TARGET_LINUX_SYS_chown32		212
+#define TARGET_LINUX_SYS_setuid32		213
+#define TARGET_LINUX_SYS_setgid32		214
+#define TARGET_LINUX_SYS_setfsuid32		215
+#define TARGET_LINUX_SYS_setfsgid32		216
+#define TARGET_LINUX_SYS_pivot_root		217
+#define TARGET_LINUX_SYS_mincore		218
+#define TARGET_LINUX_SYS_madvise		219
+#define TARGET_LINUX_SYS_madvise1		219	/* delete when C lib stub is removed */
+#define TARGET_LINUX_SYS_getdents64		220
+#define TARGET_LINUX_SYS_fcntl64		221
 /* 223 is unused */
-#define __NR_gettid		224
-#define __NR_readahead		225
-#define __NR_setxattr		226
-#define __NR_lsetxattr		227
-#define __NR_fsetxattr		228
-#define __NR_getxattr		229
-#define __NR_lgetxattr		230
-#define __NR_fgetxattr		231
-#define __NR_listxattr		232
-#define __NR_llistxattr		233
-#define __NR_flistxattr		234
-#define __NR_removexattr	235
-#define __NR_lremovexattr	236
-#define __NR_fremovexattr	237
-#define __NR_tkill		238
-#define __NR_sendfile64		239
-#define __NR_futex		240
-#define __NR_sched_setaffinity	241
-#define __NR_sched_getaffinity	242
-#define __NR_set_thread_area	243
-#define __NR_get_thread_area	244
-#define __NR_io_setup		245
-#define __NR_io_destroy		246
-#define __NR_io_getevents	247
-#define __NR_io_submit		248
-#define __NR_io_cancel		249
-#define __NR_fadvise64		250
+#define TARGET_LINUX_SYS_gettid		224
+#define TARGET_LINUX_SYS_readahead		225
+#define TARGET_LINUX_SYS_setxattr		226
+#define TARGET_LINUX_SYS_lsetxattr		227
+#define TARGET_LINUX_SYS_fsetxattr		228
+#define TARGET_LINUX_SYS_getxattr		229
+#define TARGET_LINUX_SYS_lgetxattr		230
+#define TARGET_LINUX_SYS_fgetxattr		231
+#define TARGET_LINUX_SYS_listxattr		232
+#define TARGET_LINUX_SYS_llistxattr		233
+#define TARGET_LINUX_SYS_flistxattr		234
+#define TARGET_LINUX_SYS_removexattr	235
+#define TARGET_LINUX_SYS_lremovexattr	236
+#define TARGET_LINUX_SYS_fremovexattr	237
+#define TARGET_LINUX_SYS_tkill		238
+#define TARGET_LINUX_SYS_sendfile64		239
+#define TARGET_LINUX_SYS_futex		240
+#define TARGET_LINUX_SYS_sched_setaffinity	241
+#define TARGET_LINUX_SYS_sched_getaffinity	242
+#define TARGET_LINUX_SYS_set_thread_area	243
+#define TARGET_LINUX_SYS_get_thread_area	244
+#define TARGET_LINUX_SYS_io_setup		245
+#define TARGET_LINUX_SYS_io_destroy		246
+#define TARGET_LINUX_SYS_io_getevents	247
+#define TARGET_LINUX_SYS_io_submit		248
+#define TARGET_LINUX_SYS_io_cancel		249
+#define TARGET_LINUX_SYS_fadvise64		250
 
-#define __NR_exit_group		252
-#define __NR_lookup_dcookie	253
-#define __NR_epoll_create	254
-#define __NR_epoll_ctl		255
-#define __NR_epoll_wait		256
-#define __NR_remap_file_pages	257
-#define __NR_set_tid_address	258
-#define __NR_timer_create	259
-#define __NR_timer_settime	(__NR_timer_create+1)
-#define __NR_timer_gettime	(__NR_timer_create+2)
-#define __NR_timer_getoverrun	(__NR_timer_create+3)
-#define __NR_timer_delete	(__NR_timer_create+4)
-#define __NR_clock_settime	(__NR_timer_create+5)
-#define __NR_clock_gettime	(__NR_timer_create+6)
-#define __NR_clock_getres	(__NR_timer_create+7)
-#define __NR_clock_nanosleep	(__NR_timer_create+8)
-#define __NR_statfs64		268
-#define __NR_fstatfs64		269
-#define __NR_tgkill		270
-#define __NR_utimes		271
-#define __NR_fadvise64_64	272
-#define __NR_vserver		273
+#define TARGET_LINUX_SYS_exit_group		252
+#define TARGET_LINUX_SYS_lookup_dcookie	253
+#define TARGET_LINUX_SYS_epoll_create	254
+#define TARGET_LINUX_SYS_epoll_ctl		255
+#define TARGET_LINUX_SYS_epoll_wait		256
+#define TARGET_LINUX_SYS_remap_file_pages	257
+#define TARGET_LINUX_SYS_set_tid_address	258
+#define TARGET_LINUX_SYS_timer_create	259
+#define TARGET_LINUX_SYS_timer_settime	(TARGET_LINUX_SYS_timer_create+1)
+#define TARGET_LINUX_SYS_timer_gettime	(TARGET_LINUX_SYS_timer_create+2)
+#define TARGET_LINUX_SYS_timer_getoverrun	(TARGET_LINUX_SYS_timer_create+3)
+#define TARGET_LINUX_SYS_timer_delete	(TARGET_LINUX_SYS_timer_create+4)
+#define TARGET_LINUX_SYS_clock_settime	(TARGET_LINUX_SYS_timer_create+5)
+#define TARGET_LINUX_SYS_clock_gettime	(TARGET_LINUX_SYS_timer_create+6)
+#define TARGET_LINUX_SYS_clock_getres	(TARGET_LINUX_SYS_timer_create+7)
+#define TARGET_LINUX_SYS_clock_nanosleep	(TARGET_LINUX_SYS_timer_create+8)
+#define TARGET_LINUX_SYS_statfs64		268
+#define TARGET_LINUX_SYS_fstatfs64		269
+#define TARGET_LINUX_SYS_tgkill		270
+#define TARGET_LINUX_SYS_utimes		271
+#define TARGET_LINUX_SYS_fadvise64_64	272
+#define TARGET_LINUX_SYS_vserver		273
diff --git a/sim/m32r/traps-linux.c b/sim/m32r/traps-linux.c
index c218582..d60be7c 100644
--- a/sim/m32r/traps-linux.c
+++ b/sim/m32r/traps-linux.c
@@ -24,11 +24,13 @@
 #include "sim-main.h"
 #include "sim-signal.h"
 #include "sim-syscall.h"
+#include "sim/callback.h"
 #include "syscall.h"
 #include "targ-vals.h"
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
 #include <utime.h>
@@ -268,52 +270,52 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
 
         switch (func)
           {
-          case __NR_exit:
+          case TARGET_LINUX_SYS_exit:
 	    sim_engine_halt (sd, current_cpu, NULL, pc, sim_exited, arg1);
             break;
 
-          case __NR_read:
+          case TARGET_LINUX_SYS_read:
             result = read(arg1, t2h_addr(cb, &s, arg2), arg3);
             errcode = errno;
             break;
 
-          case __NR_write:
+          case TARGET_LINUX_SYS_write:
             result = write(arg1, t2h_addr(cb, &s, arg2), arg3);
             errcode = errno;
             break;
 
-          case __NR_open:
+          case TARGET_LINUX_SYS_open:
             result = open((char *) t2h_addr(cb, &s, arg1), arg2, arg3);
             errcode = errno;
             break;
 
-          case __NR_close:
+          case TARGET_LINUX_SYS_close:
             result = close(arg1);
             errcode = errno;
             break;
 
-          case __NR_creat:
+          case TARGET_LINUX_SYS_creat:
             result = creat((char *) t2h_addr(cb, &s, arg1), arg2);
             errcode = errno;
             break;
 
-          case __NR_link:
+          case TARGET_LINUX_SYS_link:
             result = link((char *) t2h_addr(cb, &s, arg1),
                           (char *) t2h_addr(cb, &s, arg2));
             errcode = errno;
             break;
 
-          case __NR_unlink:
+          case TARGET_LINUX_SYS_unlink:
             result = unlink((char *) t2h_addr(cb, &s, arg1));
             errcode = errno;
             break;
 
-          case __NR_chdir:
+          case TARGET_LINUX_SYS_chdir:
             result = chdir((char *) t2h_addr(cb, &s, arg1));
             errcode = errno;
             break;
 
-          case __NR_time:
+          case TARGET_LINUX_SYS_time:
             {
               time_t t;
 
@@ -340,41 +342,41 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_mknod:
+          case TARGET_LINUX_SYS_mknod:
             result = mknod((char *) t2h_addr(cb, &s, arg1),
                            (mode_t) arg2, (dev_t) arg3);
             errcode = errno;
             break;
 
-          case __NR_chmod:
+          case TARGET_LINUX_SYS_chmod:
             result = chmod((char *) t2h_addr(cb, &s, arg1), (mode_t) arg2);
             errcode = errno;
             break;
 
-          case __NR_lchown32:
-          case __NR_lchown:
+          case TARGET_LINUX_SYS_lchown32:
+          case TARGET_LINUX_SYS_lchown:
             result = lchown((char *) t2h_addr(cb, &s, arg1),
                             (uid_t) arg2, (gid_t) arg3);
             errcode = errno;
             break;
 
-          case __NR_lseek:
+          case TARGET_LINUX_SYS_lseek:
             result = (int) lseek(arg1, (off_t) arg2, arg3);
             errcode = errno;
             break;
 
-          case __NR_getpid:
+          case TARGET_LINUX_SYS_getpid:
             result = getpid();
             errcode = errno;
             break;
 
-          case __NR_getuid32:
-          case __NR_getuid:
+          case TARGET_LINUX_SYS_getuid32:
+          case TARGET_LINUX_SYS_getuid:
             result = getuid();
             errcode = errno;
             break;
 
-          case __NR_utime:
+          case TARGET_LINUX_SYS_utime:
             {
               struct utimbuf buf;
 
@@ -393,12 +395,12 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_access:
+          case TARGET_LINUX_SYS_access:
             result = access((char *) t2h_addr(cb, &s, arg1), arg2);
             errcode = errno;
             break;
 
-          case __NR_ftime:
+          case TARGET_LINUX_SYS_ftime:
             {
               struct timeb t;
 
@@ -420,82 +422,82 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
                 }
             }
 
-          case __NR_sync:
+          case TARGET_LINUX_SYS_sync:
             sync();
             result = 0;
             break;
 
-          case __NR_rename:
+          case TARGET_LINUX_SYS_rename:
             result = rename((char *) t2h_addr(cb, &s, arg1),
                             (char *) t2h_addr(cb, &s, arg2));
             errcode = errno;
             break;
 
-          case __NR_mkdir:
+          case TARGET_LINUX_SYS_mkdir:
             result = mkdir((char *) t2h_addr(cb, &s, arg1), arg2);
             errcode = errno;
             break;
 
-          case __NR_rmdir:
+          case TARGET_LINUX_SYS_rmdir:
             result = rmdir((char *) t2h_addr(cb, &s, arg1));
             errcode = errno;
             break;
 
-          case __NR_dup:
+          case TARGET_LINUX_SYS_dup:
             result = dup(arg1);
             errcode = errno;
             break;
 
-          case __NR_brk:
+          case TARGET_LINUX_SYS_brk:
             result = brk((void *) arg1);
             errcode = errno;
             //result = arg1;
             break;
 
-          case __NR_getgid32:
-          case __NR_getgid:
+          case TARGET_LINUX_SYS_getgid32:
+          case TARGET_LINUX_SYS_getgid:
             result = getgid();
             errcode = errno;
             break;
 
-          case __NR_geteuid32:
-          case __NR_geteuid:
+          case TARGET_LINUX_SYS_geteuid32:
+          case TARGET_LINUX_SYS_geteuid:
             result = geteuid();
             errcode = errno;
             break;
 
-          case __NR_getegid32:
-          case __NR_getegid:
+          case TARGET_LINUX_SYS_getegid32:
+          case TARGET_LINUX_SYS_getegid:
             result = getegid();
             errcode = errno;
             break;
 
-          case __NR_ioctl:
+          case TARGET_LINUX_SYS_ioctl:
             result = ioctl(arg1, arg2, arg3);
             errcode = errno;
             break;
 
-          case __NR_fcntl:
+          case TARGET_LINUX_SYS_fcntl:
             result = fcntl(arg1, arg2, arg3);
             errcode = errno;
             break;
 
-          case __NR_dup2:
+          case TARGET_LINUX_SYS_dup2:
             result = dup2(arg1, arg2);
             errcode = errno;
             break;
 
-          case __NR_getppid:
+          case TARGET_LINUX_SYS_getppid:
             result = getppid();
             errcode = errno;
             break;
 
-          case __NR_getpgrp:
+          case TARGET_LINUX_SYS_getpgrp:
             result = getpgrp();
             errcode = errno;
             break;
 
-          case __NR_getrlimit:
+          case TARGET_LINUX_SYS_getrlimit:
             {
               struct rlimit rlim;
 
@@ -515,7 +517,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_getrusage:
+          case TARGET_LINUX_SYS_getrusage:
             {
               struct rusage usage;
 
@@ -535,7 +537,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_gettimeofday:
+          case TARGET_LINUX_SYS_gettimeofday:
             {
               struct timeval tv;
               struct timezone tz;
@@ -564,8 +566,8 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_getgroups32:
-          case __NR_getgroups:
+          case TARGET_LINUX_SYS_getgroups32:
+          case TARGET_LINUX_SYS_getgroups:
             {
               gid_t *list;
 
@@ -589,7 +591,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_select:
+          case TARGET_LINUX_SYS_select:
             {
               int n;
               fd_set readfds;
@@ -689,26 +691,26 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_symlink:
+          case TARGET_LINUX_SYS_symlink:
             result = symlink((char *) t2h_addr(cb, &s, arg1),
                              (char *) t2h_addr(cb, &s, arg2));
             errcode = errno;
             break;
 
-          case __NR_readlink:
+          case TARGET_LINUX_SYS_readlink:
             result = readlink((char *) t2h_addr(cb, &s, arg1),
                               (char *) t2h_addr(cb, &s, arg2),
                               arg3);
             errcode = errno;
             break;
 
-          case __NR_readdir:
+          case TARGET_LINUX_SYS_readdir:
             result = (int) readdir((DIR *) t2h_addr(cb, &s, arg1));
             errcode = errno;
             break;
 
 #if 0
-          case __NR_mmap:
+          case TARGET_LINUX_SYS_mmap:
             {
               result = (int) mmap((void *) t2h_addr(cb, &s, arg1),
                                   arg2, arg3, arg4, arg5, arg6);
@@ -723,7 +725,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 #endif
-          case __NR_mmap2:
+          case TARGET_LINUX_SYS_mmap2:
             {
               void *addr;
               size_t len;
@@ -750,7 +752,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_mmap:
+          case TARGET_LINUX_SYS_mmap:
             {
               void *addr;
               size_t len;
@@ -787,7 +789,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_munmap:
+          case TARGET_LINUX_SYS_munmap:
             {
             result = munmap((void *)arg1, arg2);
             errcode = errno;
@@ -798,28 +800,28 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_truncate:
+          case TARGET_LINUX_SYS_truncate:
             result = truncate((char *) t2h_addr(cb, &s, arg1), arg2);
             errcode = errno;
             break;
 
-          case __NR_ftruncate:
+          case TARGET_LINUX_SYS_ftruncate:
             result = ftruncate(arg1, arg2);
             errcode = errno;
             break;
 
-          case __NR_fchmod:
+          case TARGET_LINUX_SYS_fchmod:
             result = fchmod(arg1, arg2);
             errcode = errno;
             break;
 
-          case __NR_fchown32:
-          case __NR_fchown:
+          case TARGET_LINUX_SYS_fchown32:
+          case TARGET_LINUX_SYS_fchown:
             result = fchown(arg1, arg2, arg3);
             errcode = errno;
             break;
 
-          case __NR_statfs:
+          case TARGET_LINUX_SYS_statfs:
             {
               struct statfs statbuf;
 
@@ -839,7 +841,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_fstatfs:
+          case TARGET_LINUX_SYS_fstatfs:
             {
               struct statfs statbuf;
 
@@ -859,12 +861,12 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_syslog:
+          case TARGET_LINUX_SYS_syslog:
             result = syslog(arg1, (char *) t2h_addr(cb, &s, arg2));
             errcode = errno;
             break;
 
-          case __NR_setitimer:
+          case TARGET_LINUX_SYS_setitimer:
             {
               struct itimerval value, ovalue;
 
@@ -895,7 +897,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_getitimer:
+          case TARGET_LINUX_SYS_getitimer:
             {
               struct itimerval value;
 
@@ -915,7 +917,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_stat:
+          case TARGET_LINUX_SYS_stat:
             {
               char *buf;
               int buflen;
@@ -948,7 +950,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_lstat:
+          case TARGET_LINUX_SYS_lstat:
             {
               char *buf;
               int buflen;
@@ -981,7 +983,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_fstat:
+          case TARGET_LINUX_SYS_fstat:
             {
               char *buf;
               int buflen;
@@ -1014,7 +1016,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_sysinfo:
+          case TARGET_LINUX_SYS_sysinfo:
             {
               struct sysinfo info;
 
@@ -1050,7 +1052,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             break;
 
 #if 0
-          case __NR_ipc:
+          case TARGET_LINUX_SYS_ipc:
             {
               result = ipc(arg1, arg2, arg3, arg4,
                            (void *) t2h_addr(cb, &s, arg5), arg6);
@@ -1059,19 +1061,19 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             break;
 #endif
 
-          case __NR_fsync:
+          case TARGET_LINUX_SYS_fsync:
             result = fsync(arg1);
             errcode = errno;
             break;
 
-          case __NR_uname:
+          case TARGET_LINUX_SYS_uname:
             /* utsname contains only arrays of char, so it is not necessary
                to translate endian. */
             result = uname((struct utsname *) t2h_addr(cb, &s, arg1));
             errcode = errno;
             break;
 
-          case __NR_adjtimex:
+          case TARGET_LINUX_SYS_adjtimex:
             {
               struct timex buf;
 
@@ -1091,30 +1093,30 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_mprotect:
+          case TARGET_LINUX_SYS_mprotect:
             result = mprotect((void *) arg1, arg2, arg3);
             errcode = errno;
             break;
 
-          case __NR_fchdir:
+          case TARGET_LINUX_SYS_fchdir:
             result = fchdir(arg1);
             errcode = errno;
             break;
 
-          case __NR_setfsuid32:
-          case __NR_setfsuid:
+          case TARGET_LINUX_SYS_setfsuid32:
+          case TARGET_LINUX_SYS_setfsuid:
             result = setfsuid(arg1);
             errcode = errno;
             break;
 
-          case __NR_setfsgid32:
-          case __NR_setfsgid:
+          case TARGET_LINUX_SYS_setfsgid32:
+          case TARGET_LINUX_SYS_setfsgid:
             result = setfsgid(arg1);
             errcode = errno;
             break;
 
 #if 0
-          case __NR__llseek:
+          case TARGET_LINUX_SYS__llseek:
             {
               loff_t buf;
 
@@ -1134,7 +1136,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_getdents:
+          case TARGET_LINUX_SYS_getdents:
             {
               struct dirent dir;
 
@@ -1157,17 +1159,17 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             break;
 #endif
 
-          case __NR_flock:
+          case TARGET_LINUX_SYS_flock:
             result = flock(arg1, arg2);
             errcode = errno;
             break;
 
-          case __NR_msync:
+          case TARGET_LINUX_SYS_msync:
             result = msync((void *) arg1, arg2, arg3);
             errcode = errno;
             break;
 
-          case __NR_readv:
+          case TARGET_LINUX_SYS_readv:
             {
               struct iovec vector;
 
@@ -1179,7 +1181,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_writev:
+          case TARGET_LINUX_SYS_writev:
             {
               struct iovec vector;
 
@@ -1191,22 +1193,22 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_fdatasync:
+          case TARGET_LINUX_SYS_fdatasync:
             result = fdatasync(arg1);
             errcode = errno;
             break;
 
-          case __NR_mlock:
+          case TARGET_LINUX_SYS_mlock:
             result = mlock((void *) t2h_addr(cb, &s, arg1), arg2);
             errcode = errno;
             break;
 
-          case __NR_munlock:
+          case TARGET_LINUX_SYS_munlock:
             result = munlock((void *) t2h_addr(cb, &s, arg1), arg2);
             errcode = errno;
             break;
 
-          case __NR_nanosleep:
+          case TARGET_LINUX_SYS_nanosleep:
             {
               struct timespec req, rem;
 
@@ -1229,13 +1231,13 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_mremap: /* FIXME */
+          case TARGET_LINUX_SYS_mremap: /* FIXME */
             result = (int) mremap((void *) t2h_addr(cb, &s, arg1), arg2, arg3, arg4); 
             errcode = errno;
             break;
 
-          case __NR_getresuid32:
-          case __NR_getresuid:
+          case TARGET_LINUX_SYS_getresuid32:
+          case TARGET_LINUX_SYS_getresuid:
             {
               uid_t ruid, euid, suid;
 
@@ -1251,7 +1253,7 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_poll:
+          case TARGET_LINUX_SYS_poll:
             {
               struct pollfd ufds;
 
@@ -1265,8 +1267,8 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_getresgid32:
-          case __NR_getresgid:
+          case TARGET_LINUX_SYS_getresgid32:
+          case TARGET_LINUX_SYS_getresgid:
             {
               uid_t rgid, egid, sgid;
 
@@ -1282,28 +1284,28 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
             }
             break;
 
-          case __NR_pread:
+          case TARGET_LINUX_SYS_pread:
             result =  pread(arg1, (void *) t2h_addr(cb, &s, arg2), arg3, arg4); 
             errcode = errno;
             break;
 
-          case __NR_pwrite:
+          case TARGET_LINUX_SYS_pwrite:
             result =  pwrite(arg1, (void *) t2h_addr(cb, &s, arg2), arg3, arg4); 
             errcode = errno;
             break;
 
-          case __NR_chown32:
-          case __NR_chown:
+          case TARGET_LINUX_SYS_chown32:
+          case TARGET_LINUX_SYS_chown:
             result = chown((char *) t2h_addr(cb, &s, arg1), arg2, arg3);
             errcode = errno;
             break;
 
-          case __NR_getcwd:
+          case TARGET_LINUX_SYS_getcwd:
             result = (int) getcwd((char *) t2h_addr(cb, &s, arg1), arg2);
             errcode = errno;
             break;
 
-          case __NR_sendfile:
+          case TARGET_LINUX_SYS_sendfile:
             {
               off_t offset;