This is the mail archive of the binutils-cvs@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] sim: callback: add human readable strings for debugging to maps


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6362a3f8757bfce133b724df2077573433823ad4

commit 6362a3f8757bfce133b724df2077573433823ad4
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Mon Jun 15 19:17:16 2015 +0545

    sim: callback: add human readable strings for debugging to maps
    
    When tracing, we often want to display the human readable name for the
    various syscall/errno values.  Rather than make each target duplicate
    the lookup, extend the existing maps to include the string directly,
    and add helper functions to look up the constants.
    
    While most targets are autogenerated (from libgloss), the bfin/cris
    targets have custom maps for the Linux ABI which need to be updated
    by hand.

Diff:
---
 include/gdb/ChangeLog     |   7 +
 include/gdb/callback.h    |   9 +
 sim/bfin/ChangeLog        |   7 +
 sim/bfin/linux-targ-map.h | 992 +++++++++++++++++++++++-----------------------
 sim/common/ChangeLog      |  10 +
 sim/common/callback.c     |  94 ++++-
 sim/common/gentmap.c      |  13 +-
 sim/cris/ChangeLog        |   5 +
 sim/cris/traps.c          | 322 +++++++--------
 9 files changed, 784 insertions(+), 675 deletions(-)

diff --git a/include/gdb/ChangeLog b/include/gdb/ChangeLog
index d36d6b8..24fe00f 100644
--- a/include/gdb/ChangeLog
+++ b/include/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2015-06-17  Mike Frysinger  <vapier@gentoo.org>
+
+	* callback.h (CB_TARGET_DEFS_MAP): Add name member.
+	(cb_host_str_syscall, cb_host_str_errno, cb_host_str_signal,
+	cb_target_str_syscall, cb_target_str_errno, cb_target_str_signal):
+	Declare.
+
 2015-03-28  James Bowman  <james.bowman@ftdichip.com>
 
 	* sim-ft32.h: New file.
diff --git a/include/gdb/callback.h b/include/gdb/callback.h
index 4628b7e..80299f1 100644
--- a/include/gdb/callback.h
+++ b/include/gdb/callback.h
@@ -59,6 +59,7 @@
    name of the symbol.  */
 
 typedef struct {
+  const char *name;
   int host_val;
   int target_val;
 } CB_TARGET_DEFS_MAP;
@@ -316,6 +317,14 @@ int cb_target_to_host_signal (host_callback *, int);
 /* Translate host signal number to target.  */
 int cb_host_to_gdb_signal (host_callback *, int);
 
+/* Translate symbols into human readable strings.  */
+const char *cb_host_str_syscall (host_callback *, int);
+const char *cb_host_str_errno (host_callback *, int);
+const char *cb_host_str_signal (host_callback *, int);
+const char *cb_target_str_syscall (host_callback *, int);
+const char *cb_target_str_errno (host_callback *, int);
+const char *cb_target_str_signal (host_callback *, int);
+
 /* Translate host stat struct to target.
    If stat struct ptr is NULL, just compute target stat struct size.
    Result is size of target stat struct or 0 if error.  */
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 5393138..eac7b33 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,10 @@
+2015-06-17  Mike Frysinger  <vapier@gentoo.org>
+
+	* linux-targ-map.h: Update example comments.
+	(cb_linux_syscall_map): Fill out name field.
+	(cb_linux_errno_map, cb_linux_open_map, cb_linux_signal_map):
+	Likewise.
+
 2015-06-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c: Expand comment on CB_SYS_xxx defines.
diff --git a/sim/bfin/linux-targ-map.h b/sim/bfin/linux-targ-map.h
index be60fec..e9c8c8f 100644
--- a/sim/bfin/linux-targ-map.h
+++ b/sim/bfin/linux-targ-map.h
@@ -7,24 +7,24 @@ echo '#include <sys/syscall.h>' | \
 bfin-uclinux-gcc -E -dD -P - | \
 sed -r -n \
     -e '1istatic CB_TARGET_DEFS_MAP cb_linux_syscall_map[] = {' \
-    -e '$i\ \ { -1, -1 }\n};' \
-    -e '/#define __NR_/{s:^.* __NR_(.*) (.*):#ifdef CB_SYS_\1\n# define TARGET_LINUX_SYS_\1 \2\n  { CB_SYS_\1, TARGET_LINUX_SYS_\1 },\n#endif:;p;}'
+    -e '$i\ \ { 0, -1, -1 }\n};' \
+    -e '/#define __NR_/{s:^.* __NR_(.*) (.*):#ifdef CB_SYS_\1\n# define TARGET_LINUX_SYS_\1 \2\n  { "\1", CB_SYS_\1, TARGET_LINUX_SYS_\1 },\n#endif:;p;}'
 echo
 
 echo '#include <errno.h>' | \
 bfin-uclinux-gcc -E -dD -P - | \
 sed -r -n \
     -e '1istatic CB_TARGET_DEFS_MAP cb_linux_errno_map[] = {' \
-    -e '$i\ \ { 0, 0 }\n};' \
-    -e '/#define E.* [0-9]/{s:^.* (E.*) (.*):#ifdef \1\n# define TARGET_LINUX_\1 \2\n  { \1, TARGET_LINUX_\1 },\n#endif:;p;}'
+    -e '$i\ \ { 0, 0, 0 }\n};' \
+    -e '/#define E.* [0-9]/{s:^.* (E.*) (.*):#ifdef \1\n# define TARGET_LINUX_\1 \2\n  { "\1", \1, TARGET_LINUX_\1 },\n#endif:;p;}'
 echo
 
 echo '#include <fcntl.h>' | \
 bfin-uclinux-gcc -E -dD -P - | \
 sed -r -n \
     -e '1istatic CB_TARGET_DEFS_MAP cb_linux_open_map[] = {' \
-    -e '$i\ \ { -1, -1 }\n};' \
-    -e '/#define O.* [0-9]/{s:^.* (O_.*) (.*):#ifdef \1\n# define TARGET_LINUX_\1 \2\n  { \1, TARGET_LINUX_\1 },\n#endif:;p;}'
+    -e '$i\ \ { 0, -1, -1 }\n};' \
+    -e '/#define O.* [0-9]/{s:^.* (O_.*) (.*):#ifdef \1\n# define TARGET_LINUX_\1 \2\n  { "\1", \1, TARGET_LINUX_\1 },\n#endif:;p;}'
 echo
 
 # XXX: nothing uses this ?
@@ -32,8 +32,8 @@ echo '#include <signal.h>' | \
 bfin-uclinux-gcc -E -dD -P - | \
 sed -r -n \
     -e '1istatic CB_TARGET_DEFS_MAP cb_linux_signal_map[] = {' \
-    -e '$i\ \ { -1, -1 }\n};' \
-    -e '/#define SIG.* [0-9]+$/{s:^.* (SIG.*) (.*):#ifdef \1\n# define TARGET_LINUX_\1 \2\n  { \1, TARGET_LINUX_\1 },\n#endif:;p;}'
+    -e '$i\ \ { 0, -1, -1 }\n};' \
+    -e '/#define SIG.* [0-9]+$/{s:^.* (SIG.*) (.*):#ifdef \1\n# define TARGET_LINUX_\1 \2\n  { "\1", \1, TARGET_LINUX_\1 },\n#endif:;p;}'
 
 exit 0
 */
@@ -43,1954 +43,1954 @@ static CB_TARGET_DEFS_MAP cb_linux_syscall_map[] =
 {
 #ifdef CB_SYS_restart_syscall
 # define TARGET_LINUX_SYS_restart_syscall 0
-  { CB_SYS_restart_syscall, TARGET_LINUX_SYS_restart_syscall },
+  { "restart_syscall", CB_SYS_restart_syscall, TARGET_LINUX_SYS_restart_syscall },
 #endif
 #ifdef CB_SYS_exit
 # define TARGET_LINUX_SYS_exit 1
-  { CB_SYS_exit, TARGET_LINUX_SYS_exit },
+  { "exit", CB_SYS_exit, TARGET_LINUX_SYS_exit },
 #endif
 #ifdef CB_SYS_fork
 # define TARGET_LINUX_SYS_fork 2
-  { CB_SYS_fork, TARGET_LINUX_SYS_fork },
+  { "fork", CB_SYS_fork, TARGET_LINUX_SYS_fork },
 #endif
 #ifdef CB_SYS_read
 # define TARGET_LINUX_SYS_read 3
-  { CB_SYS_read, TARGET_LINUX_SYS_read },
+  { "read", CB_SYS_read, TARGET_LINUX_SYS_read },
 #endif
 #ifdef CB_SYS_write
 # define TARGET_LINUX_SYS_write 4
-  { CB_SYS_write, TARGET_LINUX_SYS_write },
+  { "write", CB_SYS_write, TARGET_LINUX_SYS_write },
 #endif
 #ifdef CB_SYS_open
 # define TARGET_LINUX_SYS_open 5
-  { CB_SYS_open, TARGET_LINUX_SYS_open },
+  { "open", CB_SYS_open, TARGET_LINUX_SYS_open },
 #endif
 #ifdef CB_SYS_close
 # define TARGET_LINUX_SYS_close 6
-  { CB_SYS_close, TARGET_LINUX_SYS_close },
+  { "close", CB_SYS_close, TARGET_LINUX_SYS_close },
 #endif
 #ifdef CB_SYS_creat
 # define TARGET_LINUX_SYS_creat 8
-  { CB_SYS_creat, TARGET_LINUX_SYS_creat },
+  { "creat", CB_SYS_creat, TARGET_LINUX_SYS_creat },
 #endif
 #ifdef CB_SYS_link
 # define TARGET_LINUX_SYS_link 9
-  { CB_SYS_link, TARGET_LINUX_SYS_link },
+  { "link", CB_SYS_link, TARGET_LINUX_SYS_link },
 #endif
 #ifdef CB_SYS_unlink
 # define TARGET_LINUX_SYS_unlink 10
-  { CB_SYS_unlink, TARGET_LINUX_SYS_unlink },
+  { "unlink", CB_SYS_unlink, TARGET_LINUX_SYS_unlink },
 #endif
 #ifdef CB_SYS_execve
 # define TARGET_LINUX_SYS_execve 11
-  { CB_SYS_execve, TARGET_LINUX_SYS_execve },
+  { "execve", CB_SYS_execve, TARGET_LINUX_SYS_execve },
 #endif
 #ifdef CB_SYS_chdir
 # define TARGET_LINUX_SYS_chdir 12
-  { CB_SYS_chdir, TARGET_LINUX_SYS_chdir },
+  { "chdir", CB_SYS_chdir, TARGET_LINUX_SYS_chdir },
 #endif
 #ifdef CB_SYS_time
 # define TARGET_LINUX_SYS_time 13
-  { CB_SYS_time, TARGET_LINUX_SYS_time },
+  { "time", CB_SYS_time, TARGET_LINUX_SYS_time },
 #endif
 #ifdef CB_SYS_mknod
 # define TARGET_LINUX_SYS_mknod 14
-  { CB_SYS_mknod, TARGET_LINUX_SYS_mknod },
+  { "mknod", CB_SYS_mknod, TARGET_LINUX_SYS_mknod },
 #endif
 #ifdef CB_SYS_chmod
 # define TARGET_LINUX_SYS_chmod 15
-  { CB_SYS_chmod, TARGET_LINUX_SYS_chmod },
+  { "chmod", CB_SYS_chmod, TARGET_LINUX_SYS_chmod },
 #endif
 #ifdef CB_SYS_chown
 # define TARGET_LINUX_SYS_chown 16
-  { CB_SYS_chown, TARGET_LINUX_SYS_chown },
+  { "chown", CB_SYS_chown, TARGET_LINUX_SYS_chown },
 #endif
 #ifdef CB_SYS_lseek
 # define TARGET_LINUX_SYS_lseek 19
-  { CB_SYS_lseek, TARGET_LINUX_SYS_lseek },
+  { "lseek", CB_SYS_lseek, TARGET_LINUX_SYS_lseek },
 #endif
 #ifdef CB_SYS_getpid
 # define TARGET_LINUX_SYS_getpid 20
-  { CB_SYS_getpid, TARGET_LINUX_SYS_getpid },
+  { "getpid", CB_SYS_getpid, TARGET_LINUX_SYS_getpid },
 #endif
 #ifdef CB_SYS_mount
 # define TARGET_LINUX_SYS_mount 21
-  { CB_SYS_mount, TARGET_LINUX_SYS_mount },
+  { "mount", CB_SYS_mount, TARGET_LINUX_SYS_mount },
 #endif
 #ifdef CB_SYS_setuid
 # define TARGET_LINUX_SYS_setuid 23
-  { CB_SYS_setuid, TARGET_LINUX_SYS_setuid },
+  { "setuid", CB_SYS_setuid, TARGET_LINUX_SYS_setuid },
 #endif
 #ifdef CB_SYS_getuid
 # define TARGET_LINUX_SYS_getuid 24
-  { CB_SYS_getuid, TARGET_LINUX_SYS_getuid },
+  { "getuid", CB_SYS_getuid, TARGET_LINUX_SYS_getuid },
 #endif
 #ifdef CB_SYS_stime
 # define TARGET_LINUX_SYS_stime 25
-  { CB_SYS_stime, TARGET_LINUX_SYS_stime },
+  { "stime", CB_SYS_stime, TARGET_LINUX_SYS_stime },
 #endif
 #ifdef CB_SYS_ptrace
 # define TARGET_LINUX_SYS_ptrace 26
-  { CB_SYS_ptrace, TARGET_LINUX_SYS_ptrace },
+  { "ptrace", CB_SYS_ptrace, TARGET_LINUX_SYS_ptrace },
 #endif
 #ifdef CB_SYS_alarm
 # define TARGET_LINUX_SYS_alarm 27
-  { CB_SYS_alarm, TARGET_LINUX_SYS_alarm },
+  { "alarm", CB_SYS_alarm, TARGET_LINUX_SYS_alarm },
 #endif
 #ifdef CB_SYS_pause
 # define TARGET_LINUX_SYS_pause 29
-  { CB_SYS_pause, TARGET_LINUX_SYS_pause },
+  { "pause", CB_SYS_pause, TARGET_LINUX_SYS_pause },
 #endif
 #ifdef CB_SYS_access
 # define TARGET_LINUX_SYS_access 33
-  { CB_SYS_access, TARGET_LINUX_SYS_access },
+  { "access", CB_SYS_access, TARGET_LINUX_SYS_access },
 #endif
 #ifdef CB_SYS_nice
 # define TARGET_LINUX_SYS_nice 34
-  { CB_SYS_nice, TARGET_LINUX_SYS_nice },
+  { "nice", CB_SYS_nice, TARGET_LINUX_SYS_nice },
 #endif
 #ifdef CB_SYS_sync
 # define TARGET_LINUX_SYS_sync 36
-  { CB_SYS_sync, TARGET_LINUX_SYS_sync },
+  { "sync", CB_SYS_sync, TARGET_LINUX_SYS_sync },
 #endif
 #ifdef CB_SYS_kill
 # define TARGET_LINUX_SYS_kill 37
-  { CB_SYS_kill, TARGET_LINUX_SYS_kill },
+  { "kill", CB_SYS_kill, TARGET_LINUX_SYS_kill },
 #endif
 #ifdef CB_SYS_rename
 # define TARGET_LINUX_SYS_rename 38
-  { CB_SYS_rename, TARGET_LINUX_SYS_rename },
+  { "rename", CB_SYS_rename, TARGET_LINUX_SYS_rename },
 #endif
 #ifdef CB_SYS_mkdir
 # define TARGET_LINUX_SYS_mkdir 39
-  { CB_SYS_mkdir, TARGET_LINUX_SYS_mkdir },
+  { "mkdir", CB_SYS_mkdir, TARGET_LINUX_SYS_mkdir },
 #endif
 #ifdef CB_SYS_rmdir
 # define TARGET_LINUX_SYS_rmdir 40
-  { CB_SYS_rmdir, TARGET_LINUX_SYS_rmdir },
+  { "rmdir", CB_SYS_rmdir, TARGET_LINUX_SYS_rmdir },
 #endif
 #ifdef CB_SYS_dup
 # define TARGET_LINUX_SYS_dup 41
-  { CB_SYS_dup, TARGET_LINUX_SYS_dup },
+  { "dup", CB_SYS_dup, TARGET_LINUX_SYS_dup },
 #endif
 #ifdef CB_SYS_pipe
 # define TARGET_LINUX_SYS_pipe 42
-  { CB_SYS_pipe, TARGET_LINUX_SYS_pipe },
+  { "pipe", CB_SYS_pipe, TARGET_LINUX_SYS_pipe },
 #endif
 #ifdef CB_SYS_times
 # define TARGET_LINUX_SYS_times 43
-  { CB_SYS_times, TARGET_LINUX_SYS_times },
+  { "times", CB_SYS_times, TARGET_LINUX_SYS_times },
 #endif
 #ifdef CB_SYS_brk
 # define TARGET_LINUX_SYS_brk 45
-  { CB_SYS_brk, TARGET_LINUX_SYS_brk },
+  { "brk", CB_SYS_brk, TARGET_LINUX_SYS_brk },
 #endif
 #ifdef CB_SYS_setgid
 # define TARGET_LINUX_SYS_setgid 46
-  { CB_SYS_setgid, TARGET_LINUX_SYS_setgid },
+  { "setgid", CB_SYS_setgid, TARGET_LINUX_SYS_setgid },
 #endif
 #ifdef CB_SYS_getgid
 # define TARGET_LINUX_SYS_getgid 47
-  { CB_SYS_getgid, TARGET_LINUX_SYS_getgid },
+  { "getgid", CB_SYS_getgid, TARGET_LINUX_SYS_getgid },
 #endif
 #ifdef CB_SYS_geteuid
 # define TARGET_LINUX_SYS_geteuid 49
-  { CB_SYS_geteuid, TARGET_LINUX_SYS_geteuid },
+  { "geteuid", CB_SYS_geteuid, TARGET_LINUX_SYS_geteuid },
 #endif
 #ifdef CB_SYS_getegid
 # define TARGET_LINUX_SYS_getegid 50
-  { CB_SYS_getegid, TARGET_LINUX_SYS_getegid },
+  { "getegid", CB_SYS_getegid, TARGET_LINUX_SYS_getegid },
 #endif
 #ifdef CB_SYS_acct
 # define TARGET_LINUX_SYS_acct 51
-  { CB_SYS_acct, TARGET_LINUX_SYS_acct },
+  { "acct", CB_SYS_acct, TARGET_LINUX_SYS_acct },
 #endif
 #ifdef CB_SYS_umount2
 # define TARGET_LINUX_SYS_umount2 52
-  { CB_SYS_umount2, TARGET_LINUX_SYS_umount2 },
+  { "umount2", CB_SYS_umount2, TARGET_LINUX_SYS_umount2 },
 #endif
 #ifdef CB_SYS_ioctl
 # define TARGET_LINUX_SYS_ioctl 54
-  { CB_SYS_ioctl, TARGET_LINUX_SYS_ioctl },
+  { "ioctl", CB_SYS_ioctl, TARGET_LINUX_SYS_ioctl },
 #endif
 #ifdef CB_SYS_fcntl
 # define TARGET_LINUX_SYS_fcntl 55
-  { CB_SYS_fcntl, TARGET_LINUX_SYS_fcntl },
+  { "fcntl", CB_SYS_fcntl, TARGET_LINUX_SYS_fcntl },
 #endif
 #ifdef CB_SYS_setpgid
 # define TARGET_LINUX_SYS_setpgid 57
-  { CB_SYS_setpgid, TARGET_LINUX_SYS_setpgid },
+  { "setpgid", CB_SYS_setpgid, TARGET_LINUX_SYS_setpgid },
 #endif
 #ifdef CB_SYS_umask
 # define TARGET_LINUX_SYS_umask 60
-  { CB_SYS_umask, TARGET_LINUX_SYS_umask },
+  { "umask", CB_SYS_umask, TARGET_LINUX_SYS_umask },
 #endif
 #ifdef CB_SYS_chroot
 # define TARGET_LINUX_SYS_chroot 61
-  { CB_SYS_chroot, TARGET_LINUX_SYS_chroot },
+  { "chroot", CB_SYS_chroot, TARGET_LINUX_SYS_chroot },
 #endif
 #ifdef CB_SYS_ustat
 # define TARGET_LINUX_SYS_ustat 62
-  { CB_SYS_ustat, TARGET_LINUX_SYS_ustat },
+  { "ustat", CB_SYS_ustat, TARGET_LINUX_SYS_ustat },
 #endif
 #ifdef CB_SYS_dup2
 # define TARGET_LINUX_SYS_dup2 63
-  { CB_SYS_dup2, TARGET_LINUX_SYS_dup2 },
+  { "dup2", CB_SYS_dup2, TARGET_LINUX_SYS_dup2 },
 #endif
 #ifdef CB_SYS_getppid
 # define TARGET_LINUX_SYS_getppid 64
-  { CB_SYS_getppid, TARGET_LINUX_SYS_getppid },
+  { "getppid", CB_SYS_getppid, TARGET_LINUX_SYS_getppid },
 #endif
 #ifdef CB_SYS_getpgrp
 # define TARGET_LINUX_SYS_getpgrp 65
-  { CB_SYS_getpgrp, TARGET_LINUX_SYS_getpgrp },
+  { "getpgrp", CB_SYS_getpgrp, TARGET_LINUX_SYS_getpgrp },
 #endif
 #ifdef CB_SYS_setsid
 # define TARGET_LINUX_SYS_setsid 66
-  { CB_SYS_setsid, TARGET_LINUX_SYS_setsid },
+  { "setsid", CB_SYS_setsid, TARGET_LINUX_SYS_setsid },
 #endif
 #ifdef CB_SYS_sgetmask
 # define TARGET_LINUX_SYS_sgetmask 68
-  { CB_SYS_sgetmask, TARGET_LINUX_SYS_sgetmask },
+  { "sgetmask", CB_SYS_sgetmask, TARGET_LINUX_SYS_sgetmask },
 #endif
 #ifdef CB_SYS_ssetmask
 # define TARGET_LINUX_SYS_ssetmask 69
-  { CB_SYS_ssetmask, TARGET_LINUX_SYS_ssetmask },
+  { "ssetmask", CB_SYS_ssetmask, TARGET_LINUX_SYS_ssetmask },
 #endif
 #ifdef CB_SYS_setreuid
 # define TARGET_LINUX_SYS_setreuid 70
-  { CB_SYS_setreuid, TARGET_LINUX_SYS_setreuid },
+  { "setreuid", CB_SYS_setreuid, TARGET_LINUX_SYS_setreuid },
 #endif
 #ifdef CB_SYS_setregid
 # define TARGET_LINUX_SYS_setregid 71
-  { CB_SYS_setregid, TARGET_LINUX_SYS_setregid },
+  { "setregid", CB_SYS_setregid, TARGET_LINUX_SYS_setregid },
 #endif
 #ifdef CB_SYS_sethostname
 # define TARGET_LINUX_SYS_sethostname 74
-  { CB_SYS_sethostname, TARGET_LINUX_SYS_sethostname },
+  { "sethostname", CB_SYS_sethostname, TARGET_LINUX_SYS_sethostname },
 #endif
 #ifdef CB_SYS_setrlimit
 # define TARGET_LINUX_SYS_setrlimit 75
-  { CB_SYS_setrlimit, TARGET_LINUX_SYS_setrlimit },
+  { "setrlimit", CB_SYS_setrlimit, TARGET_LINUX_SYS_setrlimit },
 #endif
 #ifdef CB_SYS_getrusage
 # define TARGET_LINUX_SYS_getrusage 77
-  { CB_SYS_getrusage, TARGET_LINUX_SYS_getrusage },
+  { "getrusage", CB_SYS_getrusage, TARGET_LINUX_SYS_getrusage },
 #endif
 #ifdef CB_SYS_gettimeofday
 # define TARGET_LINUX_SYS_gettimeofday 78
-  { CB_SYS_gettimeofday, TARGET_LINUX_SYS_gettimeofday },
+  { "gettimeofday", CB_SYS_gettimeofday, TARGET_LINUX_SYS_gettimeofday },
 #endif
 #ifdef CB_SYS_settimeofday
 # define TARGET_LINUX_SYS_settimeofday 79
-  { CB_SYS_settimeofday, TARGET_LINUX_SYS_settimeofday },
+  { "settimeofday", CB_SYS_settimeofday, TARGET_LINUX_SYS_settimeofday },
 #endif
 #ifdef CB_SYS_getgroups
 # define TARGET_LINUX_SYS_getgroups 80
-  { CB_SYS_getgroups, TARGET_LINUX_SYS_getgroups },
+  { "getgroups", CB_SYS_getgroups, TARGET_LINUX_SYS_getgroups },
 #endif
 #ifdef CB_SYS_setgroups
 # define TARGET_LINUX_SYS_setgroups 81
-  { CB_SYS_setgroups, TARGET_LINUX_SYS_setgroups },
+  { "setgroups", CB_SYS_setgroups, TARGET_LINUX_SYS_setgroups },
 #endif
 #ifdef CB_SYS_symlink
 # define TARGET_LINUX_SYS_symlink 83
-  { CB_SYS_symlink, TARGET_LINUX_SYS_symlink },
+  { "symlink", CB_SYS_symlink, TARGET_LINUX_SYS_symlink },
 #endif
 #ifdef CB_SYS_readlink
 # define TARGET_LINUX_SYS_readlink 85
-  { CB_SYS_readlink, TARGET_LINUX_SYS_readlink },
+  { "readlink", CB_SYS_readlink, TARGET_LINUX_SYS_readlink },
 #endif
 #ifdef CB_SYS_reboot
 # define TARGET_LINUX_SYS_reboot 88
-  { CB_SYS_reboot, TARGET_LINUX_SYS_reboot },
+  { "reboot", CB_SYS_reboot, TARGET_LINUX_SYS_reboot },
 #endif
 #ifdef CB_SYS_munmap
 # define TARGET_LINUX_SYS_munmap 91
-  { CB_SYS_munmap, TARGET_LINUX_SYS_munmap },
+  { "munmap", CB_SYS_munmap, TARGET_LINUX_SYS_munmap },
 #endif
 #ifdef CB_SYS_truncate
 # define TARGET_LINUX_SYS_truncate 92
-  { CB_SYS_truncate, TARGET_LINUX_SYS_truncate },
+  { "truncate", CB_SYS_truncate, TARGET_LINUX_SYS_truncate },
 #endif
 #ifdef CB_SYS_ftruncate
 # define TARGET_LINUX_SYS_ftruncate 93
-  { CB_SYS_ftruncate, TARGET_LINUX_SYS_ftruncate },
+  { "ftruncate", CB_SYS_ftruncate, TARGET_LINUX_SYS_ftruncate },
 #endif
 #ifdef CB_SYS_fchmod
 # define TARGET_LINUX_SYS_fchmod 94
-  { CB_SYS_fchmod, TARGET_LINUX_SYS_fchmod },
+  { "fchmod", CB_SYS_fchmod, TARGET_LINUX_SYS_fchmod },
 #endif
 #ifdef CB_SYS_fchown
 # define TARGET_LINUX_SYS_fchown 95
-  { CB_SYS_fchown, TARGET_LINUX_SYS_fchown },
+  { "fchown", CB_SYS_fchown, TARGET_LINUX_SYS_fchown },
 #endif
 #ifdef CB_SYS_getpriority
 # define TARGET_LINUX_SYS_getpriority 96
-  { CB_SYS_getpriority, TARGET_LINUX_SYS_getpriority },
+  { "getpriority", CB_SYS_getpriority, TARGET_LINUX_SYS_getpriority },
 #endif
 #ifdef CB_SYS_setpriority
 # define TARGET_LINUX_SYS_setpriority 97
-  { CB_SYS_setpriority, TARGET_LINUX_SYS_setpriority },
+  { "setpriority", CB_SYS_setpriority, TARGET_LINUX_SYS_setpriority },
 #endif
 #ifdef CB_SYS_statfs
 # define TARGET_LINUX_SYS_statfs 99
-  { CB_SYS_statfs, TARGET_LINUX_SYS_statfs },
+  { "statfs", CB_SYS_statfs, TARGET_LINUX_SYS_statfs },
 #endif
 #ifdef CB_SYS_fstatfs
 # define TARGET_LINUX_SYS_fstatfs 100
-  { CB_SYS_fstatfs, TARGET_LINUX_SYS_fstatfs },
+  { "fstatfs", CB_SYS_fstatfs, TARGET_LINUX_SYS_fstatfs },
 #endif
 #ifdef CB_SYS_syslog
 # define TARGET_LINUX_SYS_syslog 103
-  { CB_SYS_syslog, TARGET_LINUX_SYS_syslog },
+  { "syslog", CB_SYS_syslog, TARGET_LINUX_SYS_syslog },
 #endif
 #ifdef CB_SYS_setitimer
 # define TARGET_LINUX_SYS_setitimer 104
-  { CB_SYS_setitimer, TARGET_LINUX_SYS_setitimer },
+  { "setitimer", CB_SYS_setitimer, TARGET_LINUX_SYS_setitimer },
 #endif
 #ifdef CB_SYS_getitimer
 # define TARGET_LINUX_SYS_getitimer 105
-  { CB_SYS_getitimer, TARGET_LINUX_SYS_getitimer },
+  { "getitimer", CB_SYS_getitimer, TARGET_LINUX_SYS_getitimer },
 #endif
 #ifdef CB_SYS_stat
 # define TARGET_LINUX_SYS_stat 106
-  { CB_SYS_stat, TARGET_LINUX_SYS_stat },
+  { "stat", CB_SYS_stat, TARGET_LINUX_SYS_stat },
 #endif
 #ifdef CB_SYS_lstat
 # define TARGET_LINUX_SYS_lstat 107
-  { CB_SYS_lstat, TARGET_LINUX_SYS_lstat },
+  { "lstat", CB_SYS_lstat, TARGET_LINUX_SYS_lstat },
 #endif
 #ifdef CB_SYS_fstat
 # define TARGET_LINUX_SYS_fstat 108
-  { CB_SYS_fstat, TARGET_LINUX_SYS_fstat },
+  { "fstat", CB_SYS_fstat, TARGET_LINUX_SYS_fstat },
 #endif
 #ifdef CB_SYS_vhangup
 # define TARGET_LINUX_SYS_vhangup 111
-  { CB_SYS_vhangup, TARGET_LINUX_SYS_vhangup },
+  { "vhangup", CB_SYS_vhangup, TARGET_LINUX_SYS_vhangup },
 #endif
 #ifdef CB_SYS_wait4
 # define TARGET_LINUX_SYS_wait4 114
-  { CB_SYS_wait4, TARGET_LINUX_SYS_wait4 },
+  { "wait4", CB_SYS_wait4, TARGET_LINUX_SYS_wait4 },
 #endif
 #ifdef CB_SYS_sysinfo
 # define TARGET_LINUX_SYS_sysinfo 116
-  { CB_SYS_sysinfo, TARGET_LINUX_SYS_sysinfo },
+  { "sysinfo", CB_SYS_sysinfo, TARGET_LINUX_SYS_sysinfo },
 #endif
 #ifdef CB_SYS_fsync
 # define TARGET_LINUX_SYS_fsync 118
-  { CB_SYS_fsync, TARGET_LINUX_SYS_fsync },
+  { "fsync", CB_SYS_fsync, TARGET_LINUX_SYS_fsync },
 #endif
 #ifdef CB_SYS_clone
 # define TARGET_LINUX_SYS_clone 120
-  { CB_SYS_clone, TARGET_LINUX_SYS_clone },
+  { "clone", CB_SYS_clone, TARGET_LINUX_SYS_clone },
 #endif
 #ifdef CB_SYS_setdomainname
 # define TARGET_LINUX_SYS_setdomainname 121
-  { CB_SYS_setdomainname, TARGET_LINUX_SYS_setdomainname },
+  { "setdomainname", CB_SYS_setdomainname, TARGET_LINUX_SYS_setdomainname },
 #endif
 #ifdef CB_SYS_uname
 # define TARGET_LINUX_SYS_uname 122
-  { CB_SYS_uname, TARGET_LINUX_SYS_uname },
+  { "uname", CB_SYS_uname, TARGET_LINUX_SYS_uname },
 #endif
 #ifdef CB_SYS_adjtimex
 # define TARGET_LINUX_SYS_adjtimex 124
-  { CB_SYS_adjtimex, TARGET_LINUX_SYS_adjtimex },
+  { "adjtimex", CB_SYS_adjtimex, TARGET_LINUX_SYS_adjtimex },
 #endif
 #ifdef CB_SYS_mprotect
 # define TARGET_LINUX_SYS_mprotect 125
-  { CB_SYS_mprotect, TARGET_LINUX_SYS_mprotect },
+  { "mprotect", CB_SYS_mprotect, TARGET_LINUX_SYS_mprotect },
 #endif
 #ifdef CB_SYS_init_module
 # define TARGET_LINUX_SYS_init_module 128
-  { CB_SYS_init_module, TARGET_LINUX_SYS_init_module },
+  { "init_module", CB_SYS_init_module, TARGET_LINUX_SYS_init_module },
 #endif
 #ifdef CB_SYS_delete_module
 # define TARGET_LINUX_SYS_delete_module 129
-  { CB_SYS_delete_module, TARGET_LINUX_SYS_delete_module },
+  { "delete_module", CB_SYS_delete_module, TARGET_LINUX_SYS_delete_module },
 #endif
 #ifdef CB_SYS_quotactl
 # define TARGET_LINUX_SYS_quotactl 131
-  { CB_SYS_quotactl, TARGET_LINUX_SYS_quotactl },
+  { "quotactl", CB_SYS_quotactl, TARGET_LINUX_SYS_quotactl },
 #endif
 #ifdef CB_SYS_getpgid
 # define TARGET_LINUX_SYS_getpgid 132
-  { CB_SYS_getpgid, TARGET_LINUX_SYS_getpgid },
+  { "getpgid", CB_SYS_getpgid, TARGET_LINUX_SYS_getpgid },
 #endif
 #ifdef CB_SYS_fchdir
 # define TARGET_LINUX_SYS_fchdir 133
-  { CB_SYS_fchdir, TARGET_LINUX_SYS_fchdir },
+  { "fchdir", CB_SYS_fchdir, TARGET_LINUX_SYS_fchdir },
 #endif
 #ifdef CB_SYS_bdflush
 # define TARGET_LINUX_SYS_bdflush 134
-  { CB_SYS_bdflush, TARGET_LINUX_SYS_bdflush },
+  { "bdflush", CB_SYS_bdflush, TARGET_LINUX_SYS_bdflush },
 #endif
 #ifdef CB_SYS_personality
 # define TARGET_LINUX_SYS_personality 136
-  { CB_SYS_personality, TARGET_LINUX_SYS_personality },
+  { "personality", CB_SYS_personality, TARGET_LINUX_SYS_personality },
 #endif
 #ifdef CB_SYS_setfsuid
 # define TARGET_LINUX_SYS_setfsuid 138
-  { CB_SYS_setfsuid, TARGET_LINUX_SYS_setfsuid },
+  { "setfsuid", CB_SYS_setfsuid, TARGET_LINUX_SYS_setfsuid },
 #endif
 #ifdef CB_SYS_setfsgid
 # define TARGET_LINUX_SYS_setfsgid 139
-  { CB_SYS_setfsgid, TARGET_LINUX_SYS_setfsgid },
+  { "setfsgid", CB_SYS_setfsgid, TARGET_LINUX_SYS_setfsgid },
 #endif
 #ifdef CB_SYS__llseek
 # define TARGET_LINUX_SYS__llseek 140
-  { CB_SYS__llseek, TARGET_LINUX_SYS__llseek },
+  { "_llseek", CB_SYS__llseek, TARGET_LINUX_SYS__llseek },
 #endif
 #ifdef CB_SYS_getdents
 # define TARGET_LINUX_SYS_getdents 141
-  { CB_SYS_getdents, TARGET_LINUX_SYS_getdents },
+  { "getdents", CB_SYS_getdents, TARGET_LINUX_SYS_getdents },
 #endif
 #ifdef CB_SYS_flock
 # define TARGET_LINUX_SYS_flock 143
-  { CB_SYS_flock, TARGET_LINUX_SYS_flock },
+  { "flock", CB_SYS_flock, TARGET_LINUX_SYS_flock },
 #endif
 #ifdef CB_SYS_readv
 # define TARGET_LINUX_SYS_readv 145
-  { CB_SYS_readv, TARGET_LINUX_SYS_readv },
+  { "readv", CB_SYS_readv, TARGET_LINUX_SYS_readv },
 #endif
 #ifdef CB_SYS_writev
 # define TARGET_LINUX_SYS_writev 146
-  { CB_SYS_writev, TARGET_LINUX_SYS_writev },
+  { "writev", CB_SYS_writev, TARGET_LINUX_SYS_writev },
 #endif
 #ifdef CB_SYS_getsid
 # define TARGET_LINUX_SYS_getsid 147
-  { CB_SYS_getsid, TARGET_LINUX_SYS_getsid },
+  { "getsid", CB_SYS_getsid, TARGET_LINUX_SYS_getsid },
 #endif
 #ifdef CB_SYS_fdatasync
 # define TARGET_LINUX_SYS_fdatasync 148
-  { CB_SYS_fdatasync, TARGET_LINUX_SYS_fdatasync },
+  { "fdatasync", CB_SYS_fdatasync, TARGET_LINUX_SYS_fdatasync },
 #endif
 #ifdef CB_SYS__sysctl
 # define TARGET_LINUX_SYS__sysctl 149
-  { CB_SYS__sysctl, TARGET_LINUX_SYS__sysctl },
+  { "_sysctl", CB_SYS__sysctl, TARGET_LINUX_SYS__sysctl },
 #endif
 #ifdef CB_SYS_sched_setparam
 # define TARGET_LINUX_SYS_sched_setparam 154
-  { CB_SYS_sched_setparam, TARGET_LINUX_SYS_sched_setparam },
+  { "sched_setparam", CB_SYS_sched_setparam, TARGET_LINUX_SYS_sched_setparam },
 #endif
 #ifdef CB_SYS_sched_getparam
 # define TARGET_LINUX_SYS_sched_getparam 155
-  { CB_SYS_sched_getparam, TARGET_LINUX_SYS_sched_getparam },
+  { "sched_getparam", CB_SYS_sched_getparam, TARGET_LINUX_SYS_sched_getparam },
 #endif
 #ifdef CB_SYS_sched_setscheduler
 # define TARGET_LINUX_SYS_sched_setscheduler 156
-  { CB_SYS_sched_setscheduler, TARGET_LINUX_SYS_sched_setscheduler },
+  { "sched_setscheduler", CB_SYS_sched_setscheduler, TARGET_LINUX_SYS_sched_setscheduler },
 #endif
 #ifdef CB_SYS_sched_getscheduler
 # define TARGET_LINUX_SYS_sched_getscheduler 157
-  { CB_SYS_sched_getscheduler, TARGET_LINUX_SYS_sched_getscheduler },
+  { "sched_getscheduler", CB_SYS_sched_getscheduler, TARGET_LINUX_SYS_sched_getscheduler },
 #endif
 #ifdef CB_SYS_sched_yield
 # define TARGET_LINUX_SYS_sched_yield 158
-  { CB_SYS_sched_yield, TARGET_LINUX_SYS_sched_yield },
+  { "sched_yield", CB_SYS_sched_yield, TARGET_LINUX_SYS_sched_yield },
 #endif
 #ifdef CB_SYS_sched_get_priority_max
 # define TARGET_LINUX_SYS_sched_get_priority_max 159
-  { CB_SYS_sched_get_priority_max, TARGET_LINUX_SYS_sched_get_priority_max },
+  { "sched_get_priority_max", CB_SYS_sched_get_priority_max, TARGET_LINUX_SYS_sched_get_priority_max },
 #endif
 #ifdef CB_SYS_sched_get_priority_min
 # define TARGET_LINUX_SYS_sched_get_priority_min 160
-  { CB_SYS_sched_get_priority_min, TARGET_LINUX_SYS_sched_get_priority_min },
+  { "sched_get_priority_min", CB_SYS_sched_get_priority_min, TARGET_LINUX_SYS_sched_get_priority_min },
 #endif
 #ifdef CB_SYS_sched_rr_get_interval
 # define TARGET_LINUX_SYS_sched_rr_get_interval 161
-  { CB_SYS_sched_rr_get_interval, TARGET_LINUX_SYS_sched_rr_get_interval },
+  { "sched_rr_get_interval", CB_SYS_sched_rr_get_interval, TARGET_LINUX_SYS_sched_rr_get_interval },
 #endif
 #ifdef CB_SYS_nanosleep
 # define TARGET_LINUX_SYS_nanosleep 162
-  { CB_SYS_nanosleep, TARGET_LINUX_SYS_nanosleep },
+  { "nanosleep", CB_SYS_nanosleep, TARGET_LINUX_SYS_nanosleep },
 #endif
 #ifdef CB_SYS_mremap
 # define TARGET_LINUX_SYS_mremap 163
-  { CB_SYS_mremap, TARGET_LINUX_SYS_mremap },
+  { "mremap", CB_SYS_mremap, TARGET_LINUX_SYS_mremap },
 #endif
 #ifdef CB_SYS_setresuid
 # define TARGET_LINUX_SYS_setresuid 164
-  { CB_SYS_setresuid, TARGET_LINUX_SYS_setresuid },
+  { "setresuid", CB_SYS_setresuid, TARGET_LINUX_SYS_setresuid },
 #endif
 #ifdef CB_SYS_getresuid
 # define TARGET_LINUX_SYS_getresuid 165
-  { CB_SYS_getresuid, TARGET_LINUX_SYS_getresuid },
+  { "getresuid", CB_SYS_getresuid, TARGET_LINUX_SYS_getresuid },
 #endif
 #ifdef CB_SYS_nfsservctl
 # define TARGET_LINUX_SYS_nfsservctl 169
-  { CB_SYS_nfsservctl, TARGET_LINUX_SYS_nfsservctl },
+  { "nfsservctl", CB_SYS_nfsservctl, TARGET_LINUX_SYS_nfsservctl },
 #endif
 #ifdef CB_SYS_setresgid
 # define TARGET_LINUX_SYS_setresgid 170
-  { CB_SYS_setresgid, TARGET_LINUX_SYS_setresgid },
+  { "setresgid", CB_SYS_setresgid, TARGET_LINUX_SYS_setresgid },
 #endif
 #ifdef CB_SYS_getresgid
 # define TARGET_LINUX_SYS_getresgid 171
-  { CB_SYS_getresgid, TARGET_LINUX_SYS_getresgid },
+  { "getresgid", CB_SYS_getresgid, TARGET_LINUX_SYS_getresgid },
 #endif
 #ifdef CB_SYS_prctl
 # define TARGET_LINUX_SYS_prctl 172
-  { CB_SYS_prctl, TARGET_LINUX_SYS_prctl },
+  { "prctl", CB_SYS_prctl, TARGET_LINUX_SYS_prctl },
 #endif
 #ifdef CB_SYS_rt_sigreturn
 # define TARGET_LINUX_SYS_rt_sigreturn 173
-  { CB_SYS_rt_sigreturn, TARGET_LINUX_SYS_rt_sigreturn },
+  { "rt_sigreturn", CB_SYS_rt_sigreturn, TARGET_LINUX_SYS_rt_sigreturn },
 #endif
 #ifdef CB_SYS_rt_sigaction
 # define TARGET_LINUX_SYS_rt_sigaction 174
-  { CB_SYS_rt_sigaction, TARGET_LINUX_SYS_rt_sigaction },
+  { "rt_sigaction", CB_SYS_rt_sigaction, TARGET_LINUX_SYS_rt_sigaction },
 #endif
 #ifdef CB_SYS_rt_sigprocmask
 # define TARGET_LINUX_SYS_rt_sigprocmask 175
-  { CB_SYS_rt_sigprocmask, TARGET_LINUX_SYS_rt_sigprocmask },
+  { "rt_sigprocmask", CB_SYS_rt_sigprocmask, TARGET_LINUX_SYS_rt_sigprocmask },
 #endif
 #ifdef CB_SYS_rt_sigpending
 # define TARGET_LINUX_SYS_rt_sigpending 176
-  { CB_SYS_rt_sigpending, TARGET_LINUX_SYS_rt_sigpending },
+  { "rt_sigpending", CB_SYS_rt_sigpending, TARGET_LINUX_SYS_rt_sigpending },
 #endif
 #ifdef CB_SYS_rt_sigtimedwait
 # define TARGET_LINUX_SYS_rt_sigtimedwait 177
-  { CB_SYS_rt_sigtimedwait, TARGET_LINUX_SYS_rt_sigtimedwait },
+  { "rt_sigtimedwait", CB_SYS_rt_sigtimedwait, TARGET_LINUX_SYS_rt_sigtimedwait },
 #endif
 #ifdef CB_SYS_rt_sigqueueinfo
 # define TARGET_LINUX_SYS_rt_sigqueueinfo 178
-  { CB_SYS_rt_sigqueueinfo, TARGET_LINUX_SYS_rt_sigqueueinfo },
+  { "rt_sigqueueinfo", CB_SYS_rt_sigqueueinfo, TARGET_LINUX_SYS_rt_sigqueueinfo },
 #endif
 #ifdef CB_SYS_rt_sigsuspend
 # define TARGET_LINUX_SYS_rt_sigsuspend 179
-  { CB_SYS_rt_sigsuspend, TARGET_LINUX_SYS_rt_sigsuspend },
+  { "rt_sigsuspend", CB_SYS_rt_sigsuspend, TARGET_LINUX_SYS_rt_sigsuspend },
 #endif
 #ifdef CB_SYS_pread
 # define TARGET_LINUX_SYS_pread 180
-  { CB_SYS_pread, TARGET_LINUX_SYS_pread },
+  { "pread", CB_SYS_pread, TARGET_LINUX_SYS_pread },
 #endif
 #ifdef CB_SYS_pwrite
 # define TARGET_LINUX_SYS_pwrite 181
-  { CB_SYS_pwrite, TARGET_LINUX_SYS_pwrite },
+  { "pwrite", CB_SYS_pwrite, TARGET_LINUX_SYS_pwrite },
 #endif
 #ifdef CB_SYS_lchown
 # define TARGET_LINUX_SYS_lchown 182
-  { CB_SYS_lchown, TARGET_LINUX_SYS_lchown },
+  { "lchown", CB_SYS_lchown, TARGET_LINUX_SYS_lchown },
 #endif
 #ifdef CB_SYS_getcwd
 # define TARGET_LINUX_SYS_getcwd 183
-  { CB_SYS_getcwd, TARGET_LINUX_SYS_getcwd },
+  { "getcwd", CB_SYS_getcwd, TARGET_LINUX_SYS_getcwd },
 #endif
 #ifdef CB_SYS_capget
 # define TARGET_LINUX_SYS_capget 184
-  { CB_SYS_capget, TARGET_LINUX_SYS_capget },
+  { "capget", CB_SYS_capget, TARGET_LINUX_SYS_capget },
 #endif
 #ifdef CB_SYS_capset
 # define TARGET_LINUX_SYS_capset 185
-  { CB_SYS_capset, TARGET_LINUX_SYS_capset },
+  { "capset", CB_SYS_capset, TARGET_LINUX_SYS_capset },
 #endif
 #ifdef CB_SYS_sigaltstack
 # define TARGET_LINUX_SYS_sigaltstack 186
-  { CB_SYS_sigaltstack, TARGET_LINUX_SYS_sigaltstack },
+  { "sigaltstack", CB_SYS_sigaltstack, TARGET_LINUX_SYS_sigaltstack },
 #endif
 #ifdef CB_SYS_sendfile
 # define TARGET_LINUX_SYS_sendfile 187
-  { CB_SYS_sendfile, TARGET_LINUX_SYS_sendfile },
+  { "sendfile", CB_SYS_sendfile, TARGET_LINUX_SYS_sendfile },
 #endif
 #ifdef CB_SYS_vfork
 # define TARGET_LINUX_SYS_vfork 190
-  { CB_SYS_vfork, TARGET_LINUX_SYS_vfork },
+  { "vfork", CB_SYS_vfork, TARGET_LINUX_SYS_vfork },
 #endif
 #ifdef CB_SYS_getrlimit
 # define TARGET_LINUX_SYS_getrlimit 191
-  { CB_SYS_getrlimit, TARGET_LINUX_SYS_getrlimit },
+  { "getrlimit", CB_SYS_getrlimit, TARGET_LINUX_SYS_getrlimit },
 #endif
 #ifdef CB_SYS_mmap2
 # define TARGET_LINUX_SYS_mmap2 192
-  { CB_SYS_mmap2, TARGET_LINUX_SYS_mmap2 },
+  { "mmap2", CB_SYS_mmap2, TARGET_LINUX_SYS_mmap2 },
 #endif
 #ifdef CB_SYS_truncate64
 # define TARGET_LINUX_SYS_truncate64 193
-  { CB_SYS_truncate64, TARGET_LINUX_SYS_truncate64 },
+  { "truncate64", CB_SYS_truncate64, TARGET_LINUX_SYS_truncate64 },
 #endif
 #ifdef CB_SYS_ftruncate64
 # define TARGET_LINUX_SYS_ftruncate64 194
-  { CB_SYS_ftruncate64, TARGET_LINUX_SYS_ftruncate64 },
+  { "ftruncate64", CB_SYS_ftruncate64, TARGET_LINUX_SYS_ftruncate64 },
 #endif
 #ifdef CB_SYS_stat64
 # define TARGET_LINUX_SYS_stat64 195
-  { CB_SYS_stat64, TARGET_LINUX_SYS_stat64 },
+  { "stat64", CB_SYS_stat64, TARGET_LINUX_SYS_stat64 },
 #endif
 #ifdef CB_SYS_lstat64
 # define TARGET_LINUX_SYS_lstat64 196
-  { CB_SYS_lstat64, TARGET_LINUX_SYS_lstat64 },
+  { "lstat64", CB_SYS_lstat64, TARGET_LINUX_SYS_lstat64 },
 #endif
 #ifdef CB_SYS_fstat64
 # define TARGET_LINUX_SYS_fstat64 197
-  { CB_SYS_fstat64, TARGET_LINUX_SYS_fstat64 },
+  { "fstat64", CB_SYS_fstat64, TARGET_LINUX_SYS_fstat64 },
 #endif
 #ifdef CB_SYS_chown32
 # define TARGET_LINUX_SYS_chown32 198
-  { CB_SYS_chown32, TARGET_LINUX_SYS_chown32 },
+  { "chown32", CB_SYS_chown32, TARGET_LINUX_SYS_chown32 },
 #endif
 #ifdef CB_SYS_getuid32
 # define TARGET_LINUX_SYS_getuid32 199
-  { CB_SYS_getuid32, TARGET_LINUX_SYS_getuid32 },
+  { "getuid32", CB_SYS_getuid32, TARGET_LINUX_SYS_getuid32 },
 #endif
 #ifdef CB_SYS_getgid32
 # define TARGET_LINUX_SYS_getgid32 200
-  { CB_SYS_getgid32, TARGET_LINUX_SYS_getgid32 },
+  { "getgid32", CB_SYS_getgid32, TARGET_LINUX_SYS_getgid32 },
 #endif
 #ifdef CB_SYS_geteuid32
 # define TARGET_LINUX_SYS_geteuid32 201
-  { CB_SYS_geteuid32, TARGET_LINUX_SYS_geteuid32 },
+  { "geteuid32", CB_SYS_geteuid32, TARGET_LINUX_SYS_geteuid32 },
 #endif
 #ifdef CB_SYS_getegid32
 # define TARGET_LINUX_SYS_getegid32 202
-  { CB_SYS_getegid32, TARGET_LINUX_SYS_getegid32 },
+  { "getegid32", CB_SYS_getegid32, TARGET_LINUX_SYS_getegid32 },
 #endif
 #ifdef CB_SYS_setreuid32
 # define TARGET_LINUX_SYS_setreuid32 203
-  { CB_SYS_setreuid32, TARGET_LINUX_SYS_setreuid32 },
+  { "setreuid32", CB_SYS_setreuid32, TARGET_LINUX_SYS_setreuid32 },
 #endif
 #ifdef CB_SYS_setregid32
 # define TARGET_LINUX_SYS_setregid32 204
-  { CB_SYS_setregid32, TARGET_LINUX_SYS_setregid32 },
+  { "setregid32", CB_SYS_setregid32, TARGET_LINUX_SYS_setregid32 },
 #endif
 #ifdef CB_SYS_getgroups32
 # define TARGET_LINUX_SYS_getgroups32 205
-  { CB_SYS_getgroups32, TARGET_LINUX_SYS_getgroups32 },
+  { "getgroups32", CB_SYS_getgroups32, TARGET_LINUX_SYS_getgroups32 },
 #endif
 #ifdef CB_SYS_setgroups32
 # define TARGET_LINUX_SYS_setgroups32 206
-  { CB_SYS_setgroups32, TARGET_LINUX_SYS_setgroups32 },
+  { "setgroups32", CB_SYS_setgroups32, TARGET_LINUX_SYS_setgroups32 },
 #endif
 #ifdef CB_SYS_fchown32
 # define TARGET_LINUX_SYS_fchown32 207
-  { CB_SYS_fchown32, TARGET_LINUX_SYS_fchown32 },
+  { "fchown32", CB_SYS_fchown32, TARGET_LINUX_SYS_fchown32 },
 #endif
 #ifdef CB_SYS_setresuid32
 # define TARGET_LINUX_SYS_setresuid32 208
-  { CB_SYS_setresuid32, TARGET_LINUX_SYS_setresuid32 },
+  { "setresuid32", CB_SYS_setresuid32, TARGET_LINUX_SYS_setresuid32 },
 #endif
 #ifdef CB_SYS_getresuid32
 # define TARGET_LINUX_SYS_getresuid32 209
-  { CB_SYS_getresuid32, TARGET_LINUX_SYS_getresuid32 },
+  { "getresuid32", CB_SYS_getresuid32, TARGET_LINUX_SYS_getresuid32 },
 #endif
 #ifdef CB_SYS_setresgid32
 # define TARGET_LINUX_SYS_setresgid32 210
-  { CB_SYS_setresgid32, TARGET_LINUX_SYS_setresgid32 },
+  { "setresgid32", CB_SYS_setresgid32, TARGET_LINUX_SYS_setresgid32 },
 #endif
 #ifdef CB_SYS_getresgid32
 # define TARGET_LINUX_SYS_getresgid32 211
-  { CB_SYS_getresgid32, TARGET_LINUX_SYS_getresgid32 },
+  { "getresgid32", CB_SYS_getresgid32, TARGET_LINUX_SYS_getresgid32 },
 #endif
 #ifdef CB_SYS_lchown32
 # define TARGET_LINUX_SYS_lchown32 212
-  { CB_SYS_lchown32, TARGET_LINUX_SYS_lchown32 },
+  { "lchown32", CB_SYS_lchown32, TARGET_LINUX_SYS_lchown32 },
 #endif
 #ifdef CB_SYS_setuid32
 # define TARGET_LINUX_SYS_setuid32 213
-  { CB_SYS_setuid32, TARGET_LINUX_SYS_setuid32 },
+  { "setuid32", CB_SYS_setuid32, TARGET_LINUX_SYS_setuid32 },
 #endif
 #ifdef CB_SYS_setgid32
 # define TARGET_LINUX_SYS_setgid32 214
-  { CB_SYS_setgid32, TARGET_LINUX_SYS_setgid32 },
+  { "setgid32", CB_SYS_setgid32, TARGET_LINUX_SYS_setgid32 },
 #endif
 #ifdef CB_SYS_setfsuid32
 # define TARGET_LINUX_SYS_setfsuid32 215
-  { CB_SYS_setfsuid32, TARGET_LINUX_SYS_setfsuid32 },
+  { "setfsuid32", CB_SYS_setfsuid32, TARGET_LINUX_SYS_setfsuid32 },
 #endif
 #ifdef CB_SYS_setfsgid32
 # define TARGET_LINUX_SYS_setfsgid32 216
-  { CB_SYS_setfsgid32, TARGET_LINUX_SYS_setfsgid32 },
+  { "setfsgid32", CB_SYS_setfsgid32, TARGET_LINUX_SYS_setfsgid32 },
 #endif
 #ifdef CB_SYS_pivot_root
 # define TARGET_LINUX_SYS_pivot_root 217
-  { CB_SYS_pivot_root, TARGET_LINUX_SYS_pivot_root },
+  { "pivot_root", CB_SYS_pivot_root, TARGET_LINUX_SYS_pivot_root },
 #endif
 #ifdef CB_SYS_getdents64
 # define TARGET_LINUX_SYS_getdents64 220
-  { CB_SYS_getdents64, TARGET_LINUX_SYS_getdents64 },
+  { "getdents64", CB_SYS_getdents64, TARGET_LINUX_SYS_getdents64 },
 #endif
 #ifdef CB_SYS_fcntl64
 # define TARGET_LINUX_SYS_fcntl64 221
-  { CB_SYS_fcntl64, TARGET_LINUX_SYS_fcntl64 },
+  { "fcntl64", CB_SYS_fcntl64, TARGET_LINUX_SYS_fcntl64 },
 #endif
 #ifdef CB_SYS_gettid
 # define TARGET_LINUX_SYS_gettid 224
-  { CB_SYS_gettid, TARGET_LINUX_SYS_gettid },
+  { "gettid", CB_SYS_gettid, TARGET_LINUX_SYS_gettid },
 #endif
 #ifdef CB_SYS_readahead
 # define TARGET_LINUX_SYS_readahead 225
-  { CB_SYS_readahead, TARGET_LINUX_SYS_readahead },
+  { "readahead", CB_SYS_readahead, TARGET_LINUX_SYS_readahead },
 #endif
 #ifdef CB_SYS_setxattr
 # define TARGET_LINUX_SYS_setxattr 226
-  { CB_SYS_setxattr, TARGET_LINUX_SYS_setxattr },
+  { "setxattr", CB_SYS_setxattr, TARGET_LINUX_SYS_setxattr },
 #endif
 #ifdef CB_SYS_lsetxattr
 # define TARGET_LINUX_SYS_lsetxattr 227
-  { CB_SYS_lsetxattr, TARGET_LINUX_SYS_lsetxattr },
+  { "lsetxattr", CB_SYS_lsetxattr, TARGET_LINUX_SYS_lsetxattr },
 #endif
 #ifdef CB_SYS_fsetxattr
 # define TARGET_LINUX_SYS_fsetxattr 228
-  { CB_SYS_fsetxattr, TARGET_LINUX_SYS_fsetxattr },
+  { "fsetxattr", CB_SYS_fsetxattr, TARGET_LINUX_SYS_fsetxattr },
 #endif
 #ifdef CB_SYS_getxattr
 # define TARGET_LINUX_SYS_getxattr 229
-  { CB_SYS_getxattr, TARGET_LINUX_SYS_getxattr },
+  { "getxattr", CB_SYS_getxattr, TARGET_LINUX_SYS_getxattr },
 #endif
 #ifdef CB_SYS_lgetxattr
 # define TARGET_LINUX_SYS_lgetxattr 230
-  { CB_SYS_lgetxattr, TARGET_LINUX_SYS_lgetxattr },
+  { "lgetxattr", CB_SYS_lgetxattr, TARGET_LINUX_SYS_lgetxattr },
 #endif
 #ifdef CB_SYS_fgetxattr
 # define TARGET_LINUX_SYS_fgetxattr 231
-  { CB_SYS_fgetxattr, TARGET_LINUX_SYS_fgetxattr },
+  { "fgetxattr", CB_SYS_fgetxattr, TARGET_LINUX_SYS_fgetxattr },
 #endif
 #ifdef CB_SYS_listxattr
 # define TARGET_LINUX_SYS_listxattr 232
-  { CB_SYS_listxattr, TARGET_LINUX_SYS_listxattr },
+  { "listxattr", CB_SYS_listxattr, TARGET_LINUX_SYS_listxattr },
 #endif
 #ifdef CB_SYS_llistxattr
 # define TARGET_LINUX_SYS_llistxattr 233
-  { CB_SYS_llistxattr, TARGET_LINUX_SYS_llistxattr },
+  { "llistxattr", CB_SYS_llistxattr, TARGET_LINUX_SYS_llistxattr },
 #endif
 #ifdef CB_SYS_flistxattr
 # define TARGET_LINUX_SYS_flistxattr 234
-  { CB_SYS_flistxattr, TARGET_LINUX_SYS_flistxattr },
+  { "flistxattr", CB_SYS_flistxattr, TARGET_LINUX_SYS_flistxattr },
 #endif
 #ifdef CB_SYS_removexattr
 # define TARGET_LINUX_SYS_removexattr 235
-  { CB_SYS_removexattr, TARGET_LINUX_SYS_removexattr },
+  { "removexattr", CB_SYS_removexattr, TARGET_LINUX_SYS_removexattr },
 #endif
 #ifdef CB_SYS_lremovexattr
 # define TARGET_LINUX_SYS_lremovexattr 236
-  { CB_SYS_lremovexattr, TARGET_LINUX_SYS_lremovexattr },
+  { "lremovexattr", CB_SYS_lremovexattr, TARGET_LINUX_SYS_lremovexattr },
 #endif
 #ifdef CB_SYS_fremovexattr
 # define TARGET_LINUX_SYS_fremovexattr 237
-  { CB_SYS_fremovexattr, TARGET_LINUX_SYS_fremovexattr },
+  { "fremovexattr", CB_SYS_fremovexattr, TARGET_LINUX_SYS_fremovexattr },
 #endif
 #ifdef CB_SYS_tkill
 # define TARGET_LINUX_SYS_tkill 238
-  { CB_SYS_tkill, TARGET_LINUX_SYS_tkill },
+  { "tkill", CB_SYS_tkill, TARGET_LINUX_SYS_tkill },
 #endif
 #ifdef CB_SYS_sendfile64
 # define TARGET_LINUX_SYS_sendfile64 239
-  { CB_SYS_sendfile64, TARGET_LINUX_SYS_sendfile64 },
+  { "sendfile64", CB_SYS_sendfile64, TARGET_LINUX_SYS_sendfile64 },
 #endif
 #ifdef CB_SYS_futex
 # define TARGET_LINUX_SYS_futex 240
-  { CB_SYS_futex, TARGET_LINUX_SYS_futex },
+  { "futex", CB_SYS_futex, TARGET_LINUX_SYS_futex },
 #endif
 #ifdef CB_SYS_sched_setaffinity
 # define TARGET_LINUX_SYS_sched_setaffinity 241
-  { CB_SYS_sched_setaffinity, TARGET_LINUX_SYS_sched_setaffinity },
+  { "sched_setaffinity", CB_SYS_sched_setaffinity, TARGET_LINUX_SYS_sched_setaffinity },
 #endif
 #ifdef CB_SYS_sched_getaffinity
 # define TARGET_LINUX_SYS_sched_getaffinity 242
-  { CB_SYS_sched_getaffinity, TARGET_LINUX_SYS_sched_getaffinity },
+  { "sched_getaffinity", CB_SYS_sched_getaffinity, TARGET_LINUX_SYS_sched_getaffinity },
 #endif
 #ifdef CB_SYS_io_setup
 # define TARGET_LINUX_SYS_io_setup 245
-  { CB_SYS_io_setup, TARGET_LINUX_SYS_io_setup },
+  { "io_setup", CB_SYS_io_setup, TARGET_LINUX_SYS_io_setup },
 #endif
 #ifdef CB_SYS_io_destroy
 # define TARGET_LINUX_SYS_io_destroy 246
-  { CB_SYS_io_destroy, TARGET_LINUX_SYS_io_destroy },
+  { "io_destroy", CB_SYS_io_destroy, TARGET_LINUX_SYS_io_destroy },
 #endif
 #ifdef CB_SYS_io_getevents
 # define TARGET_LINUX_SYS_io_getevents 247
-  { CB_SYS_io_getevents, TARGET_LINUX_SYS_io_getevents },
+  { "io_getevents", CB_SYS_io_getevents, TARGET_LINUX_SYS_io_getevents },
 #endif
 #ifdef CB_SYS_io_submit
 # define TARGET_LINUX_SYS_io_submit 248
-  { CB_SYS_io_submit, TARGET_LINUX_SYS_io_submit },
+  { "io_submit", CB_SYS_io_submit, TARGET_LINUX_SYS_io_submit },
 #endif
 #ifdef CB_SYS_io_cancel
 # define TARGET_LINUX_SYS_io_cancel 249
-  { CB_SYS_io_cancel, TARGET_LINUX_SYS_io_cancel },
+  { "io_cancel", CB_SYS_io_cancel, TARGET_LINUX_SYS_io_cancel },
 #endif
 #ifdef CB_SYS_exit_group
 # define TARGET_LINUX_SYS_exit_group 252
-  { CB_SYS_exit_group, TARGET_LINUX_SYS_exit_group },
+  { "exit_group", CB_SYS_exit_group, TARGET_LINUX_SYS_exit_group },
 #endif
 #ifdef CB_SYS_lookup_dcookie
 # define TARGET_LINUX_SYS_lookup_dcookie 253
-  { CB_SYS_lookup_dcookie, TARGET_LINUX_SYS_lookup_dcookie },
+  { "lookup_dcookie", CB_SYS_lookup_dcookie, TARGET_LINUX_SYS_lookup_dcookie },
 #endif
 #ifdef CB_SYS_bfin_spinlock
 # define TARGET_LINUX_SYS_bfin_spinlock 254
-  { CB_SYS_bfin_spinlock, TARGET_LINUX_SYS_bfin_spinlock },
+  { "bfin_spinlock", CB_SYS_bfin_spinlock, TARGET_LINUX_SYS_bfin_spinlock },
 #endif
 #ifdef CB_SYS_epoll_create
 # define TARGET_LINUX_SYS_epoll_create 255
-  { CB_SYS_epoll_create, TARGET_LINUX_SYS_epoll_create },
+  { "epoll_create", CB_SYS_epoll_create, TARGET_LINUX_SYS_epoll_create },
 #endif
 #ifdef CB_SYS_epoll_ctl
 # define TARGET_LINUX_SYS_epoll_ctl 256
-  { CB_SYS_epoll_ctl, TARGET_LINUX_SYS_epoll_ctl },
+  { "epoll_ctl", CB_SYS_epoll_ctl, TARGET_LINUX_SYS_epoll_ctl },
 #endif
 #ifdef CB_SYS_epoll_wait
 # define TARGET_LINUX_SYS_epoll_wait 257
-  { CB_SYS_epoll_wait, TARGET_LINUX_SYS_epoll_wait },
+  { "epoll_wait", CB_SYS_epoll_wait, TARGET_LINUX_SYS_epoll_wait },
 #endif
 #ifdef CB_SYS_set_tid_address
 # define TARGET_LINUX_SYS_set_tid_address 259
-  { CB_SYS_set_tid_address, TARGET_LINUX_SYS_set_tid_address },
+  { "set_tid_address", CB_SYS_set_tid_address, TARGET_LINUX_SYS_set_tid_address },
 #endif
 #ifdef CB_SYS_timer_create
 # define TARGET_LINUX_SYS_timer_create 260
-  { CB_SYS_timer_create, TARGET_LINUX_SYS_timer_create },
+  { "timer_create", CB_SYS_timer_create, TARGET_LINUX_SYS_timer_create },
 #endif
 #ifdef CB_SYS_timer_settime
 # define TARGET_LINUX_SYS_timer_settime 261
-  { CB_SYS_timer_settime, TARGET_LINUX_SYS_timer_settime },
+  { "timer_settime", CB_SYS_timer_settime, TARGET_LINUX_SYS_timer_settime },
 #endif
 #ifdef CB_SYS_timer_gettime
 # define TARGET_LINUX_SYS_timer_gettime 262
-  { CB_SYS_timer_gettime, TARGET_LINUX_SYS_timer_gettime },
+  { "timer_gettime", CB_SYS_timer_gettime, TARGET_LINUX_SYS_timer_gettime },
 #endif
 #ifdef CB_SYS_timer_getoverrun
 # define TARGET_LINUX_SYS_timer_getoverrun 263
-  { CB_SYS_timer_getoverrun, TARGET_LINUX_SYS_timer_getoverrun },
+  { "timer_getoverrun", CB_SYS_timer_getoverrun, TARGET_LINUX_SYS_timer_getoverrun },
 #endif
 #ifdef CB_SYS_timer_delete
 # define TARGET_LINUX_SYS_timer_delete 264
-  { CB_SYS_timer_delete, TARGET_LINUX_SYS_timer_delete },
+  { "timer_delete", CB_SYS_timer_delete, TARGET_LINUX_SYS_timer_delete },
 #endif
 #ifdef CB_SYS_clock_settime
 # define TARGET_LINUX_SYS_clock_settime 265
-  { CB_SYS_clock_settime, TARGET_LINUX_SYS_clock_settime },
+  { "clock_settime", CB_SYS_clock_settime, TARGET_LINUX_SYS_clock_settime },
 #endif
 #ifdef CB_SYS_clock_gettime
 # define TARGET_LINUX_SYS_clock_gettime 266
-  { CB_SYS_clock_gettime, TARGET_LINUX_SYS_clock_gettime },
+  { "clock_gettime", CB_SYS_clock_gettime, TARGET_LINUX_SYS_clock_gettime },
 #endif
 #ifdef CB_SYS_clock_getres
 # define TARGET_LINUX_SYS_clock_getres 267
-  { CB_SYS_clock_getres, TARGET_LINUX_SYS_clock_getres },
+  { "clock_getres", CB_SYS_clock_getres, TARGET_LINUX_SYS_clock_getres },
 #endif
 #ifdef CB_SYS_clock_nanosleep
 # define TARGET_LINUX_SYS_clock_nanosleep 268
-  { CB_SYS_clock_nanosleep, TARGET_LINUX_SYS_clock_nanosleep },
+  { "clock_nanosleep", CB_SYS_clock_nanosleep, TARGET_LINUX_SYS_clock_nanosleep },
 #endif
 #ifdef CB_SYS_statfs64
 # define TARGET_LINUX_SYS_statfs64 269
-  { CB_SYS_statfs64, TARGET_LINUX_SYS_statfs64 },
+  { "statfs64", CB_SYS_statfs64, TARGET_LINUX_SYS_statfs64 },
 #endif
 #ifdef CB_SYS_fstatfs64
 # define TARGET_LINUX_SYS_fstatfs64 270
-  { CB_SYS_fstatfs64, TARGET_LINUX_SYS_fstatfs64 },
+  { "fstatfs64", CB_SYS_fstatfs64, TARGET_LINUX_SYS_fstatfs64 },
 #endif
 #ifdef CB_SYS_tgkill
 # define TARGET_LINUX_SYS_tgkill 271
-  { CB_SYS_tgkill, TARGET_LINUX_SYS_tgkill },
+  { "tgkill", CB_SYS_tgkill, TARGET_LINUX_SYS_tgkill },
 #endif
 #ifdef CB_SYS_utimes
 # define TARGET_LINUX_SYS_utimes 272
-  { CB_SYS_utimes, TARGET_LINUX_SYS_utimes },
+  { "utimes", CB_SYS_utimes, TARGET_LINUX_SYS_utimes },
 #endif
 #ifdef CB_SYS_fadvise64_64
 # define TARGET_LINUX_SYS_fadvise64_64 273
-  { CB_SYS_fadvise64_64, TARGET_LINUX_SYS_fadvise64_64 },
+  { "fadvise64_64", CB_SYS_fadvise64_64, TARGET_LINUX_SYS_fadvise64_64 },
 #endif
 #ifdef CB_SYS_mq_open
 # define TARGET_LINUX_SYS_mq_open 278
-  { CB_SYS_mq_open, TARGET_LINUX_SYS_mq_open },
+  { "mq_open", CB_SYS_mq_open, TARGET_LINUX_SYS_mq_open },
 #endif
 #ifdef CB_SYS_mq_unlink
 # define TARGET_LINUX_SYS_mq_unlink 279
-  { CB_SYS_mq_unlink, TARGET_LINUX_SYS_mq_unlink },
+  { "mq_unlink", CB_SYS_mq_unlink, TARGET_LINUX_SYS_mq_unlink },
 #endif
 #ifdef CB_SYS_mq_timedsend
 # define TARGET_LINUX_SYS_mq_timedsend 280
-  { CB_SYS_mq_timedsend, TARGET_LINUX_SYS_mq_timedsend },
+  { "mq_timedsend", CB_SYS_mq_timedsend, TARGET_LINUX_SYS_mq_timedsend },
 #endif
 #ifdef CB_SYS_mq_timedreceive
 # define TARGET_LINUX_SYS_mq_timedreceive 281
-  { CB_SYS_mq_timedreceive, TARGET_LINUX_SYS_mq_timedreceive },
+  { "mq_timedreceive", CB_SYS_mq_timedreceive, TARGET_LINUX_SYS_mq_timedreceive },
 #endif
 #ifdef CB_SYS_mq_notify
 # define TARGET_LINUX_SYS_mq_notify 282
-  { CB_SYS_mq_notify, TARGET_LINUX_SYS_mq_notify },
+  { "mq_notify", CB_SYS_mq_notify, TARGET_LINUX_SYS_mq_notify },
 #endif
 #ifdef CB_SYS_mq_getsetattr
 # define TARGET_LINUX_SYS_mq_getsetattr 283
-  { CB_SYS_mq_getsetattr, TARGET_LINUX_SYS_mq_getsetattr },
+  { "mq_getsetattr", CB_SYS_mq_getsetattr, TARGET_LINUX_SYS_mq_getsetattr },
 #endif
 #ifdef CB_SYS_kexec_load
 # define TARGET_LINUX_SYS_kexec_load 284
-  { CB_SYS_kexec_load, TARGET_LINUX_SYS_kexec_load },
+  { "kexec_load", CB_SYS_kexec_load, TARGET_LINUX_SYS_kexec_load },
 #endif
 #ifdef CB_SYS_waitid
 # define TARGET_LINUX_SYS_waitid 285
-  { CB_SYS_waitid, TARGET_LINUX_SYS_waitid },
+  { "waitid", CB_SYS_waitid, TARGET_LINUX_SYS_waitid },
 #endif
 #ifdef CB_SYS_add_key
 # define TARGET_LINUX_SYS_add_key 286
-  { CB_SYS_add_key, TARGET_LINUX_SYS_add_key },
+  { "add_key", CB_SYS_add_key, TARGET_LINUX_SYS_add_key },
 #endif
 #ifdef CB_SYS_request_key
 # define TARGET_LINUX_SYS_request_key 287
-  { CB_SYS_request_key, TARGET_LINUX_SYS_request_key },
+  { "request_key", CB_SYS_request_key, TARGET_LINUX_SYS_request_key },
 #endif
 #ifdef CB_SYS_keyctl
 # define TARGET_LINUX_SYS_keyctl 288
-  { CB_SYS_keyctl, TARGET_LINUX_SYS_keyctl },
+  { "keyctl", CB_SYS_keyctl, TARGET_LINUX_SYS_keyctl },
 #endif
 #ifdef CB_SYS_ioprio_set
 # define TARGET_LINUX_SYS_ioprio_set 289
-  { CB_SYS_ioprio_set, TARGET_LINUX_SYS_ioprio_set },
+  { "ioprio_set", CB_SYS_ioprio_set, TARGET_LINUX_SYS_ioprio_set },
 #endif
 #ifdef CB_SYS_ioprio_get
 # define TARGET_LINUX_SYS_ioprio_get 290
-  { CB_SYS_ioprio_get, TARGET_LINUX_SYS_ioprio_get },
+  { "ioprio_get", CB_SYS_ioprio_get, TARGET_LINUX_SYS_ioprio_get },
 #endif
 #ifdef CB_SYS_inotify_init
 # define TARGET_LINUX_SYS_inotify_init 291
-  { CB_SYS_inotify_init, TARGET_LINUX_SYS_inotify_init },
+  { "inotify_init", CB_SYS_inotify_init, TARGET_LINUX_SYS_inotify_init },
 #endif
 #ifdef CB_SYS_inotify_add_watch
 # define TARGET_LINUX_SYS_inotify_add_watch 292
-  { CB_SYS_inotify_add_watch, TARGET_LINUX_SYS_inotify_add_watch },
+  { "inotify_add_watch", CB_SYS_inotify_add_watch, TARGET_LINUX_SYS_inotify_add_watch },
 #endif
 #ifdef CB_SYS_inotify_rm_watch
 # define TARGET_LINUX_SYS_inotify_rm_watch 293
-  { CB_SYS_inotify_rm_watch, TARGET_LINUX_SYS_inotify_rm_watch },
+  { "inotify_rm_watch", CB_SYS_inotify_rm_watch, TARGET_LINUX_SYS_inotify_rm_watch },
 #endif
 #ifdef CB_SYS_openat
 # define TARGET_LINUX_SYS_openat 295
-  { CB_SYS_openat, TARGET_LINUX_SYS_openat },
+  { "openat", CB_SYS_openat, TARGET_LINUX_SYS_openat },
 #endif
 #ifdef CB_SYS_mkdirat
 # define TARGET_LINUX_SYS_mkdirat 296
-  { CB_SYS_mkdirat, TARGET_LINUX_SYS_mkdirat },
+  { "mkdirat", CB_SYS_mkdirat, TARGET_LINUX_SYS_mkdirat },
 #endif
 #ifdef CB_SYS_mknodat
 # define TARGET_LINUX_SYS_mknodat 297
-  { CB_SYS_mknodat, TARGET_LINUX_SYS_mknodat },
+  { "mknodat", CB_SYS_mknodat, TARGET_LINUX_SYS_mknodat },
 #endif
 #ifdef CB_SYS_fchownat
 # define TARGET_LINUX_SYS_fchownat 298
-  { CB_SYS_fchownat, TARGET_LINUX_SYS_fchownat },
+  { "fchownat", CB_SYS_fchownat, TARGET_LINUX_SYS_fchownat },
 #endif
 #ifdef CB_SYS_futimesat
 # define TARGET_LINUX_SYS_futimesat 299
-  { CB_SYS_futimesat, TARGET_LINUX_SYS_futimesat },
+  { "futimesat", CB_SYS_futimesat, TARGET_LINUX_SYS_futimesat },
 #endif
 #ifdef CB_SYS_fstatat64
 # define TARGET_LINUX_SYS_fstatat64 300
-  { CB_SYS_fstatat64, TARGET_LINUX_SYS_fstatat64 },
+  { "fstatat64", CB_SYS_fstatat64, TARGET_LINUX_SYS_fstatat64 },
 #endif
 #ifdef CB_SYS_unlinkat
 # define TARGET_LINUX_SYS_unlinkat 301
-  { CB_SYS_unlinkat, TARGET_LINUX_SYS_unlinkat },
+  { "unlinkat", CB_SYS_unlinkat, TARGET_LINUX_SYS_unlinkat },
 #endif
 #ifdef CB_SYS_renameat
 # define TARGET_LINUX_SYS_renameat 302
-  { CB_SYS_renameat, TARGET_LINUX_SYS_renameat },
+  { "renameat", CB_SYS_renameat, TARGET_LINUX_SYS_renameat },
 #endif
 #ifdef CB_SYS_linkat
 # define TARGET_LINUX_SYS_linkat 303
-  { CB_SYS_linkat, TARGET_LINUX_SYS_linkat },
+  { "linkat", CB_SYS_linkat, TARGET_LINUX_SYS_linkat },
 #endif
 #ifdef CB_SYS_symlinkat
 # define TARGET_LINUX_SYS_symlinkat 304
-  { CB_SYS_symlinkat, TARGET_LINUX_SYS_symlinkat },
+  { "symlinkat", CB_SYS_symlinkat, TARGET_LINUX_SYS_symlinkat },
 #endif
 #ifdef CB_SYS_readlinkat
 # define TARGET_LINUX_SYS_readlinkat 305
-  { CB_SYS_readlinkat, TARGET_LINUX_SYS_readlinkat },
+  { "readlinkat", CB_SYS_readlinkat, TARGET_LINUX_SYS_readlinkat },
 #endif
 #ifdef CB_SYS_fchmodat
 # define TARGET_LINUX_SYS_fchmodat 306
-  { CB_SYS_fchmodat, TARGET_LINUX_SYS_fchmodat },
+  { "fchmodat", CB_SYS_fchmodat, TARGET_LINUX_SYS_fchmodat },
 #endif
 #ifdef CB_SYS_faccessat
 # define TARGET_LINUX_SYS_faccessat 307
-  { CB_SYS_faccessat, TARGET_LINUX_SYS_faccessat },
+  { "faccessat", CB_SYS_faccessat, TARGET_LINUX_SYS_faccessat },
 #endif
 #ifdef CB_SYS_pselect6
 # define TARGET_LINUX_SYS_pselect6 308
-  { CB_SYS_pselect6, TARGET_LINUX_SYS_pselect6 },
+  { "pselect6", CB_SYS_pselect6, TARGET_LINUX_SYS_pselect6 },
 #endif
 #ifdef CB_SYS_ppoll
 # define TARGET_LINUX_SYS_ppoll 309
-  { CB_SYS_ppoll, TARGET_LINUX_SYS_ppoll },
+  { "ppoll", CB_SYS_ppoll, TARGET_LINUX_SYS_ppoll },
 #endif
 #ifdef CB_SYS_unshare
 # define TARGET_LINUX_SYS_unshare 310
-  { CB_SYS_unshare, TARGET_LINUX_SYS_unshare },
+  { "unshare", CB_SYS_unshare, TARGET_LINUX_SYS_unshare },
 #endif
 #ifdef CB_SYS_sram_alloc
 # define TARGET_LINUX_SYS_sram_alloc 311
-  { CB_SYS_sram_alloc, TARGET_LINUX_SYS_sram_alloc },
+  { "sram_alloc", CB_SYS_sram_alloc, TARGET_LINUX_SYS_sram_alloc },
 #endif
 #ifdef CB_SYS_sram_free
 # define TARGET_LINUX_SYS_sram_free 312
-  { CB_SYS_sram_free, TARGET_LINUX_SYS_sram_free },
+  { "sram_free", CB_SYS_sram_free, TARGET_LINUX_SYS_sram_free },
 #endif
 #ifdef CB_SYS_dma_memcpy
 # define TARGET_LINUX_SYS_dma_memcpy 313
-  { CB_SYS_dma_memcpy, TARGET_LINUX_SYS_dma_memcpy },
+  { "dma_memcpy", CB_SYS_dma_memcpy, TARGET_LINUX_SYS_dma_memcpy },
 #endif
 #ifdef CB_SYS_accept
 # define TARGET_LINUX_SYS_accept 314
-  { CB_SYS_accept, TARGET_LINUX_SYS_accept },
+  { "accept", CB_SYS_accept, TARGET_LINUX_SYS_accept },
 #endif
 #ifdef CB_SYS_bind
 # define TARGET_LINUX_SYS_bind 315
-  { CB_SYS_bind, TARGET_LINUX_SYS_bind },
+  { "bind", CB_SYS_bind, TARGET_LINUX_SYS_bind },
 #endif
 #ifdef CB_SYS_connect
 # define TARGET_LINUX_SYS_connect 316
-  { CB_SYS_connect, TARGET_LINUX_SYS_connect },
+  { "connect", CB_SYS_connect, TARGET_LINUX_SYS_connect },
 #endif
 #ifdef CB_SYS_getpeername
 # define TARGET_LINUX_SYS_getpeername 317
-  { CB_SYS_getpeername, TARGET_LINUX_SYS_getpeername },
+  { "getpeername", CB_SYS_getpeername, TARGET_LINUX_SYS_getpeername },
 #endif
 #ifdef CB_SYS_getsockname
 # define TARGET_LINUX_SYS_getsockname 318
-  { CB_SYS_getsockname, TARGET_LINUX_SYS_getsockname },
+  { "getsockname", CB_SYS_getsockname, TARGET_LINUX_SYS_getsockname },
 #endif
 #ifdef CB_SYS_getsockopt
 # define TARGET_LINUX_SYS_getsockopt 319
-  { CB_SYS_getsockopt, TARGET_LINUX_SYS_getsockopt },
+  { "getsockopt", CB_SYS_getsockopt, TARGET_LINUX_SYS_getsockopt },
 #endif
 #ifdef CB_SYS_listen
 # define TARGET_LINUX_SYS_listen 320
-  { CB_SYS_listen, TARGET_LINUX_SYS_listen },
+  { "listen", CB_SYS_listen, TARGET_LINUX_SYS_listen },
 #endif
 #ifdef CB_SYS_recv
 # define TARGET_LINUX_SYS_recv 321
-  { CB_SYS_recv, TARGET_LINUX_SYS_recv },
+  { "recv", CB_SYS_recv, TARGET_LINUX_SYS_recv },
 #endif
 #ifdef CB_SYS_recvfrom
 # define TARGET_LINUX_SYS_recvfrom 322
-  { CB_SYS_recvfrom, TARGET_LINUX_SYS_recvfrom },
+  { "recvfrom", CB_SYS_recvfrom, TARGET_LINUX_SYS_recvfrom },
 #endif
 #ifdef CB_SYS_recvmsg
 # define TARGET_LINUX_SYS_recvmsg 323
-  { CB_SYS_recvmsg, TARGET_LINUX_SYS_recvmsg },
+  { "recvmsg", CB_SYS_recvmsg, TARGET_LINUX_SYS_recvmsg },
 #endif
 #ifdef CB_SYS_send
 # define TARGET_LINUX_SYS_send 324
-  { CB_SYS_send, TARGET_LINUX_SYS_send },
+  { "send", CB_SYS_send, TARGET_LINUX_SYS_send },
 #endif
 #ifdef CB_SYS_sendmsg
 # define TARGET_LINUX_SYS_sendmsg 325
-  { CB_SYS_sendmsg, TARGET_LINUX_SYS_sendmsg },
+  { "sendmsg", CB_SYS_sendmsg, TARGET_LINUX_SYS_sendmsg },
 #endif
 #ifdef CB_SYS_sendto
 # define TARGET_LINUX_SYS_sendto 326
-  { CB_SYS_sendto, TARGET_LINUX_SYS_sendto },
+  { "sendto", CB_SYS_sendto, TARGET_LINUX_SYS_sendto },
 #endif
 #ifdef CB_SYS_setsockopt
 # define TARGET_LINUX_SYS_setsockopt 327
-  { CB_SYS_setsockopt, TARGET_LINUX_SYS_setsockopt },
+  { "setsockopt", CB_SYS_setsockopt, TARGET_LINUX_SYS_setsockopt },
 #endif
 #ifdef CB_SYS_shutdown
 # define TARGET_LINUX_SYS_shutdown 328
-  { CB_SYS_shutdown, TARGET_LINUX_SYS_shutdown },
+  { "shutdown", CB_SYS_shutdown, TARGET_LINUX_SYS_shutdown },
 #endif
 #ifdef CB_SYS_socket
 # define TARGET_LINUX_SYS_socket 329
-  { CB_SYS_socket, TARGET_LINUX_SYS_socket },
+  { "socket", CB_SYS_socket, TARGET_LINUX_SYS_socket },
 #endif
 #ifdef CB_SYS_socketpair
 # define TARGET_LINUX_SYS_socketpair 330
-  { CB_SYS_socketpair, TARGET_LINUX_SYS_socketpair },
+  { "socketpair", CB_SYS_socketpair, TARGET_LINUX_SYS_socketpair },
 #endif
 #ifdef CB_SYS_semctl
 # define TARGET_LINUX_SYS_semctl 331
-  { CB_SYS_semctl, TARGET_LINUX_SYS_semctl },
+  { "semctl", CB_SYS_semctl, TARGET_LINUX_SYS_semctl },
 #endif
 #ifdef CB_SYS_semget
 # define TARGET_LINUX_SYS_semget 332
-  { CB_SYS_semget, TARGET_LINUX_SYS_semget },
+  { "semget", CB_SYS_semget, TARGET_LINUX_SYS_semget },
 #endif
 #ifdef CB_SYS_semop
 # define TARGET_LINUX_SYS_semop 333
-  { CB_SYS_semop, TARGET_LINUX_SYS_semop },
+  { "semop", CB_SYS_semop, TARGET_LINUX_SYS_semop },
 #endif
 #ifdef CB_SYS_msgctl
 # define TARGET_LINUX_SYS_msgctl 334
-  { CB_SYS_msgctl, TARGET_LINUX_SYS_msgctl },
+  { "msgctl", CB_SYS_msgctl, TARGET_LINUX_SYS_msgctl },
 #endif
 #ifdef CB_SYS_msgget
 # define TARGET_LINUX_SYS_msgget 335
-  { CB_SYS_msgget, TARGET_LINUX_SYS_msgget },
+  { "msgget", CB_SYS_msgget, TARGET_LINUX_SYS_msgget },
 #endif
 #ifdef CB_SYS_msgrcv
 # define TARGET_LINUX_SYS_msgrcv 336
-  { CB_SYS_msgrcv, TARGET_LINUX_SYS_msgrcv },
+  { "msgrcv", CB_SYS_msgrcv, TARGET_LINUX_SYS_msgrcv },
 #endif
 #ifdef CB_SYS_msgsnd
 # define TARGET_LINUX_SYS_msgsnd 337
-  { CB_SYS_msgsnd, TARGET_LINUX_SYS_msgsnd },
+  { "msgsnd", CB_SYS_msgsnd, TARGET_LINUX_SYS_msgsnd },
 #endif
 #ifdef CB_SYS_shmat
 # define TARGET_LINUX_SYS_shmat 338
-  { CB_SYS_shmat, TARGET_LINUX_SYS_shmat },
+  { "shmat", CB_SYS_shmat, TARGET_LINUX_SYS_shmat },
 #endif
 #ifdef CB_SYS_shmctl
 # define TARGET_LINUX_SYS_shmctl 339
-  { CB_SYS_shmctl, TARGET_LINUX_SYS_shmctl },
+  { "shmctl", CB_SYS_shmctl, TARGET_LINUX_SYS_shmctl },
 #endif
 #ifdef CB_SYS_shmdt
 # define TARGET_LINUX_SYS_shmdt 340
-  { CB_SYS_shmdt, TARGET_LINUX_SYS_shmdt },
+  { "shmdt", CB_SYS_shmdt, TARGET_LINUX_SYS_shmdt },
 #endif
 #ifdef CB_SYS_shmget
 # define TARGET_LINUX_SYS_shmget 341
-  { CB_SYS_shmget, TARGET_LINUX_SYS_shmget },
+  { "shmget", CB_SYS_shmget, TARGET_LINUX_SYS_shmget },
 #endif
 #ifdef CB_SYS_splice
 # define TARGET_LINUX_SYS_splice 342
-  { CB_SYS_splice, TARGET_LINUX_SYS_splice },
+  { "splice", CB_SYS_splice, TARGET_LINUX_SYS_splice },
 #endif
 #ifdef CB_SYS_sync_file_range
 # define TARGET_LINUX_SYS_sync_file_range 343
-  { CB_SYS_sync_file_range, TARGET_LINUX_SYS_sync_file_range },
+  { "sync_file_range", CB_SYS_sync_file_range, TARGET_LINUX_SYS_sync_file_range },
 #endif
 #ifdef CB_SYS_tee
 # define TARGET_LINUX_SYS_tee 344
-  { CB_SYS_tee, TARGET_LINUX_SYS_tee },
+  { "tee", CB_SYS_tee, TARGET_LINUX_SYS_tee },
 #endif
 #ifdef CB_SYS_vmsplice
 # define TARGET_LINUX_SYS_vmsplice 345
-  { CB_SYS_vmsplice, TARGET_LINUX_SYS_vmsplice },
+  { "vmsplice", CB_SYS_vmsplice, TARGET_LINUX_SYS_vmsplice },
 #endif
 #ifdef CB_SYS_epoll_pwait
 # define TARGET_LINUX_SYS_epoll_pwait 346
-  { CB_SYS_epoll_pwait, TARGET_LINUX_SYS_epoll_pwait },
+  { "epoll_pwait", CB_SYS_epoll_pwait, TARGET_LINUX_SYS_epoll_pwait },
 #endif
 #ifdef CB_SYS_utimensat
 # define TARGET_LINUX_SYS_utimensat 347
-  { CB_SYS_utimensat, TARGET_LINUX_SYS_utimensat },
+  { "utimensat", CB_SYS_utimensat, TARGET_LINUX_SYS_utimensat },
 #endif
 #ifdef CB_SYS_signalfd
 # define TARGET_LINUX_SYS_signalfd 348
-  { CB_SYS_signalfd, TARGET_LINUX_SYS_signalfd },
+  { "signalfd", CB_SYS_signalfd, TARGET_LINUX_SYS_signalfd },
 #endif
 #ifdef CB_SYS_timerfd_create
 # define TARGET_LINUX_SYS_timerfd_create 349
-  { CB_SYS_timerfd_create, TARGET_LINUX_SYS_timerfd_create },
+  { "timerfd_create", CB_SYS_timerfd_create, TARGET_LINUX_SYS_timerfd_create },
 #endif
 #ifdef CB_SYS_eventfd
 # define TARGET_LINUX_SYS_eventfd 350
-  { CB_SYS_eventfd, TARGET_LINUX_SYS_eventfd },
+  { "eventfd", CB_SYS_eventfd, TARGET_LINUX_SYS_eventfd },
 #endif
 #ifdef CB_SYS_pread64
 # define TARGET_LINUX_SYS_pread64 351
-  { CB_SYS_pread64, TARGET_LINUX_SYS_pread64 },
+  { "pread64", CB_SYS_pread64, TARGET_LINUX_SYS_pread64 },
 #endif
 #ifdef CB_SYS_pwrite64
 # define TARGET_LINUX_SYS_pwrite64 352
-  { CB_SYS_pwrite64, TARGET_LINUX_SYS_pwrite64 },
+  { "pwrite64", CB_SYS_pwrite64, TARGET_LINUX_SYS_pwrite64 },
 #endif
 #ifdef CB_SYS_fadvise64
 # define TARGET_LINUX_SYS_fadvise64 353
-  { CB_SYS_fadvise64, TARGET_LINUX_SYS_fadvise64 },
+  { "fadvise64", CB_SYS_fadvise64, TARGET_LINUX_SYS_fadvise64 },
 #endif
 #ifdef CB_SYS_set_robust_list
 # define TARGET_LINUX_SYS_set_robust_list 354
-  { CB_SYS_set_robust_list, TARGET_LINUX_SYS_set_robust_list },
+  { "set_robust_list", CB_SYS_set_robust_list, TARGET_LINUX_SYS_set_robust_list },
 #endif
 #ifdef CB_SYS_get_robust_list
 # define TARGET_LINUX_SYS_get_robust_list 355
-  { CB_SYS_get_robust_list, TARGET_LINUX_SYS_get_robust_list },
+  { "get_robust_list", CB_SYS_get_robust_list, TARGET_LINUX_SYS_get_robust_list },
 #endif
 #ifdef CB_SYS_fallocate
 # define TARGET_LINUX_SYS_fallocate 356
-  { CB_SYS_fallocate, TARGET_LINUX_SYS_fallocate },
+  { "fallocate", CB_SYS_fallocate, TARGET_LINUX_SYS_fallocate },
 #endif
 #ifdef CB_SYS_semtimedop
 # define TARGET_LINUX_SYS_semtimedop 357
-  { CB_SYS_semtimedop, TARGET_LINUX_SYS_semtimedop },
+  { "semtimedop", CB_SYS_semtimedop, TARGET_LINUX_SYS_semtimedop },
 #endif
 #ifdef CB_SYS_timerfd_settime
 # define TARGET_LINUX_SYS_timerfd_settime 358
-  { CB_SYS_timerfd_settime, TARGET_LINUX_SYS_timerfd_settime },
+  { "timerfd_settime", CB_SYS_timerfd_settime, TARGET_LINUX_SYS_timerfd_settime },
 #endif
 #ifdef CB_SYS_timerfd_gettime
 # define TARGET_LINUX_SYS_timerfd_gettime 359
-  { CB_SYS_timerfd_gettime, TARGET_LINUX_SYS_timerfd_gettime },
+  { "timerfd_gettime", CB_SYS_timerfd_gettime, TARGET_LINUX_SYS_timerfd_gettime },
 #endif
 #ifdef CB_SYS_signalfd4
 # define TARGET_LINUX_SYS_signalfd4 360
-  { CB_SYS_signalfd4, TARGET_LINUX_SYS_signalfd4 },
+  { "signalfd4", CB_SYS_signalfd4, TARGET_LINUX_SYS_signalfd4 },
 #endif
 #ifdef CB_SYS_eventfd2
 # define TARGET_LINUX_SYS_eventfd2 361
-  { CB_SYS_eventfd2, TARGET_LINUX_SYS_eventfd2 },
+  { "eventfd2", CB_SYS_eventfd2, TARGET_LINUX_SYS_eventfd2 },
 #endif
 #ifdef CB_SYS_epoll_create1
 # define TARGET_LINUX_SYS_epoll_create1 362
-  { CB_SYS_epoll_create1, TARGET_LINUX_SYS_epoll_create1 },
+  { "epoll_create1", CB_SYS_epoll_create1, TARGET_LINUX_SYS_epoll_create1 },
 #endif
 #ifdef CB_SYS_dup3
 # define TARGET_LINUX_SYS_dup3 363
-  { CB_SYS_dup3, TARGET_LINUX_SYS_dup3 },
+  { "dup3", CB_SYS_dup3, TARGET_LINUX_SYS_dup3 },
 #endif
 #ifdef CB_SYS_pipe2
 # define TARGET_LINUX_SYS_pipe2 364
-  { CB_SYS_pipe2, TARGET_LINUX_SYS_pipe2 },
+  { "pipe2", CB_SYS_pipe2, TARGET_LINUX_SYS_pipe2 },
 #endif
 #ifdef CB_SYS_inotify_init1
 # define TARGET_LINUX_SYS_inotify_init1 365
-  { CB_SYS_inotify_init1, TARGET_LINUX_SYS_inotify_init1 },
+  { "inotify_init1", CB_SYS_inotify_init1, TARGET_LINUX_SYS_inotify_init1 },
 #endif
 #ifdef CB_SYS_preadv
 # define TARGET_LINUX_SYS_preadv 366
-  { CB_SYS_preadv, TARGET_LINUX_SYS_preadv },
+  { "preadv", CB_SYS_preadv, TARGET_LINUX_SYS_preadv },
 #endif
 #ifdef CB_SYS_pwritev
 # define TARGET_LINUX_SYS_pwritev 367
-  { CB_SYS_pwritev, TARGET_LINUX_SYS_pwritev },
+  { "pwritev", CB_SYS_pwritev, TARGET_LINUX_SYS_pwritev },
 #endif
 #ifdef CB_SYS_rt_tgsigqueueinfo
 # define TARGET_LINUX_SYS_rt_tgsigqueueinfo 368
-  { CB_SYS_rt_tgsigqueueinfo, TARGET_LINUX_SYS_rt_tgsigqueueinfo },
+  { "rt_tgsigqueueinfo", CB_SYS_rt_tgsigqueueinfo, TARGET_LINUX_SYS_rt_tgsigqueueinfo },
 #endif
 #ifdef CB_SYS_perf_event_open
 # define TARGET_LINUX_SYS_perf_event_open 369
-  { CB_SYS_perf_event_open, TARGET_LINUX_SYS_perf_event_open },
+  { "perf_event_open", CB_SYS_perf_event_open, TARGET_LINUX_SYS_perf_event_open },
 #endif
 #ifdef CB_SYS_recvmmsg
 # define TARGET_LINUX_SYS_recvmmsg 370
-  { CB_SYS_recvmmsg, TARGET_LINUX_SYS_recvmmsg },
+  { "recvmmsg", CB_SYS_recvmmsg, TARGET_LINUX_SYS_recvmmsg },
 #endif
 #ifdef CB_SYS_fanotify_init
 # define TARGET_LINUX_SYS_fanotify_init 371
-  { CB_SYS_fanotify_init, TARGET_LINUX_SYS_fanotify_init },
+  { "fanotify_init", CB_SYS_fanotify_init, TARGET_LINUX_SYS_fanotify_init },
 #endif
 #ifdef CB_SYS_fanotify_mark
 # define TARGET_LINUX_SYS_fanotify_mark 372
-  { CB_SYS_fanotify_mark, TARGET_LINUX_SYS_fanotify_mark },
+  { "fanotify_mark", CB_SYS_fanotify_mark, TARGET_LINUX_SYS_fanotify_mark },
 #endif
 #ifdef CB_SYS_prlimit64
 # define TARGET_LINUX_SYS_prlimit64 373
-  { CB_SYS_prlimit64, TARGET_LINUX_SYS_prlimit64 },
+  { "prlimit64", CB_SYS_prlimit64, TARGET_LINUX_SYS_prlimit64 },
 #endif
 #ifdef CB_SYS_cacheflush
 # define TARGET_LINUX_SYS_cacheflush 374
-  { CB_SYS_cacheflush, TARGET_LINUX_SYS_cacheflush },
+  { "cacheflush", CB_SYS_cacheflush, TARGET_LINUX_SYS_cacheflush },
 #endif
 #ifdef CB_SYS_syscall
 # define TARGET_LINUX_SYS_syscall 375
-  { CB_SYS_syscall, TARGET_LINUX_SYS_syscall },
+  { "syscall", CB_SYS_syscall, TARGET_LINUX_SYS_syscall },
 #endif
-  { -1, -1 }
+  { 0, -1, -1 }
 };
 
 static CB_TARGET_DEFS_MAP cb_linux_errno_map[] =
 {
 #ifdef EPERM
 # define TARGET_LINUX_EPERM 1
-  { EPERM, TARGET_LINUX_EPERM },
+  { "EPERM", EPERM, TARGET_LINUX_EPERM },
 #endif
 #ifdef ENOENT
 # define TARGET_LINUX_ENOENT 2
-  { ENOENT, TARGET_LINUX_ENOENT },
+  { "ENOENT", ENOENT, TARGET_LINUX_ENOENT },
 #endif
 #ifdef ESRCH
 # define TARGET_LINUX_ESRCH 3
-  { ESRCH, TARGET_LINUX_ESRCH },
+  { "ESRCH", ESRCH, TARGET_LINUX_ESRCH },
 #endif
 #ifdef EINTR
 # define TARGET_LINUX_EINTR 4
-  { EINTR, TARGET_LINUX_EINTR },
+  { "EINTR", EINTR, TARGET_LINUX_EINTR },
 #endif
 #ifdef EIO
 # define TARGET_LINUX_EIO 5
-  { EIO, TARGET_LINUX_EIO },
+  { "EIO", EIO, TARGET_LINUX_EIO },
 #endif
 #ifdef ENXIO
 # define TARGET_LINUX_ENXIO 6
-  { ENXIO, TARGET_LINUX_ENXIO },
+  { "ENXIO", ENXIO, TARGET_LINUX_ENXIO },
 #endif
 #ifdef E2BIG
 # define TARGET_LINUX_E2BIG 7
-  { E2BIG, TARGET_LINUX_E2BIG },
+  { "E2BIG", E2BIG, TARGET_LINUX_E2BIG },
 #endif
 #ifdef ENOEXEC
 # define TARGET_LINUX_ENOEXEC 8
-  { ENOEXEC, TARGET_LINUX_ENOEXEC },
+  { "ENOEXEC", ENOEXEC, TARGET_LINUX_ENOEXEC },
 #endif
 #ifdef EBADF
 # define TARGET_LINUX_EBADF 9
-  { EBADF, TARGET_LINUX_EBADF },
+  { "EBADF", EBADF, TARGET_LINUX_EBADF },
 #endif
 #ifdef ECHILD
 # define TARGET_LINUX_ECHILD 10
-  { ECHILD, TARGET_LINUX_ECHILD },
+  { "ECHILD", ECHILD, TARGET_LINUX_ECHILD },
 #endif
 #ifdef EAGAIN
 # define TARGET_LINUX_EAGAIN 11
-  { EAGAIN, TARGET_LINUX_EAGAIN },
+  { "EAGAIN", EAGAIN, TARGET_LINUX_EAGAIN },
 #endif
 #ifdef ENOMEM
 # define TARGET_LINUX_ENOMEM 12
-  { ENOMEM, TARGET_LINUX_ENOMEM },
+  { "ENOMEM", ENOMEM, TARGET_LINUX_ENOMEM },
 #endif
 #ifdef EACCES
 # define TARGET_LINUX_EACCES 13
-  { EACCES, TARGET_LINUX_EACCES },
+  { "EACCES", EACCES, TARGET_LINUX_EACCES },
 #endif
 #ifdef EFAULT
 # define TARGET_LINUX_EFAULT 14
-  { EFAULT, TARGET_LINUX_EFAULT },
+  { "EFAULT", EFAULT, TARGET_LINUX_EFAULT },
 #endif
 #ifdef ENOTBLK
 # define TARGET_LINUX_ENOTBLK 15
-  { ENOTBLK, TARGET_LINUX_ENOTBLK },
+  { "ENOTBLK", ENOTBLK, TARGET_LINUX_ENOTBLK },
 #endif
 #ifdef EBUSY
 # define TARGET_LINUX_EBUSY 16
-  { EBUSY, TARGET_LINUX_EBUSY },
+  { "EBUSY", EBUSY, TARGET_LINUX_EBUSY },
 #endif
 #ifdef EEXIST
 # define TARGET_LINUX_EEXIST 17
-  { EEXIST, TARGET_LINUX_EEXIST },
+  { "EEXIST", EEXIST, TARGET_LINUX_EEXIST },
 #endif
 #ifdef EXDEV
 # define TARGET_LINUX_EXDEV 18
-  { EXDEV, TARGET_LINUX_EXDEV },
+  { "EXDEV", EXDEV, TARGET_LINUX_EXDEV },
 #endif
 #ifdef ENODEV
 # define TARGET_LINUX_ENODEV 19
-  { ENODEV, TARGET_LINUX_ENODEV },
+  { "ENODEV", ENODEV, TARGET_LINUX_ENODEV },
 #endif
 #ifdef ENOTDIR
 # define TARGET_LINUX_ENOTDIR 20
-  { ENOTDIR, TARGET_LINUX_ENOTDIR },
+  { "ENOTDIR", ENOTDIR, TARGET_LINUX_ENOTDIR },
 #endif
 #ifdef EISDIR
 # define TARGET_LINUX_EISDIR 21
-  { EISDIR, TARGET_LINUX_EISDIR },
+  { "EISDIR", EISDIR, TARGET_LINUX_EISDIR },
 #endif
 #ifdef EINVAL
 # define TARGET_LINUX_EINVAL 22
-  { EINVAL, TARGET_LINUX_EINVAL },
+  { "EINVAL", EINVAL, TARGET_LINUX_EINVAL },
 #endif
 #ifdef ENFILE
 # define TARGET_LINUX_ENFILE 23
-  { ENFILE, TARGET_LINUX_ENFILE },
+  { "ENFILE", ENFILE, TARGET_LINUX_ENFILE },
 #endif
 #ifdef EMFILE
 # define TARGET_LINUX_EMFILE 24
-  { EMFILE, TARGET_LINUX_EMFILE },
+  { "EMFILE", EMFILE, TARGET_LINUX_EMFILE },
 #endif
 #ifdef ENOTTY
 # define TARGET_LINUX_ENOTTY 25
-  { ENOTTY, TARGET_LINUX_ENOTTY },
+  { "ENOTTY", ENOTTY, TARGET_LINUX_ENOTTY },
 #endif
 #ifdef ETXTBSY
 # define TARGET_LINUX_ETXTBSY 26
-  { ETXTBSY, TARGET_LINUX_ETXTBSY },
+  { "ETXTBSY", ETXTBSY, TARGET_LINUX_ETXTBSY },
 #endif
 #ifdef EFBIG
 # define TARGET_LINUX_EFBIG 27
-  { EFBIG, TARGET_LINUX_EFBIG },
+  { "EFBIG", EFBIG, TARGET_LINUX_EFBIG },
 #endif
 #ifdef ENOSPC
 # define TARGET_LINUX_ENOSPC 28
-  { ENOSPC, TARGET_LINUX_ENOSPC },
+  { "ENOSPC", ENOSPC, TARGET_LINUX_ENOSPC },
 #endif
 #ifdef ESPIPE
 # define TARGET_LINUX_ESPIPE 29
-  { ESPIPE, TARGET_LINUX_ESPIPE },
+  { "ESPIPE", ESPIPE, TARGET_LINUX_ESPIPE },
 #endif
 #ifdef EROFS
 # define TARGET_LINUX_EROFS 30
-  { EROFS, TARGET_LINUX_EROFS },
+  { "EROFS", EROFS, TARGET_LINUX_EROFS },
 #endif
 #ifdef EMLINK
 # define TARGET_LINUX_EMLINK 31
-  { EMLINK, TARGET_LINUX_EMLINK },
+  { "EMLINK", EMLINK, TARGET_LINUX_EMLINK },
 #endif
 #ifdef EPIPE
 # define TARGET_LINUX_EPIPE 32
-  { EPIPE, TARGET_LINUX_EPIPE },
+  { "EPIPE", EPIPE, TARGET_LINUX_EPIPE },
 #endif
 #ifdef EDOM
 # define TARGET_LINUX_EDOM 33
-  { EDOM, TARGET_LINUX_EDOM },
+  { "EDOM", EDOM, TARGET_LINUX_EDOM },
 #endif
 #ifdef ERANGE
 # define TARGET_LINUX_ERANGE 34
-  { ERANGE, TARGET_LINUX_ERANGE },
+  { "ERANGE", ERANGE, TARGET_LINUX_ERANGE },
 #endif
 #ifdef EDEADLK
 # define TARGET_LINUX_EDEADLK 35
-  { EDEADLK, TARGET_LINUX_EDEADLK },
+  { "EDEADLK", EDEADLK, TARGET_LINUX_EDEADLK },
 #endif
 #ifdef ENAMETOOLONG
 # define TARGET_LINUX_ENAMETOOLONG 36
-  { ENAMETOOLONG, TARGET_LINUX_ENAMETOOLONG },
+  { "ENAMETOOLONG", ENAMETOOLONG, TARGET_LINUX_ENAMETOOLONG },
 #endif
 #ifdef ENOLCK
 # define TARGET_LINUX_ENOLCK 37
-  { ENOLCK, TARGET_LINUX_ENOLCK },
+  { "ENOLCK", ENOLCK, TARGET_LINUX_ENOLCK },
 #endif
 #ifdef ENOSYS
 # define TARGET_LINUX_ENOSYS 38
-  { ENOSYS, TARGET_LINUX_ENOSYS },
+  { "ENOSYS", ENOSYS, TARGET_LINUX_ENOSYS },
 #endif
 #ifdef ENOTEMPTY
 # define TARGET_LINUX_ENOTEMPTY 39
-  { ENOTEMPTY, TARGET_LINUX_ENOTEMPTY },
+  { "ENOTEMPTY", ENOTEMPTY, TARGET_LINUX_ENOTEMPTY },
 #endif
 #ifdef ELOOP
 # define TARGET_LINUX_ELOOP 40
-  { ELOOP, TARGET_LINUX_ELOOP },
+  { "ELOOP", ELOOP, TARGET_LINUX_ELOOP },
 #endif
 #ifdef ENOMSG
 # define TARGET_LINUX_ENOMSG 42
-  { ENOMSG, TARGET_LINUX_ENOMSG },
+  { "ENOMSG", ENOMSG, TARGET_LINUX_ENOMSG },
 #endif
 #ifdef EIDRM
 # define TARGET_LINUX_EIDRM 43
-  { EIDRM, TARGET_LINUX_EIDRM },
+  { "EIDRM", EIDRM, TARGET_LINUX_EIDRM },
 #endif
 #ifdef ECHRNG
 # define TARGET_LINUX_ECHRNG 44
-  { ECHRNG, TARGET_LINUX_ECHRNG },
+  { "ECHRNG", ECHRNG, TARGET_LINUX_ECHRNG },
 #endif
 #ifdef EL2NSYNC
 # define TARGET_LINUX_EL2NSYNC 45
-  { EL2NSYNC, TARGET_LINUX_EL2NSYNC },
+  { "EL2NSYNC", EL2NSYNC, TARGET_LINUX_EL2NSYNC },
 #endif
 #ifdef EL3HLT
 # define TARGET_LINUX_EL3HLT 46
-  { EL3HLT, TARGET_LINUX_EL3HLT },
+  { "EL3HLT", EL3HLT, TARGET_LINUX_EL3HLT },
 #endif
 #ifdef EL3RST
 # define TARGET_LINUX_EL3RST 47
-  { EL3RST, TARGET_LINUX_EL3RST },
+  { "EL3RST", EL3RST, TARGET_LINUX_EL3RST },
 #endif
 #ifdef ELNRNG
 # define TARGET_LINUX_ELNRNG 48
-  { ELNRNG, TARGET_LINUX_ELNRNG },
+  { "ELNRNG", ELNRNG, TARGET_LINUX_ELNRNG },
 #endif
 #ifdef EUNATCH
 # define TARGET_LINUX_EUNATCH 49
-  { EUNATCH, TARGET_LINUX_EUNATCH },
+  { "EUNATCH", EUNATCH, TARGET_LINUX_EUNATCH },
 #endif
 #ifdef ENOCSI
 # define TARGET_LINUX_ENOCSI 50
-  { ENOCSI, TARGET_LINUX_ENOCSI },
+  { "ENOCSI", ENOCSI, TARGET_LINUX_ENOCSI },
 #endif
 #ifdef EL2HLT
 # define TARGET_LINUX_EL2HLT 51
-  { EL2HLT, TARGET_LINUX_EL2HLT },
+  { "EL2HLT", EL2HLT, TARGET_LINUX_EL2HLT },
 #endif
 #ifdef EBADE
 # define TARGET_LINUX_EBADE 52
-  { EBADE, TARGET_LINUX_EBADE },
+  { "EBADE", EBADE, TARGET_LINUX_EBADE },
 #endif
 #ifdef EBADR
 # define TARGET_LINUX_EBADR 53
-  { EBADR, TARGET_LINUX_EBADR },
+  { "EBADR", EBADR, TARGET_LINUX_EBADR },
 #endif
 #ifdef EXFULL
 # define TARGET_LINUX_EXFULL 54
-  { EXFULL, TARGET_LINUX_EXFULL },
+  { "EXFULL", EXFULL, TARGET_LINUX_EXFULL },
 #endif
 #ifdef ENOANO
 # define TARGET_LINUX_ENOANO 55
-  { ENOANO, TARGET_LINUX_ENOANO },
+  { "ENOANO", ENOANO, TARGET_LINUX_ENOANO },
 #endif
 #ifdef EBADRQC
 # define TARGET_LINUX_EBADRQC 56
-  { EBADRQC, TARGET_LINUX_EBADRQC },
+  { "EBADRQC", EBADRQC, TARGET_LINUX_EBADRQC },
 #endif
 #ifdef EBADSLT
 # define TARGET_LINUX_EBADSLT 57
-  { EBADSLT, TARGET_LINUX_EBADSLT },
+  { "EBADSLT", EBADSLT, TARGET_LINUX_EBADSLT },
 #endif
 #ifdef EBFONT
 # define TARGET_LINUX_EBFONT 59
-  { EBFONT, TARGET_LINUX_EBFONT },
+  { "EBFONT", EBFONT, TARGET_LINUX_EBFONT },
 #endif
 #ifdef ENOSTR
 # define TARGET_LINUX_ENOSTR 60
-  { ENOSTR, TARGET_LINUX_ENOSTR },
+  { "ENOSTR", ENOSTR, TARGET_LINUX_ENOSTR },
 #endif
 #ifdef ENODATA
 # define TARGET_LINUX_ENODATA 61
-  { ENODATA, TARGET_LINUX_ENODATA },
+  { "ENODATA", ENODATA, TARGET_LINUX_ENODATA },
 #endif
 #ifdef ETIME
 # define TARGET_LINUX_ETIME 62
-  { ETIME, TARGET_LINUX_ETIME },
+  { "ETIME", ETIME, TARGET_LINUX_ETIME },
 #endif
 #ifdef ENOSR
 # define TARGET_LINUX_ENOSR 63
-  { ENOSR, TARGET_LINUX_ENOSR },
+  { "ENOSR", ENOSR, TARGET_LINUX_ENOSR },
 #endif
 #ifdef ENONET
 # define TARGET_LINUX_ENONET 64
-  { ENONET, TARGET_LINUX_ENONET },
+  { "ENONET", ENONET, TARGET_LINUX_ENONET },
 #endif
 #ifdef ENOPKG
 # define TARGET_LINUX_ENOPKG 65
-  { ENOPKG, TARGET_LINUX_ENOPKG },
+  { "ENOPKG", ENOPKG, TARGET_LINUX_ENOPKG },
 #endif
 #ifdef EREMOTE
 # define TARGET_LINUX_EREMOTE 66
-  { EREMOTE, TARGET_LINUX_EREMOTE },
+  { "EREMOTE", EREMOTE, TARGET_LINUX_EREMOTE },
 #endif
 #ifdef ENOLINK
 # define TARGET_LINUX_ENOLINK 67
-  { ENOLINK, TARGET_LINUX_ENOLINK },
+  { "ENOLINK", ENOLINK, TARGET_LINUX_ENOLINK },
 #endif
 #ifdef EADV
 # define TARGET_LINUX_EADV 68
-  { EADV, TARGET_LINUX_EADV },
+  { "EADV", EADV, TARGET_LINUX_EADV },
 #endif
 #ifdef ESRMNT
 # define TARGET_LINUX_ESRMNT 69
-  { ESRMNT, TARGET_LINUX_ESRMNT },
+  { "ESRMNT", ESRMNT, TARGET_LINUX_ESRMNT },
 #endif
 #ifdef ECOMM
 # define TARGET_LINUX_ECOMM 70
-  { ECOMM, TARGET_LINUX_ECOMM },
+  { "ECOMM", ECOMM, TARGET_LINUX_ECOMM },
 #endif
 #ifdef EPROTO
 # define TARGET_LINUX_EPROTO 71
-  { EPROTO, TARGET_LINUX_EPROTO },
+  { "EPROTO", EPROTO, TARGET_LINUX_EPROTO },
 #endif
 #ifdef EMULTIHOP
 # define TARGET_LINUX_EMULTIHOP 72
-  { EMULTIHOP, TARGET_LINUX_EMULTIHOP },
+  { "EMULTIHOP", EMULTIHOP, TARGET_LINUX_EMULTIHOP },
 #endif
 #ifdef EDOTDOT
 # define TARGET_LINUX_EDOTDOT 73
-  { EDOTDOT, TARGET_LINUX_EDOTDOT },
+  { "EDOTDOT", EDOTDOT, TARGET_LINUX_EDOTDOT },
 #endif
 #ifdef EBADMSG
 # define TARGET_LINUX_EBADMSG 74
-  { EBADMSG, TARGET_LINUX_EBADMSG },
+  { "EBADMSG", EBADMSG, TARGET_LINUX_EBADMSG },
 #endif
 #ifdef EOVERFLOW
 # define TARGET_LINUX_EOVERFLOW 75
-  { EOVERFLOW, TARGET_LINUX_EOVERFLOW },
+  { "EOVERFLOW", EOVERFLOW, TARGET_LINUX_EOVERFLOW },
 #endif
 #ifdef ENOTUNIQ
 # define TARGET_LINUX_ENOTUNIQ 76
-  { ENOTUNIQ, TARGET_LINUX_ENOTUNIQ },
+  { "ENOTUNIQ", ENOTUNIQ, TARGET_LINUX_ENOTUNIQ },
 #endif
 #ifdef EBADFD
 # define TARGET_LINUX_EBADFD 77
-  { EBADFD, TARGET_LINUX_EBADFD },
+  { "EBADFD", EBADFD, TARGET_LINUX_EBADFD },
 #endif
 #ifdef EREMCHG
 # define TARGET_LINUX_EREMCHG 78
-  { EREMCHG, TARGET_LINUX_EREMCHG },
+  { "EREMCHG", EREMCHG, TARGET_LINUX_EREMCHG },
 #endif
 #ifdef ELIBACC
 # define TARGET_LINUX_ELIBACC 79
-  { ELIBACC, TARGET_LINUX_ELIBACC },
+  { "ELIBACC", ELIBACC, TARGET_LINUX_ELIBACC },
 #endif
 #ifdef ELIBBAD
 # define TARGET_LINUX_ELIBBAD 80
-  { ELIBBAD, TARGET_LINUX_ELIBBAD },
+  { "ELIBBAD", ELIBBAD, TARGET_LINUX_ELIBBAD },
 #endif
 #ifdef ELIBSCN
 # define TARGET_LINUX_ELIBSCN 81
-  { ELIBSCN, TARGET_LINUX_ELIBSCN },
+  { "ELIBSCN", ELIBSCN, TARGET_LINUX_ELIBSCN },
 #endif
 #ifdef ELIBMAX
 # define TARGET_LINUX_ELIBMAX 82
-  { ELIBMAX, TARGET_LINUX_ELIBMAX },
+  { "ELIBMAX", ELIBMAX, TARGET_LINUX_ELIBMAX },
 #endif
 #ifdef ELIBEXEC
 # define TARGET_LINUX_ELIBEXEC 83
-  { ELIBEXEC, TARGET_LINUX_ELIBEXEC },
+  { "ELIBEXEC", ELIBEXEC, TARGET_LINUX_ELIBEXEC },
 #endif
 #ifdef EILSEQ
 # define TARGET_LINUX_EILSEQ 84
-  { EILSEQ, TARGET_LINUX_EILSEQ },
+  { "EILSEQ", EILSEQ, TARGET_LINUX_EILSEQ },
 #endif
 #ifdef ERESTART
 # define TARGET_LINUX_ERESTART 85
-  { ERESTART, TARGET_LINUX_ERESTART },
+  { "ERESTART", ERESTART, TARGET_LINUX_ERESTART },
 #endif
 #ifdef ESTRPIPE
 # define TARGET_LINUX_ESTRPIPE 86
-  { ESTRPIPE, TARGET_LINUX_ESTRPIPE },
+  { "ESTRPIPE", ESTRPIPE, TARGET_LINUX_ESTRPIPE },
 #endif
 #ifdef EUSERS
 # define TARGET_LINUX_EUSERS 87
-  { EUSERS, TARGET_LINUX_EUSERS },
+  { "EUSERS", EUSERS, TARGET_LINUX_EUSERS },
 #endif
 #ifdef ENOTSOCK
 # define TARGET_LINUX_ENOTSOCK 88
-  { ENOTSOCK, TARGET_LINUX_ENOTSOCK },
+  { "ENOTSOCK", ENOTSOCK, TARGET_LINUX_ENOTSOCK },
 #endif
 #ifdef EDESTADDRREQ
 # define TARGET_LINUX_EDESTADDRREQ 89
-  { EDESTADDRREQ, TARGET_LINUX_EDESTADDRREQ },
+  { "EDESTADDRREQ", EDESTADDRREQ, TARGET_LINUX_EDESTADDRREQ },
 #endif
 #ifdef EMSGSIZE
 # define TARGET_LINUX_EMSGSIZE 90
-  { EMSGSIZE, TARGET_LINUX_EMSGSIZE },
+  { "EMSGSIZE", EMSGSIZE, TARGET_LINUX_EMSGSIZE },
 #endif
 #ifdef EPROTOTYPE
 # define TARGET_LINUX_EPROTOTYPE 91
-  { EPROTOTYPE, TARGET_LINUX_EPROTOTYPE },
+  { "EPROTOTYPE", EPROTOTYPE, TARGET_LINUX_EPROTOTYPE },
 #endif
 #ifdef ENOPROTOOPT
 # define TARGET_LINUX_ENOPROTOOPT 92
-  { ENOPROTOOPT, TARGET_LINUX_ENOPROTOOPT },
+  { "ENOPROTOOPT", ENOPROTOOPT, TARGET_LINUX_ENOPROTOOPT },
 #endif
 #ifdef EPROTONOSUPPORT
 # define TARGET_LINUX_EPROTONOSUPPORT 93
-  { EPROTONOSUPPORT, TARGET_LINUX_EPROTONOSUPPORT },
+  { "EPROTONOSUPPORT", EPROTONOSUPPORT, TARGET_LINUX_EPROTONOSUPPORT },
 #endif
 #ifdef ESOCKTNOSUPPORT
 # define TARGET_LINUX_ESOCKTNOSUPPORT 94
-  { ESOCKTNOSUPPORT, TARGET_LINUX_ESOCKTNOSUPPORT },
+  { "ESOCKTNOSUPPORT", ESOCKTNOSUPPORT, TARGET_LINUX_ESOCKTNOSUPPORT },
 #endif
 #ifdef EOPNOTSUPP
 # define TARGET_LINUX_EOPNOTSUPP 95
-  { EOPNOTSUPP, TARGET_LINUX_EOPNOTSUPP },
+  { "EOPNOTSUPP", EOPNOTSUPP, TARGET_LINUX_EOPNOTSUPP },
 #endif
 #ifdef EPFNOSUPPORT
 # define TARGET_LINUX_EPFNOSUPPORT 96
-  { EPFNOSUPPORT, TARGET_LINUX_EPFNOSUPPORT },
+  { "EPFNOSUPPORT", EPFNOSUPPORT, TARGET_LINUX_EPFNOSUPPORT },
 #endif
 #ifdef EAFNOSUPPORT
 # define TARGET_LINUX_EAFNOSUPPORT 97
-  { EAFNOSUPPORT, TARGET_LINUX_EAFNOSUPPORT },
+  { "EAFNOSUPPORT", EAFNOSUPPORT, TARGET_LINUX_EAFNOSUPPORT },
 #endif
 #ifdef EADDRINUSE
 # define TARGET_LINUX_EADDRINUSE 98
-  { EADDRINUSE, TARGET_LINUX_EADDRINUSE },
+  { "EADDRINUSE", EADDRINUSE, TARGET_LINUX_EADDRINUSE },
 #endif
 #ifdef EADDRNOTAVAIL
 # define TARGET_LINUX_EADDRNOTAVAIL 99
-  { EADDRNOTAVAIL, TARGET_LINUX_EADDRNOTAVAIL },
+  { "EADDRNOTAVAIL", EADDRNOTAVAIL, TARGET_LINUX_EADDRNOTAVAIL },
 #endif
 #ifdef ENETDOWN
 # define TARGET_LINUX_ENETDOWN 100
-  { ENETDOWN, TARGET_LINUX_ENETDOWN },
+  { "ENETDOWN", ENETDOWN, TARGET_LINUX_ENETDOWN },
 #endif
 #ifdef ENETUNREACH
 # define TARGET_LINUX_ENETUNREACH 101
-  { ENETUNREACH, TARGET_LINUX_ENETUNREACH },
+  { "ENETUNREACH", ENETUNREACH, TARGET_LINUX_ENETUNREACH },
 #endif
 #ifdef ENETRESET
 # define TARGET_LINUX_ENETRESET 102
-  { ENETRESET, TARGET_LINUX_ENETRESET },
+  { "ENETRESET", ENETRESET, TARGET_LINUX_ENETRESET },
 #endif
 #ifdef ECONNABORTED
 # define TARGET_LINUX_ECONNABORTED 103
-  { ECONNABORTED, TARGET_LINUX_ECONNABORTED },
+  { "ECONNABORTED", ECONNABORTED, TARGET_LINUX_ECONNABORTED },
 #endif
 #ifdef ECONNRESET
 # define TARGET_LINUX_ECONNRESET 104
-  { ECONNRESET, TARGET_LINUX_ECONNRESET },
+  { "ECONNRESET", ECONNRESET, TARGET_LINUX_ECONNRESET },
 #endif
 #ifdef ENOBUFS
 # define TARGET_LINUX_ENOBUFS 105
-  { ENOBUFS, TARGET_LINUX_ENOBUFS },
+  { "ENOBUFS", ENOBUFS, TARGET_LINUX_ENOBUFS },
 #endif
 #ifdef EISCONN
 # define TARGET_LINUX_EISCONN 106
-  { EISCONN, TARGET_LINUX_EISCONN },
+  { "EISCONN", EISCONN, TARGET_LINUX_EISCONN },
 #endif
 #ifdef ENOTCONN
 # define TARGET_LINUX_ENOTCONN 107
-  { ENOTCONN, TARGET_LINUX_ENOTCONN },
+  { "ENOTCONN", ENOTCONN, TARGET_LINUX_ENOTCONN },
 #endif
 #ifdef ESHUTDOWN
 # define TARGET_LINUX_ESHUTDOWN 108
-  { ESHUTDOWN, TARGET_LINUX_ESHUTDOWN },
+  { "ESHUTDOWN", ESHUTDOWN, TARGET_LINUX_ESHUTDOWN },
 #endif
 #ifdef ETOOMANYREFS
 # define TARGET_LINUX_ETOOMANYREFS 109
-  { ETOOMANYREFS, TARGET_LINUX_ETOOMANYREFS },
+  { "ETOOMANYREFS", ETOOMANYREFS, TARGET_LINUX_ETOOMANYREFS },
 #endif
 #ifdef ETIMEDOUT
 # define TARGET_LINUX_ETIMEDOUT 110
-  { ETIMEDOUT, TARGET_LINUX_ETIMEDOUT },
+  { "ETIMEDOUT", ETIMEDOUT, TARGET_LINUX_ETIMEDOUT },
 #endif
 #ifdef ECONNREFUSED
 # define TARGET_LINUX_ECONNREFUSED 111
-  { ECONNREFUSED, TARGET_LINUX_ECONNREFUSED },
+  { "ECONNREFUSED", ECONNREFUSED, TARGET_LINUX_ECONNREFUSED },
 #endif
 #ifdef EHOSTDOWN
 # define TARGET_LINUX_EHOSTDOWN 112
-  { EHOSTDOWN, TARGET_LINUX_EHOSTDOWN },
+  { "EHOSTDOWN", EHOSTDOWN, TARGET_LINUX_EHOSTDOWN },
 #endif
 #ifdef EHOSTUNREACH
 # define TARGET_LINUX_EHOSTUNREACH 113
-  { EHOSTUNREACH, TARGET_LINUX_EHOSTUNREACH },
+  { "EHOSTUNREACH", EHOSTUNREACH, TARGET_LINUX_EHOSTUNREACH },
 #endif
 #ifdef EALREADY
 # define TARGET_LINUX_EALREADY 114
-  { EALREADY, TARGET_LINUX_EALREADY },
+  { "EALREADY", EALREADY, TARGET_LINUX_EALREADY },
 #endif
 #ifdef EINPROGRESS
 # define TARGET_LINUX_EINPROGRESS 115
-  { EINPROGRESS, TARGET_LINUX_EINPROGRESS },
+  { "EINPROGRESS", EINPROGRESS, TARGET_LINUX_EINPROGRESS },
 #endif
 #ifdef ESTALE
 # define TARGET_LINUX_ESTALE 116
-  { ESTALE, TARGET_LINUX_ESTALE },
+  { "ESTALE", ESTALE, TARGET_LINUX_ESTALE },
 #endif
 #ifdef EUCLEAN
 # define TARGET_LINUX_EUCLEAN 117
-  { EUCLEAN, TARGET_LINUX_EUCLEAN },
+  { "EUCLEAN", EUCLEAN, TARGET_LINUX_EUCLEAN },
 #endif
 #ifdef ENOTNAM
 # define TARGET_LINUX_ENOTNAM 118
-  { ENOTNAM, TARGET_LINUX_ENOTNAM },
+  { "ENOTNAM", ENOTNAM, TARGET_LINUX_ENOTNAM },
 #endif
 #ifdef ENAVAIL
 # define TARGET_LINUX_ENAVAIL 119
-  { ENAVAIL, TARGET_LINUX_ENAVAIL },
+  { "ENAVAIL", ENAVAIL, TARGET_LINUX_ENAVAIL },
 #endif
 #ifdef EISNAM
 # define TARGET_LINUX_EISNAM 120
-  { EISNAM, TARGET_LINUX_EISNAM },
+  { "EISNAM", EISNAM, TARGET_LINUX_EISNAM },
 #endif
 #ifdef EREMOTEIO
 # define TARGET_LINUX_EREMOTEIO 121
-  { EREMOTEIO, TARGET_LINUX_EREMOTEIO },
+  { "EREMOTEIO", EREMOTEIO, TARGET_LINUX_EREMOTEIO },
 #endif
 #ifdef EDQUOT
 # define TARGET_LINUX_EDQUOT 122
-  { EDQUOT, TARGET_LINUX_EDQUOT },
+  { "EDQUOT", EDQUOT, TARGET_LINUX_EDQUOT },
 #endif
 #ifdef ENOMEDIUM
 # define TARGET_LINUX_ENOMEDIUM 123
-  { ENOMEDIUM, TARGET_LINUX_ENOMEDIUM },
+  { "ENOMEDIUM", ENOMEDIUM, TARGET_LINUX_ENOMEDIUM },
 #endif
 #ifdef EMEDIUMTYPE
 # define TARGET_LINUX_EMEDIUMTYPE 124
-  { EMEDIUMTYPE, TARGET_LINUX_EMEDIUMTYPE },
+  { "EMEDIUMTYPE", EMEDIUMTYPE, TARGET_LINUX_EMEDIUMTYPE },
 #endif
 #ifdef ECANCELED
 # define TARGET_LINUX_ECANCELED 125
-  { ECANCELED, TARGET_LINUX_ECANCELED },
+  { "ECANCELED", ECANCELED, TARGET_LINUX_ECANCELED },
 #endif
 #ifdef EOWNERDEAD
 # define TARGET_LINUX_EOWNERDEAD 130
-  { EOWNERDEAD, TARGET_LINUX_EOWNERDEAD },
+  { "EOWNERDEAD", EOWNERDEAD, TARGET_LINUX_EOWNERDEAD },
 #endif
 #ifdef ENOTRECOVERABLE
 # define TARGET_LINUX_ENOTRECOVERABLE 131
-  { ENOTRECOVERABLE, TARGET_LINUX_ENOTRECOVERABLE },
+  { "ENOTRECOVERABLE", ENOTRECOVERABLE, TARGET_LINUX_ENOTRECOVERABLE },
 #endif
-  { 0, 0 }
+  { 0, 0, 0 }
 };
 
 static CB_TARGET_DEFS_MAP cb_linux_open_map[] =
 {
 #ifdef O_ACCMODE
 # define TARGET_LINUX_O_ACCMODE 0003
-  { O_ACCMODE, TARGET_LINUX_O_ACCMODE },
+  { "O_ACCMODE", O_ACCMODE, TARGET_LINUX_O_ACCMODE },
 #endif
 #ifdef O_RDONLY
 # define TARGET_LINUX_O_RDONLY 00
-  { O_RDONLY, TARGET_LINUX_O_RDONLY },
+  { "O_RDONLY", O_RDONLY, TARGET_LINUX_O_RDONLY },
 #endif
 #ifdef O_WRONLY
 # define TARGET_LINUX_O_WRONLY 01
-  { O_WRONLY, TARGET_LINUX_O_WRONLY },
+  { "O_WRONLY", O_WRONLY, TARGET_LINUX_O_WRONLY },
 #endif
 #ifdef O_RDWR
 # define TARGET_LINUX_O_RDWR 02
-  { O_RDWR, TARGET_LINUX_O_RDWR },
+  { "O_RDWR", O_RDWR, TARGET_LINUX_O_RDWR },
 #endif
 #ifdef O_CREAT
 # define TARGET_LINUX_O_CREAT 0100
-  { O_CREAT, TARGET_LINUX_O_CREAT },
+  { "O_CREAT", O_CREAT, TARGET_LINUX_O_CREAT },
 #endif
 #ifdef O_EXCL
 # define TARGET_LINUX_O_EXCL 0200
-  { O_EXCL, TARGET_LINUX_O_EXCL },
+  { "O_EXCL", O_EXCL, TARGET_LINUX_O_EXCL },
 #endif
 #ifdef O_NOCTTY
 # define TARGET_LINUX_O_NOCTTY 0400
-  { O_NOCTTY, TARGET_LINUX_O_NOCTTY },
+  { "O_NOCTTY", O_NOCTTY, TARGET_LINUX_O_NOCTTY },
 #endif
 #ifdef O_TRUNC
 # define TARGET_LINUX_O_TRUNC 01000
-  { O_TRUNC, TARGET_LINUX_O_TRUNC },
+  { "O_TRUNC", O_TRUNC, TARGET_LINUX_O_TRUNC },
 #endif
 #ifdef O_APPEND
 # define TARGET_LINUX_O_APPEND 02000
-  { O_APPEND, TARGET_LINUX_O_APPEND },
+  { "O_APPEND", O_APPEND, TARGET_LINUX_O_APPEND },
 #endif
 #ifdef O_NONBLOCK
 # define TARGET_LINUX_O_NONBLOCK 04000
-  { O_NONBLOCK, TARGET_LINUX_O_NONBLOCK },
+  { "O_NONBLOCK", O_NONBLOCK, TARGET_LINUX_O_NONBLOCK },
 #endif
 #ifdef O_SYNC
 # define TARGET_LINUX_O_SYNC 010000
-  { O_SYNC, TARGET_LINUX_O_SYNC },
+  { "O_SYNC", O_SYNC, TARGET_LINUX_O_SYNC },
 #endif
 #ifdef O_ASYNC
 # define TARGET_LINUX_O_ASYNC 020000
-  { O_ASYNC, TARGET_LINUX_O_ASYNC },
+  { "O_ASYNC", O_ASYNC, TARGET_LINUX_O_ASYNC },
 #endif
-  { -1, -1 }
+  { 0, -1, -1 }
 };
 
 static CB_TARGET_DEFS_MAP cb_linux_signal_map[] =
 {
 #ifdef SIGHUP
 # define TARGET_LINUX_SIGHUP 1
-  { SIGHUP, TARGET_LINUX_SIGHUP },
+  { "SIGHUP", SIGHUP, TARGET_LINUX_SIGHUP },
 #endif
 #ifdef SIGINT
 # define TARGET_LINUX_SIGINT 2
-  { SIGINT, TARGET_LINUX_SIGINT },
+  { "SIGINT", SIGINT, TARGET_LINUX_SIGINT },
 #endif
 #ifdef SIGQUIT
 # define TARGET_LINUX_SIGQUIT 3
-  { SIGQUIT, TARGET_LINUX_SIGQUIT },
+  { "SIGQUIT", SIGQUIT, TARGET_LINUX_SIGQUIT },
 #endif
 #ifdef SIGILL
 # define TARGET_LINUX_SIGILL 4
-  { SIGILL, TARGET_LINUX_SIGILL },
+  { "SIGILL", SIGILL, TARGET_LINUX_SIGILL },
 #endif
 #ifdef SIGTRAP
 # define TARGET_LINUX_SIGTRAP 5
-  { SIGTRAP, TARGET_LINUX_SIGTRAP },
+  { "SIGTRAP", SIGTRAP, TARGET_LINUX_SIGTRAP },
 #endif
 #ifdef SIGABRT
 # define TARGET_LINUX_SIGABRT 6
-  { SIGABRT, TARGET_LINUX_SIGABRT },
+  { "SIGABRT", SIGABRT, TARGET_LINUX_SIGABRT },
 #endif
 #ifdef SIGIOT
 # define TARGET_LINUX_SIGIOT 6
-  { SIGIOT, TARGET_LINUX_SIGIOT },
+  { "SIGIOT", SIGIOT, TARGET_LINUX_SIGIOT },
 #endif
 #ifdef SIGBUS
 # define TARGET_LINUX_SIGBUS 7
-  { SIGBUS, TARGET_LINUX_SIGBUS },
+  { "SIGBUS", SIGBUS, TARGET_LINUX_SIGBUS },
 #endif
 #ifdef SIGFPE
 # define TARGET_LINUX_SIGFPE 8
-  { SIGFPE, TARGET_LINUX_SIGFPE },
+  { "SIGFPE", SIGFPE, TARGET_LINUX_SIGFPE },
 #endif
 #ifdef SIGKILL
 # define TARGET_LINUX_SIGKILL 9
-  { SIGKILL, TARGET_LINUX_SIGKILL },
+  { "SIGKILL", SIGKILL, TARGET_LINUX_SIGKILL },
 #endif
 #ifdef SIGUSR1
 # define TARGET_LINUX_SIGUSR1 10
-  { SIGUSR1, TARGET_LINUX_SIGUSR1 },
+  { "SIGUSR1", SIGUSR1, TARGET_LINUX_SIGUSR1 },
 #endif
 #ifdef SIGSEGV
 # define TARGET_LINUX_SIGSEGV 11
-  { SIGSEGV, TARGET_LINUX_SIGSEGV },
+  { "SIGSEGV", SIGSEGV, TARGET_LINUX_SIGSEGV },
 #endif
 #ifdef SIGUSR2
 # define TARGET_LINUX_SIGUSR2 12
-  { SIGUSR2, TARGET_LINUX_SIGUSR2 },
+  { "SIGUSR2", SIGUSR2, TARGET_LINUX_SIGUSR2 },
 #endif
 #ifdef SIGPIPE
 # define TARGET_LINUX_SIGPIPE 13
-  { SIGPIPE, TARGET_LINUX_SIGPIPE },
+  { "SIGPIPE", SIGPIPE, TARGET_LINUX_SIGPIPE },
 #endif
 #ifdef SIGALRM
 # define TARGET_LINUX_SIGALRM 14
-  { SIGALRM, TARGET_LINUX_SIGALRM },
+  { "SIGALRM", SIGALRM, TARGET_LINUX_SIGALRM },
 #endif
 #ifdef SIGTERM
 # define TARGET_LINUX_SIGTERM 15
-  { SIGTERM, TARGET_LINUX_SIGTERM },
+  { "SIGTERM", SIGTERM, TARGET_LINUX_SIGTERM },
 #endif
 #ifdef SIGSTKFLT
 # define TARGET_LINUX_SIGSTKFLT 16
-  { SIGSTKFLT, TARGET_LINUX_SIGSTKFLT },
+  { "SIGSTKFLT", SIGSTKFLT, TARGET_LINUX_SIGSTKFLT },
 #endif
 #ifdef SIGCHLD
 # define TARGET_LINUX_SIGCHLD 17
-  { SIGCHLD, TARGET_LINUX_SIGCHLD },
+  { "SIGCHLD", SIGCHLD, TARGET_LINUX_SIGCHLD },
 #endif
 #ifdef SIGCONT
 # define TARGET_LINUX_SIGCONT 18
-  { SIGCONT, TARGET_LINUX_SIGCONT },
+  { "SIGCONT", SIGCONT, TARGET_LINUX_SIGCONT },
 #endif
 #ifdef SIGSTOP
 # define TARGET_LINUX_SIGSTOP 19
-  { SIGSTOP, TARGET_LINUX_SIGSTOP },
+  { "SIGSTOP", SIGSTOP, TARGET_LINUX_SIGSTOP },
 #endif
 #ifdef SIGTSTP
 # define TARGET_LINUX_SIGTSTP 20
-  { SIGTSTP, TARGET_LINUX_SIGTSTP },
+  { "SIGTSTP", SIGTSTP, TARGET_LINUX_SIGTSTP },
 #endif
 #ifdef SIGTTIN
 # define TARGET_LINUX_SIGTTIN 21
-  { SIGTTIN, TARGET_LINUX_SIGTTIN },
+  { "SIGTTIN", SIGTTIN, TARGET_LINUX_SIGTTIN },
 #endif
 #ifdef SIGTTOU
 # define TARGET_LINUX_SIGTTOU 22
-  { SIGTTOU, TARGET_LINUX_SIGTTOU },
+  { "SIGTTOU", SIGTTOU, TARGET_LINUX_SIGTTOU },
 #endif
 #ifdef SIGURG
 # define TARGET_LINUX_SIGURG 23
-  { SIGURG, TARGET_LINUX_SIGURG },
+  { "SIGURG", SIGURG, TARGET_LINUX_SIGURG },
 #endif
 #ifdef SIGXCPU
 # define TARGET_LINUX_SIGXCPU 24
-  { SIGXCPU, TARGET_LINUX_SIGXCPU },
+  { "SIGXCPU", SIGXCPU, TARGET_LINUX_SIGXCPU },
 #endif
 #ifdef SIGXFSZ
 # define TARGET_LINUX_SIGXFSZ 25
-  { SIGXFSZ, TARGET_LINUX_SIGXFSZ },
+  { "SIGXFSZ", SIGXFSZ, TARGET_LINUX_SIGXFSZ },
 #endif
 #ifdef SIGVTALRM
 # define TARGET_LINUX_SIGVTALRM 26
-  { SIGVTALRM, TARGET_LINUX_SIGVTALRM },
+  { "SIGVTALRM", SIGVTALRM, TARGET_LINUX_SIGVTALRM },
 #endif
 #ifdef SIGPROF
 # define TARGET_LINUX_SIGPROF 27
-  { SIGPROF, TARGET_LINUX_SIGPROF },
+  { "SIGPROF", SIGPROF, TARGET_LINUX_SIGPROF },
 #endif
 #ifdef SIGWINCH
 # define TARGET_LINUX_SIGWINCH 28
-  { SIGWINCH, TARGET_LINUX_SIGWINCH },
+  { "SIGWINCH", SIGWINCH, TARGET_LINUX_SIGWINCH },
 #endif
 #ifdef SIGIO
 # define TARGET_LINUX_SIGIO 29
-  { SIGIO, TARGET_LINUX_SIGIO },
+  { "SIGIO", SIGIO, TARGET_LINUX_SIGIO },
 #endif
 #ifdef SIGPWR
 # define TARGET_LINUX_SIGPWR 30
-  { SIGPWR, TARGET_LINUX_SIGPWR },
+  { "SIGPWR", SIGPWR, TARGET_LINUX_SIGPWR },
 #endif
 #ifdef SIGSYS
 # define TARGET_LINUX_SIGSYS 31
-  { SIGSYS, TARGET_LINUX_SIGSYS },
+  { "SIGSYS", SIGSYS, TARGET_LINUX_SIGSYS },
 #endif
 #ifdef SIGUNUSED
 # define TARGET_LINUX_SIGUNUSED 31
-  { SIGUNUSED, TARGET_LINUX_SIGUNUSED },
+  { "SIGUNUSED", SIGUNUSED, TARGET_LINUX_SIGUNUSED },
 #endif
 #ifdef SIG_BLOCK
 # define TARGET_LINUX_SIG_BLOCK 0
-  { SIG_BLOCK, TARGET_LINUX_SIG_BLOCK },
+  { "SIG_BLOCK", SIG_BLOCK, TARGET_LINUX_SIG_BLOCK },
 #endif
 #ifdef SIG_UNBLOCK
 # define TARGET_LINUX_SIG_UNBLOCK 1
-  { SIG_UNBLOCK, TARGET_LINUX_SIG_UNBLOCK },
+  { "SIG_UNBLOCK", SIG_UNBLOCK, TARGET_LINUX_SIG_UNBLOCK },
 #endif
 #ifdef SIG_SETMASK
 # define TARGET_LINUX_SIG_SETMASK 2
-  { SIG_SETMASK, TARGET_LINUX_SIG_SETMASK },
+  { "SIG_SETMASK", SIG_SETMASK, TARGET_LINUX_SIG_SETMASK },
 #endif
 #ifdef SIGSTKSZ
 # define TARGET_LINUX_SIGSTKSZ 8192
-  { SIGSTKSZ, TARGET_LINUX_SIGSTKSZ },
+  { "SIGSTKSZ", SIGSTKSZ, TARGET_LINUX_SIGSTKSZ },
 #endif
-  { -1, -1 }
+  { 0, -1, -1 }
 };
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index a8be420..0478f2c 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,13 @@
+2015-06-17  Mike Frysinger  <vapier@gentoo.org>
+
+	* callback.c (cb_target_map_entry, cb_host_map_entry): Define.
+	(cb_target_to_host_syscall): Rewrite to use cb_target_map_entry.
+	(cb_host_to_target_errno): Rewrite to use cb_host_map_entry.
+	(cb_host_str_syscall, cb_host_str_errno, cb_host_str_signal,
+	cb_target_str_syscall, cb_target_str_errno, cb_target_str_signal):
+	Define.
+	* gentmap.c (gen_targ_map_c): Output name field.
+
 2015-06-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* acinclude.m4: Change configure.in to configure.ac.
diff --git a/sim/common/callback.c b/sim/common/callback.c
index f295641..9b42536 100644
--- a/sim/common/callback.c
+++ b/sim/common/callback.c
@@ -796,6 +796,32 @@ cb_read_target_syscall_maps (host_callback *cb, const char *file)
   return CB_RC_OK;
 }
 
+/* General utility functions to search a map for a value.  */
+
+static const CB_TARGET_DEFS_MAP *
+cb_target_map_entry (const CB_TARGET_DEFS_MAP map[], int target_val)
+{
+  const CB_TARGET_DEFS_MAP *m;
+
+  for (m = &map[0]; map->target_val != -1; ++m)
+    if (m->target_val == target_val)
+      return m;
+
+  return NULL;
+}
+
+static const CB_TARGET_DEFS_MAP *
+cb_host_map_entry (const CB_TARGET_DEFS_MAP map[], int host_val)
+{
+  const CB_TARGET_DEFS_MAP *m;
+
+  for (m = &map[0]; map->host_val != -1; ++m)
+    if (m->host_val == host_val)
+      return m;
+
+  return NULL;
+}
+
 /* Translate the target's version of a syscall number to the host's.
    This isn't actually the host's version, rather a canonical form.
    ??? Perhaps this should be renamed to ..._canon_syscall.  */
@@ -803,13 +829,10 @@ cb_read_target_syscall_maps (host_callback *cb, const char *file)
 int
 cb_target_to_host_syscall (host_callback *cb, int target_val)
 {
-  CB_TARGET_DEFS_MAP *m;
-
-  for (m = &cb->syscall_map[0]; m->target_val != -1; ++m)
-    if (m->target_val == target_val)
-      return m->host_val;
+  const CB_TARGET_DEFS_MAP *m =
+    cb_target_map_entry (cb->syscall_map, target_val);
 
-  return -1;
+  return m ? m->host_val : -1;
 }
 
 /* FIXME: sort tables if large.
@@ -821,16 +844,12 @@ cb_target_to_host_syscall (host_callback *cb, int target_val)
 int
 cb_host_to_target_errno (host_callback *cb, int host_val)
 {
-  CB_TARGET_DEFS_MAP *m;
-
-  for (m = &cb->errno_map[0]; m->host_val; ++m)
-    if (m->host_val == host_val)
-      return m->target_val;
+  const CB_TARGET_DEFS_MAP *m = cb_host_map_entry (cb->errno_map, host_val);
 
   /* ??? Which error to return in this case is up for grabs.
      Note that some missing values may have standard alternatives.
      For now return 0 and require caller to deal with it.  */
-  return 0;
+  return m ? m->target_val : 0;
 }
 
 /* Given a set of target bitmasks for the open system call,
@@ -1045,3 +1064,54 @@ cb_is_stderr (host_callback *cb, int fd)
 {
   return fdbad (cb, fd) ? 0 : fdmap (cb, fd) == 2;
 }
+
+const char *
+cb_host_str_syscall (host_callback *cb, int host_val)
+{
+  const CB_TARGET_DEFS_MAP *m = cb_host_map_entry (cb->syscall_map, host_val);
+
+  return m ? m->name : NULL;
+}
+
+const char *
+cb_host_str_errno (host_callback *cb, int host_val)
+{
+  const CB_TARGET_DEFS_MAP *m = cb_host_map_entry (cb->errno_map, host_val);
+
+  return m ? m->name : NULL;
+}
+
+const char *
+cb_host_str_signal (host_callback *cb, int host_val)
+{
+  const CB_TARGET_DEFS_MAP *m = cb_host_map_entry (cb->signal_map, host_val);
+
+  return m ? m->name : NULL;
+}
+
+const char *
+cb_target_str_syscall (host_callback *cb, int target_val)
+{
+  const CB_TARGET_DEFS_MAP *m =
+    cb_target_map_entry (cb->syscall_map, target_val);
+
+  return m ? m->name : NULL;
+}
+
+const char *
+cb_target_str_errno (host_callback *cb, int target_val)
+{
+  const CB_TARGET_DEFS_MAP *m =
+    cb_target_map_entry (cb->errno_map, target_val);
+
+  return m ? m->name : NULL;
+}
+
+const char *
+cb_target_str_signal (host_callback *cb, int target_val)
+{
+  const CB_TARGET_DEFS_MAP *m =
+    cb_target_map_entry (cb->signal_map, target_val);
+
+  return m ? m->name : NULL;
+}
diff --git a/sim/common/gentmap.c b/sim/common/gentmap.c
index fbc09a2..669a7e5 100644
--- a/sim/common/gentmap.c
+++ b/sim/common/gentmap.c
@@ -80,10 +80,11 @@ gen_targ_map_c (void)
   for (t = &sys_tdefs[0]; t->symbol; ++t)
     {
       printf ("#ifdef CB_%s\n", t->symbol);
-      printf ("  { CB_%s, TARGET_%s },\n", t->symbol, t->symbol);
+      /* Skip the "SYS_" prefix for the name.  */
+      printf ("  { \"%s\", CB_%s, TARGET_%s },\n", t->symbol + 4, t->symbol, t->symbol);
       printf ("#endif\n");
     }
-  printf ("  { -1, -1 }\n");
+  printf ("  { 0, -1, -1 }\n");
   printf ("};\n\n");
 
   printf ("/* errno mapping table */\n");
@@ -91,10 +92,10 @@ gen_targ_map_c (void)
   for (t = &errno_tdefs[0]; t->symbol; ++t)
     {
       printf ("#ifdef %s\n", t->symbol);
-      printf ("  { %s, TARGET_%s },\n", t->symbol, t->symbol);
+      printf ("  { \"%s\", %s, TARGET_%s },\n", t->symbol, t->symbol, t->symbol);
       printf ("#endif\n");
     }
-  printf ("  { 0, 0 }\n");
+  printf ("  { 0, 0, 0 }\n");
   printf ("};\n\n");
 
   printf ("/* open flags mapping table */\n");
@@ -102,10 +103,10 @@ gen_targ_map_c (void)
   for (t = &open_tdefs[0]; t->symbol; ++t)
     {
       printf ("#ifdef %s\n", t->symbol);
-      printf ("  { %s, TARGET_%s },\n", t->symbol, t->symbol);
+      printf ("  { \"%s\", %s, TARGET_%s },\n", t->symbol, t->symbol, t->symbol);
       printf ("#endif\n");
     }
-  printf ("  { -1, -1 }\n");
+  printf ("  { 0, -1, -1 }\n");
   printf ("};\n\n");
 }
 
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index d4133f0..e3a1731 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-17  Mike Frysinger  <vapier@gentoo.org>
+
+	* traps.c (syscall_map): Fill out name field.
+	(syscall_stat32_map, errno_map, open_map): Likewise.
+
 2015-06-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure: Regenerate.
diff --git a/sim/cris/traps.c b/sim/cris/traps.c
index 0feba2e..888f808 100644
--- a/sim/cris/traps.c
+++ b/sim/cris/traps.c
@@ -263,21 +263,21 @@ static const char stat_map[] =
 
 static const CB_TARGET_DEFS_MAP syscall_map[] =
 {
-  { CB_SYS_open, TARGET_SYS_open },
-  { CB_SYS_close, TARGET_SYS_close },
-  { CB_SYS_read, TARGET_SYS_read },
-  { CB_SYS_write, TARGET_SYS_write },
-  { CB_SYS_lseek, TARGET_SYS_lseek },
-  { CB_SYS_unlink, TARGET_SYS_unlink },
-  { CB_SYS_getpid, TARGET_SYS_getpid },
-  { CB_SYS_fstat, TARGET_SYS_fstat64 },
-  { CB_SYS_lstat, TARGET_SYS_lstat64 },
-  { CB_SYS_stat, TARGET_SYS_stat64 },
-  { CB_SYS_pipe, TARGET_SYS_pipe },
-  { CB_SYS_rename, TARGET_SYS_rename },
-  { CB_SYS_truncate, TARGET_SYS_truncate },
-  { CB_SYS_ftruncate, TARGET_SYS_ftruncate },
-  { 0, -1 }
+  { "open", CB_SYS_open, TARGET_SYS_open },
+  { "close", CB_SYS_close, TARGET_SYS_close },
+  { "read", CB_SYS_read, TARGET_SYS_read },
+  { "write", CB_SYS_write, TARGET_SYS_write },
+  { "lseek", CB_SYS_lseek, TARGET_SYS_lseek },
+  { "unlink", CB_SYS_unlink, TARGET_SYS_unlink },
+  { "getpid", CB_SYS_getpid, TARGET_SYS_getpid },
+  { "fstat", CB_SYS_fstat, TARGET_SYS_fstat64 },
+  { "lstat", CB_SYS_lstat, TARGET_SYS_lstat64 },
+  { "stat", CB_SYS_stat, TARGET_SYS_stat64 },
+  { "pipe", CB_SYS_pipe, TARGET_SYS_pipe },
+  { "rename", CB_SYS_rename, TARGET_SYS_rename },
+  { "truncate", CB_SYS_truncate, TARGET_SYS_truncate },
+  { "ftruncate", CB_SYS_ftruncate, TARGET_SYS_ftruncate },
+  { 0, -1, -1 }
 };
 
 /* An older, 32-bit-only stat mapping.  */
@@ -290,9 +290,9 @@ static const char stat32_map[] =
    newlib Linux mapping.  */
 static const CB_TARGET_DEFS_MAP syscall_stat32_map[] =
 {
-  { CB_SYS_fstat, TARGET_SYS_fstat },
-  { CB_SYS_stat, TARGET_SYS_stat },
-  { 0, -1 }
+  { "fstat", CB_SYS_fstat, TARGET_SYS_fstat },
+  { "stat", CB_SYS_stat, TARGET_SYS_stat },
+  { 0, -1, -1 }
 };
 
 /* Giving the true value for the running sim process will lead to
@@ -311,378 +311,378 @@ static const CB_TARGET_DEFS_MAP syscall_stat32_map[] =
 static const CB_TARGET_DEFS_MAP errno_map[] =
 {
 #ifdef EPERM
-  { EPERM, 1 },
+  { "EPERM", EPERM, 1 },
 #endif
 #ifdef ENOENT
-  { ENOENT, 2 },
+  { "ENOENT", ENOENT, 2 },
 #endif
 #ifdef ESRCH
-  { ESRCH, 3 },
+  { "ESRCH", ESRCH, 3 },
 #endif
 #ifdef EINTR
-  { EINTR, 4 },
+  { "EINTR", EINTR, 4 },
 #endif
 #ifdef EIO
-  { EIO, 5 },
+  { "EIO", EIO, 5 },
 #endif
 #ifdef ENXIO
-  { ENXIO, 6 },
+  { "ENXIO", ENXIO, 6 },
 #endif
 #ifdef E2BIG
-  { E2BIG, 7 },
+  { "E2BIG", E2BIG, 7 },
 #endif
 #ifdef ENOEXEC
-  { ENOEXEC, 8 },
+  { "ENOEXEC", ENOEXEC, 8 },
 #endif
 #ifdef EBADF
-  { EBADF, 9 },
+  { "EBADF", EBADF, 9 },
 #endif
 #ifdef ECHILD
-  { ECHILD, 10 },
+  { "ECHILD", ECHILD, 10 },
 #endif
 #ifdef EAGAIN
-  { EAGAIN, 11 },
+  { "EAGAIN", EAGAIN, 11 },
 #endif
 #ifdef ENOMEM
-  { ENOMEM, 12 },
+  { "ENOMEM", ENOMEM, 12 },
 #endif
 #ifdef EACCES
-  { EACCES, 13 },
+  { "EACCES", EACCES, 13 },
 #endif
 #ifdef EFAULT
-  { EFAULT, 14 },
+  { "EFAULT", EFAULT, 14 },
 #endif
 #ifdef ENOTBLK
-  { ENOTBLK, 15 },
+  { "ENOTBLK", ENOTBLK, 15 },
 #endif
 #ifdef EBUSY
-  { EBUSY, 16 },
+  { "EBUSY", EBUSY, 16 },
 #endif
 #ifdef EEXIST
-  { EEXIST, 17 },
+  { "EEXIST", EEXIST, 17 },
 #endif
 #ifdef EXDEV
-  { EXDEV, 18 },
+  { "EXDEV", EXDEV, 18 },
 #endif
 #ifdef ENODEV
-  { ENODEV, 19 },
+  { "ENODEV", ENODEV, 19 },
 #endif
 #ifdef ENOTDIR
-  { ENOTDIR, 20 },
+  { "ENOTDIR", ENOTDIR, 20 },
 #endif
 #ifdef EISDIR
-  { EISDIR, 21 },
+  { "EISDIR", EISDIR, 21 },
 #endif
 #ifdef EINVAL
-  { EINVAL, 22 },
+  { "EINVAL", EINVAL, 22 },
 #endif
 #ifdef ENFILE
-  { ENFILE, 23 },
+  { "ENFILE", ENFILE, 23 },
 #endif
 #ifdef EMFILE
-  { EMFILE, 24 },
+  { "EMFILE", EMFILE, 24 },
 #endif
 #ifdef ENOTTY
-  { ENOTTY, 25 },
+  { "ENOTTY", ENOTTY, 25 },
 #endif
 #ifdef ETXTBSY
-  { ETXTBSY, 26 },
+  { "ETXTBSY", ETXTBSY, 26 },
 #endif
 #ifdef EFBIG
-  { EFBIG, 27 },
+  { "EFBIG", EFBIG, 27 },
 #endif
 #ifdef ENOSPC
-  { ENOSPC, 28 },
+  { "ENOSPC", ENOSPC, 28 },
 #endif
 #ifdef ESPIPE
-  { ESPIPE, 29 },
+  { "ESPIPE", ESPIPE, 29 },
 #endif
 #ifdef EROFS
-  { EROFS, 30 },
+  { "EROFS", EROFS, 30 },
 #endif
 #ifdef EMLINK
-  { EMLINK, 31 },
+  { "EMLINK", EMLINK, 31 },
 #endif
 #ifdef EPIPE
-  { EPIPE, 32 },
+  { "EPIPE", EPIPE, 32 },
 #endif
 #ifdef EDOM
-  { EDOM, 33 },
+  { "EDOM", EDOM, 33 },
 #endif
 #ifdef ERANG[...]

[diff truncated at 100000 bytes]


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]