Add amd64_x32_linux_record_tdep and amd64_x32_sys

X32 Linux system calls are diffferent from amd64 Linux system calls in
system call numbers as well as parameter types/values.  This patch adds
amd64_x32_linux_record_tdep and amd64_x32_syscall for x32.

	PR gdb/16304
	* amd64-linux-tdep.c (amd64_canonicalize_syscall): Handle x32
	system calls.
	(amd64_x32_linux_record_tdep): New.
	(amd64_linux_syscall_record_common): New function.
	(amd64_linux_syscall_record): Call
	amd64_linux_syscall_record_common with amd64_linux_record_tdep.
	(amd64_x32_linux_syscall_record): Call
	amd64_linux_syscall_record_common with
	amd64_x32_linux_record_tdep.
	(amd64_linux_init_abi_common): Move amd64_linux_record_tdep
	initialization and tdep->i386_syscall_record setup to ...
	(amd64_linux_init_abi): Here.
	(amd64_x32_linux_init_abi): Initialize
	amd64_x32_linux_record_tdep.  Set tdep->i386_syscall_record to
	amd64_x32_linux_syscall_record.
	* amd64-linux-tdep.h (amd64_x32_syscall): New enum.

3 files changed, 807 insertions, 57 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3c3db4b..c8cd42a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,23 @@
+2013-12-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gdb/16304
+	* amd64-linux-tdep.c (amd64_canonicalize_syscall): Handle x32
+	system calls.
+	(amd64_x32_linux_record_tdep): New.
+	(amd64_linux_syscall_record_common): New function.
+	(amd64_linux_syscall_record): Call
+	amd64_linux_syscall_record_common with amd64_linux_record_tdep.
+	(amd64_x32_linux_syscall_record): Call
+	amd64_linux_syscall_record_common with
+	amd64_x32_linux_record_tdep.
+	(amd64_linux_init_abi_common): Move amd64_linux_record_tdep
+	initialization and tdep->i386_syscall_record setup to ...
+	(amd64_linux_init_abi): Here.
+	(amd64_x32_linux_init_abi): Initialize
+	amd64_x32_linux_record_tdep.  Set tdep->i386_syscall_record to
+	amd64_x32_linux_syscall_record.
+	* amd64-linux-tdep.h (amd64_x32_syscall): New enum.
+
 2013-12-19  Sergio Durigan Junior  <sergiodj@redhat.com>
 
 	* amd64-tdep.c (amd64_init_abi): Declare SystemTap SDT probe
diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
index 7fe92d1..3852c2e 100644
--- a/gdb/amd64-linux-tdep.c
+++ b/gdb/amd64-linux-tdep.c
@@ -363,801 +363,1066 @@ amd64_canonicalize_syscall (enum amd64_syscall syscall_number)
 {
   switch (syscall_number) {
   case amd64_sys_read:
+  case amd64_x32_sys_read:
     return gdb_sys_read;
 
   case amd64_sys_write:
+  case amd64_x32_sys_write:
     return gdb_sys_write;
 
   case amd64_sys_open:
+  case amd64_x32_sys_open:
     return gdb_sys_open;
 
   case amd64_sys_close:
+  case amd64_x32_sys_close:
     return gdb_sys_close;
 
   case amd64_sys_newstat:
+  case amd64_x32_sys_newstat:
     return gdb_sys_newstat;
 
   case amd64_sys_newfstat:
+  case amd64_x32_sys_newfstat:
     return gdb_sys_newfstat;
 
   case amd64_sys_newlstat:
+  case amd64_x32_sys_newlstat:
     return gdb_sys_newlstat;
 
   case amd64_sys_poll:
+  case amd64_x32_sys_poll:
     return gdb_sys_poll;
 
   case amd64_sys_lseek:
+  case amd64_x32_sys_lseek:
     return gdb_sys_lseek;
 
   case amd64_sys_mmap:
+  case amd64_x32_sys_mmap:
     return gdb_sys_mmap2;
 
   case amd64_sys_mprotect:
+  case amd64_x32_sys_mprotect:
     return gdb_sys_mprotect;
 
   case amd64_sys_munmap:
+  case amd64_x32_sys_munmap:
     return gdb_sys_munmap;
 
   case amd64_sys_brk:
+  case amd64_x32_sys_brk:
     return gdb_sys_brk;
 
   case amd64_sys_rt_sigaction:
+  case amd64_x32_sys_rt_sigaction:
     return gdb_sys_rt_sigaction;
 
   case amd64_sys_rt_sigprocmask:
+  case amd64_x32_sys_rt_sigprocmask:
     return gdb_sys_rt_sigprocmask;
 
   case amd64_sys_rt_sigreturn:
+  case amd64_x32_sys_rt_sigreturn:
     return gdb_sys_rt_sigreturn;
 
   case amd64_sys_ioctl:
+  case amd64_x32_sys_ioctl:
     return gdb_sys_ioctl;
 
   case amd64_sys_pread64:
+  case amd64_x32_sys_pread64:
     return gdb_sys_pread64;
 
   case amd64_sys_pwrite64:
+  case amd64_x32_sys_pwrite64:
     return gdb_sys_pwrite64;
 
   case amd64_sys_readv:
+  case amd64_x32_sys_readv:
     return gdb_sys_readv;
 
   case amd64_sys_writev:
+  case amd64_x32_sys_writev:
     return gdb_sys_writev;
 
   case amd64_sys_access:
+  case amd64_x32_sys_access:
     return gdb_sys_access;
 
   case amd64_sys_pipe:
+  case amd64_x32_sys_pipe:
     return gdb_sys_pipe;
 
   case amd64_sys_select:
+  case amd64_x32_sys_select:
     return gdb_sys_select;
 
   case amd64_sys_sched_yield:
+  case amd64_x32_sys_sched_yield:
     return gdb_sys_sched_yield;
 
   case amd64_sys_mremap:
+  case amd64_x32_sys_mremap:
     return gdb_sys_mremap;
 
   case amd64_sys_msync:
+  case amd64_x32_sys_msync:
     return gdb_sys_msync;
 
   case amd64_sys_mincore:
+  case amd64_x32_sys_mincore:
     return gdb_sys_mincore;
 
   case amd64_sys_madvise:
+  case amd64_x32_sys_madvise:
     return gdb_sys_madvise;
 
   case amd64_sys_shmget:
+  case amd64_x32_sys_shmget:
     return gdb_sys_shmget;
 
   case amd64_sys_shmat:
+  case amd64_x32_sys_shmat:
     return gdb_sys_shmat;
 
   case amd64_sys_shmctl:
+  case amd64_x32_sys_shmctl:
     return gdb_sys_shmctl;
 
   case amd64_sys_dup:
+  case amd64_x32_sys_dup:
     return gdb_sys_dup;
 
   case amd64_sys_dup2:
+  case amd64_x32_sys_dup2:
     return gdb_sys_dup2;
 
   case amd64_sys_pause:
+  case amd64_x32_sys_pause:
     return gdb_sys_pause;
 
   case amd64_sys_nanosleep:
+  case amd64_x32_sys_nanosleep:
     return gdb_sys_nanosleep;
 
   case amd64_sys_getitimer:
+  case amd64_x32_sys_getitimer:
     return gdb_sys_getitimer;
 
   case amd64_sys_alarm:
+  case amd64_x32_sys_alarm:
     return gdb_sys_alarm;
 
   case amd64_sys_setitimer:
+  case amd64_x32_sys_setitimer:
     return gdb_sys_setitimer;
 
   case amd64_sys_getpid:
+  case amd64_x32_sys_getpid:
     return gdb_sys_getpid;
 
   case amd64_sys_sendfile64:
+  case amd64_x32_sys_sendfile64:
     return gdb_sys_sendfile64;
 
   case amd64_sys_socket:
+  case amd64_x32_sys_socket:
     return gdb_sys_socket;
 
   case amd64_sys_connect:
+  case amd64_x32_sys_connect:
     return gdb_sys_connect;
 
   case amd64_sys_accept:
+  case amd64_x32_sys_accept:
     return gdb_sys_accept;
 
   case amd64_sys_sendto:
+  case amd64_x32_sys_sendto:
     return gdb_sys_sendto;
 
   case amd64_sys_recvfrom:
+  case amd64_x32_sys_recvfrom:
     return gdb_sys_recvfrom;
 
   case amd64_sys_sendmsg:
+  case amd64_x32_sys_sendmsg:
     return gdb_sys_sendmsg;
 
   case amd64_sys_recvmsg:
+  case amd64_x32_sys_recvmsg:
     return gdb_sys_recvmsg;
 
   case amd64_sys_shutdown:
+  case amd64_x32_sys_shutdown:
     return gdb_sys_shutdown;
 
   case amd64_sys_bind:
+  case amd64_x32_sys_bind:
     return gdb_sys_bind;
 
   case amd64_sys_listen:
+  case amd64_x32_sys_listen:
     return gdb_sys_listen;
 
   case amd64_sys_getsockname:
+  case amd64_x32_sys_getsockname:
     return gdb_sys_getsockname;
 
   case amd64_sys_getpeername:
+  case amd64_x32_sys_getpeername:
     return gdb_sys_getpeername;
 
   case amd64_sys_socketpair:
+  case amd64_x32_sys_socketpair:
     return gdb_sys_socketpair;
 
   case amd64_sys_setsockopt:
+  case amd64_x32_sys_setsockopt:
     return gdb_sys_setsockopt;
 
   case amd64_sys_getsockopt:
+  case amd64_x32_sys_getsockopt:
     return gdb_sys_getsockopt;
 
   case amd64_sys_clone:
+  case amd64_x32_sys_clone:
     return gdb_sys_clone;
 
   case amd64_sys_fork:
+  case amd64_x32_sys_fork:
     return gdb_sys_fork;
 
   case amd64_sys_vfork:
+  case amd64_x32_sys_vfork:
     return gdb_sys_vfork;
 
   case amd64_sys_execve:
+  case amd64_x32_sys_execve:
     return gdb_sys_execve;
 
   case amd64_sys_exit:
+  case amd64_x32_sys_exit:
     return gdb_sys_exit;
 
   case amd64_sys_wait4:
+  case amd64_x32_sys_wait4:
     return gdb_sys_wait4;
 
   case amd64_sys_kill:
+  case amd64_x32_sys_kill:
     return gdb_sys_kill;
 
   case amd64_sys_uname:
+  case amd64_x32_sys_uname:
     return gdb_sys_uname;
 
   case amd64_sys_semget:
+  case amd64_x32_sys_semget:
     return gdb_sys_semget;
 
   case amd64_sys_semop:
+  case amd64_x32_sys_semop:
     return gdb_sys_semop;
 
   case amd64_sys_semctl:
+  case amd64_x32_sys_semctl:
     return gdb_sys_semctl;
 
   case amd64_sys_shmdt:
+  case amd64_x32_sys_shmdt:
     return gdb_sys_shmdt;
 
   case amd64_sys_msgget:
+  case amd64_x32_sys_msgget:
     return gdb_sys_msgget;
 
   case amd64_sys_msgsnd:
+  case amd64_x32_sys_msgsnd:
     return gdb_sys_msgsnd;
 
   case amd64_sys_msgrcv:
+  case amd64_x32_sys_msgrcv:
     return gdb_sys_msgrcv;
 
   case amd64_sys_msgctl:
+  case amd64_x32_sys_msgctl:
     return gdb_sys_msgctl;
 
   case amd64_sys_fcntl:
+  case amd64_x32_sys_fcntl:
     return gdb_sys_fcntl;
 
   case amd64_sys_flock:
+  case amd64_x32_sys_flock:
     return gdb_sys_flock;
 
   case amd64_sys_fsync:
+  case amd64_x32_sys_fsync:
     return gdb_sys_fsync;
 
   case amd64_sys_fdatasync:
+  case amd64_x32_sys_fdatasync:
     return gdb_sys_fdatasync;
 
   case amd64_sys_truncate:
+  case amd64_x32_sys_truncate:
     return gdb_sys_truncate;
 
   case amd64_sys_ftruncate:
+  case amd64_x32_sys_ftruncate:
     return gdb_sys_ftruncate;
 
   case amd64_sys_getdents:
+  case amd64_x32_sys_getdents:
     return gdb_sys_getdents;
 
   case amd64_sys_getcwd:
+  case amd64_x32_sys_getcwd:
     return gdb_sys_getcwd;
 
   case amd64_sys_chdir:
+  case amd64_x32_sys_chdir:
     return gdb_sys_chdir;
 
   case amd64_sys_fchdir:
+  case amd64_x32_sys_fchdir:
     return gdb_sys_fchdir;
 
   case amd64_sys_rename:
+  case amd64_x32_sys_rename:
     return gdb_sys_rename;
 
   case amd64_sys_mkdir:
+  case amd64_x32_sys_mkdir:
     return gdb_sys_mkdir;
 
   case amd64_sys_rmdir:
+  case amd64_x32_sys_rmdir:
     return gdb_sys_rmdir;
 
   case amd64_sys_creat:
+  case amd64_x32_sys_creat:
     return gdb_sys_creat;
 
   case amd64_sys_link:
+  case amd64_x32_sys_link:
     return gdb_sys_link;
 
   case amd64_sys_unlink:
+  case amd64_x32_sys_unlink:
     return gdb_sys_unlink;
 
   case amd64_sys_symlink:
+  case amd64_x32_sys_symlink:
     return gdb_sys_symlink;
 
   case amd64_sys_readlink:
+  case amd64_x32_sys_readlink:
     return gdb_sys_readlink;
 
   case amd64_sys_chmod:
+  case amd64_x32_sys_chmod:
     return gdb_sys_chmod;
 
   case amd64_sys_fchmod:
+  case amd64_x32_sys_fchmod:
     return gdb_sys_fchmod;
 
   case amd64_sys_chown:
+  case amd64_x32_sys_chown:
     return gdb_sys_chown;
 
   case amd64_sys_fchown:
+  case amd64_x32_sys_fchown:
     return gdb_sys_fchown;
 
   case amd64_sys_lchown:
+  case amd64_x32_sys_lchown:
     return gdb_sys_lchown;
 
   case amd64_sys_umask:
+  case amd64_x32_sys_umask:
     return gdb_sys_umask;
 
   case amd64_sys_gettimeofday:
+  case amd64_x32_sys_gettimeofday:
     return gdb_sys_gettimeofday;
 
   case amd64_sys_getrlimit:
+  case amd64_x32_sys_getrlimit:
     return gdb_sys_getrlimit;
 
   case amd64_sys_getrusage:
+  case amd64_x32_sys_getrusage:
     return gdb_sys_getrusage;
 
   case amd64_sys_sysinfo:
+  case amd64_x32_sys_sysinfo:
     return gdb_sys_sysinfo;
 
   case amd64_sys_times:
+  case amd64_x32_sys_times:
     return gdb_sys_times;
 
   case amd64_sys_ptrace:
+  case amd64_x32_sys_ptrace:
     return gdb_sys_ptrace;
 
   case amd64_sys_getuid:
+  case amd64_x32_sys_getuid:
     return gdb_sys_getuid;
 
   case amd64_sys_syslog:
+  case amd64_x32_sys_syslog:
     return gdb_sys_syslog;
 
   case amd64_sys_getgid:
+  case amd64_x32_sys_getgid:
     return gdb_sys_getgid;
 
   case amd64_sys_setuid:
+  case amd64_x32_sys_setuid:
     return gdb_sys_setuid;
 
   case amd64_sys_setgid:
+  case amd64_x32_sys_setgid:
     return gdb_sys_setgid;
 
   case amd64_sys_geteuid:
+  case amd64_x32_sys_geteuid:
     return gdb_sys_geteuid;
 
   case amd64_sys_getegid:
+  case amd64_x32_sys_getegid:
     return gdb_sys_getegid;
 
   case amd64_sys_setpgid:
+  case amd64_x32_sys_setpgid:
     return gdb_sys_setpgid;
 
   case amd64_sys_getppid:
+  case amd64_x32_sys_getppid:
     return gdb_sys_getppid;
 
   case amd64_sys_getpgrp:
+  case amd64_x32_sys_getpgrp:
     return gdb_sys_getpgrp;
 
   case amd64_sys_setsid:
+  case amd64_x32_sys_setsid:
     return gdb_sys_setsid;
 
   case amd64_sys_setreuid:
+  case amd64_x32_sys_setreuid:
     return gdb_sys_setreuid;
 
   case amd64_sys_setregid:
+  case amd64_x32_sys_setregid:
     return gdb_sys_setregid;
 
   case amd64_sys_getgroups:
+  case amd64_x32_sys_getgroups:
     return gdb_sys_getgroups;
 
   case amd64_sys_setgroups:
+  case amd64_x32_sys_setgroups:
     return gdb_sys_setgroups;
 
   case amd64_sys_setresuid:
+  case amd64_x32_sys_setresuid:
     return gdb_sys_setresuid;
 
   case amd64_sys_getresuid:
+  case amd64_x32_sys_getresuid:
     return gdb_sys_getresuid;
 
   case amd64_sys_setresgid:
+  case amd64_x32_sys_setresgid:
     return gdb_sys_setresgid;
 
   case amd64_sys_getresgid:
+  case amd64_x32_sys_getresgid:
     return gdb_sys_getresgid;
 
   case amd64_sys_getpgid:
+  case amd64_x32_sys_getpgid:
     return gdb_sys_getpgid;
 
   case amd64_sys_setfsuid:
+  case amd64_x32_sys_setfsuid:
     return gdb_sys_setfsuid;
 
   case amd64_sys_setfsgid:
+  case amd64_x32_sys_setfsgid:
     return gdb_sys_setfsgid;
 
   case amd64_sys_getsid:
+  case amd64_x32_sys_getsid:
     return gdb_sys_getsid;
 
   case amd64_sys_capget:
+  case amd64_x32_sys_capget:
     return gdb_sys_capget;
 
   case amd64_sys_capset:
+  case amd64_x32_sys_capset:
     return gdb_sys_capset;
 
   case amd64_sys_rt_sigpending:
+  case amd64_x32_sys_rt_sigpending:
     return gdb_sys_rt_sigpending;
 
   case amd64_sys_rt_sigtimedwait:
+  case amd64_x32_sys_rt_sigtimedwait:
     return gdb_sys_rt_sigtimedwait;
 
   case amd64_sys_rt_sigqueueinfo:
+  case amd64_x32_sys_rt_sigqueueinfo:
     return gdb_sys_rt_sigqueueinfo;
 
   case amd64_sys_rt_sigsuspend:
+  case amd64_x32_sys_rt_sigsuspend:
     return gdb_sys_rt_sigsuspend;
 
   case amd64_sys_sigaltstack:
+  case amd64_x32_sys_sigaltstack:
     return gdb_sys_sigaltstack;
 
   case amd64_sys_utime:
+  case amd64_x32_sys_utime:
     return gdb_sys_utime;
 
   case amd64_sys_mknod:
+  case amd64_x32_sys_mknod:
     return gdb_sys_mknod;
 
   case amd64_sys_personality:
+  case amd64_x32_sys_personality:
     return gdb_sys_personality;
 
   case amd64_sys_ustat:
+  case amd64_x32_sys_ustat:
     return gdb_sys_ustat;
 
   case amd64_sys_statfs:
+  case amd64_x32_sys_statfs:
     return gdb_sys_statfs;
 
   case amd64_sys_fstatfs:
+  case amd64_x32_sys_fstatfs:
     return gdb_sys_fstatfs;
 
   case amd64_sys_sysfs:
+  case amd64_x32_sys_sysfs:
     return gdb_sys_sysfs;
 
   case amd64_sys_getpriority:
+  case amd64_x32_sys_getpriority:
     return gdb_sys_getpriority;
 
   case amd64_sys_setpriority:
+  case amd64_x32_sys_setpriority:
     return gdb_sys_setpriority;
 
   case amd64_sys_sched_setparam:
+  case amd64_x32_sys_sched_setparam:
     return gdb_sys_sched_setparam;
 
   case amd64_sys_sched_getparam:
+  case amd64_x32_sys_sched_getparam:
     return gdb_sys_sched_getparam;
 
   case amd64_sys_sched_setscheduler:
+  case amd64_x32_sys_sched_setscheduler:
     return gdb_sys_sched_setscheduler;
 
   case amd64_sys_sched_getscheduler:
+  case amd64_x32_sys_sched_getscheduler:
     return gdb_sys_sched_getscheduler;
 
   case amd64_sys_sched_get_priority_max:
+  case amd64_x32_sys_sched_get_priority_max:
     return gdb_sys_sched_get_priority_max;
 
   case amd64_sys_sched_get_priority_min:
+  case amd64_x32_sys_sched_get_priority_min:
     return gdb_sys_sched_get_priority_min;
 
   case amd64_sys_sched_rr_get_interval:
+  case amd64_x32_sys_sched_rr_get_interval:
     return gdb_sys_sched_rr_get_interval;
 
   case amd64_sys_mlock:
+  case amd64_x32_sys_mlock:
     return gdb_sys_mlock;
 
   case amd64_sys_munlock:
+  case amd64_x32_sys_munlock:
     return gdb_sys_munlock;
 
   case amd64_sys_mlockall:
+  case amd64_x32_sys_mlockall:
     return gdb_sys_mlockall;
 
   case amd64_sys_munlockall:
+  case amd64_x32_sys_munlockall:
     return gdb_sys_munlockall;
 
   case amd64_sys_vhangup:
+  case amd64_x32_sys_vhangup:
     return gdb_sys_vhangup;
 
   case amd64_sys_modify_ldt:
+  case amd64_x32_sys_modify_ldt:
     return gdb_sys_modify_ldt;
 
   case amd64_sys_pivot_root:
+  case amd64_x32_sys_pivot_root:
     return gdb_sys_pivot_root;
 
   case amd64_sys_sysctl:
+  case amd64_x32_sys_sysctl:
     return gdb_sys_sysctl;
 
   case amd64_sys_prctl:
+  case amd64_x32_sys_prctl:
     return gdb_sys_prctl;
 
   case amd64_sys_arch_prctl:
+  case amd64_x32_sys_arch_prctl:
     return -1;	/* Note */
 
   case amd64_sys_adjtimex:
+  case amd64_x32_sys_adjtimex:
     return gdb_sys_adjtimex;
 
   case amd64_sys_setrlimit:
+  case amd64_x32_sys_setrlimit:
     return gdb_sys_setrlimit;
 
   case amd64_sys_chroot:
+  case amd64_x32_sys_chroot:
     return gdb_sys_chroot;
 
   case amd64_sys_sync:
+  case amd64_x32_sys_sync:
     return gdb_sys_sync;
 
   case amd64_sys_acct:
+  case amd64_x32_sys_acct:
     return gdb_sys_acct;
 
   case amd64_sys_settimeofday:
+  case amd64_x32_sys_settimeofday:
     return gdb_sys_settimeofday;
 
   case amd64_sys_mount:
+  case amd64_x32_sys_mount:
     return gdb_sys_mount;
 
   case amd64_sys_umount:
+  case amd64_x32_sys_umount:
     return gdb_sys_umount;
 
   case amd64_sys_swapon:
+  case amd64_x32_sys_swapon:
     return gdb_sys_swapon;
 
   case amd64_sys_swapoff:
+  case amd64_x32_sys_swapoff:
     return gdb_sys_swapoff;
 
   case amd64_sys_reboot:
+  case amd64_x32_sys_reboot:
     return gdb_sys_reboot;
 
   case amd64_sys_sethostname:
+  case amd64_x32_sys_sethostname:
     return gdb_sys_sethostname;
 
   case amd64_sys_setdomainname:
+  case amd64_x32_sys_setdomainname:
     return gdb_sys_setdomainname;
 
   case amd64_sys_iopl:
+  case amd64_x32_sys_iopl:
     return gdb_sys_iopl;
 
   case amd64_sys_ioperm:
+  case amd64_x32_sys_ioperm:
     return gdb_sys_ioperm;
 
   case amd64_sys_init_module:
+  case amd64_x32_sys_init_module:
     return gdb_sys_init_module;
 
   case amd64_sys_delete_module:
+  case amd64_x32_sys_delete_module:
     return gdb_sys_delete_module;
 
   case amd64_sys_quotactl:
+  case amd64_x32_sys_quotactl:
     return gdb_sys_quotactl;
 
   case amd64_sys_nfsservctl:
     return gdb_sys_nfsservctl;
 
   case amd64_sys_gettid:
+  case amd64_x32_sys_gettid:
     return gdb_sys_gettid;
 
   case amd64_sys_readahead:
+  case amd64_x32_sys_readahead:
     return gdb_sys_readahead;
 
   case amd64_sys_setxattr:
+  case amd64_x32_sys_setxattr:
     return gdb_sys_setxattr;
 
   case amd64_sys_lsetxattr:
+  case amd64_x32_sys_lsetxattr:
     return gdb_sys_lsetxattr;
 
   case amd64_sys_fsetxattr:
+  case amd64_x32_sys_fsetxattr:
     return gdb_sys_fsetxattr;
 
   case amd64_sys_getxattr:
+  case amd64_x32_sys_getxattr:
     return gdb_sys_getxattr;
 
   case amd64_sys_lgetxattr:
+  case amd64_x32_sys_lgetxattr:
     return gdb_sys_lgetxattr;
 
   case amd64_sys_fgetxattr:
+  case amd64_x32_sys_fgetxattr:
     return gdb_sys_fgetxattr;
 
   case amd64_sys_listxattr:
+  case amd64_x32_sys_listxattr:
     return gdb_sys_listxattr;
 
   case amd64_sys_llistxattr:
+  case amd64_x32_sys_llistxattr:
     return gdb_sys_llistxattr;
 
   case amd64_sys_flistxattr:
+  case amd64_x32_sys_flistxattr:
     return gdb_sys_flistxattr;
 
   case amd64_sys_removexattr:
+  case amd64_x32_sys_removexattr:
     return gdb_sys_removexattr;
 
   case amd64_sys_lremovexattr:
+  case amd64_x32_sys_lremovexattr:
     return gdb_sys_lremovexattr;
 
   case amd64_sys_fremovexattr:
+  case amd64_x32_sys_fremovexattr:
     return gdb_sys_fremovexattr;
 
   case amd64_sys_tkill:
+  case amd64_x32_sys_tkill:
     return gdb_sys_tkill;
 
   case amd64_sys_time:
+  case amd64_x32_sys_time:
     return gdb_sys_time;
 
   case amd64_sys_futex:
+  case amd64_x32_sys_futex:
     return gdb_sys_futex;
 
   case amd64_sys_sched_setaffinity:
+  case amd64_x32_sys_sched_setaffinity:
     return gdb_sys_sched_setaffinity;
 
   case amd64_sys_sched_getaffinity:
+  case amd64_x32_sys_sched_getaffinity:
     return gdb_sys_sched_getaffinity;
 
   case amd64_sys_io_setup:
+  case amd64_x32_sys_io_setup:
     return gdb_sys_io_setup;
 
   case amd64_sys_io_destroy:
+  case amd64_x32_sys_io_destroy:
     return gdb_sys_io_destroy;
 
   case amd64_sys_io_getevents:
+  case amd64_x32_sys_io_getevents:
     return gdb_sys_io_getevents;
 
   case amd64_sys_io_submit:
+  case amd64_x32_sys_io_submit:
     return gdb_sys_io_submit;
 
   case amd64_sys_io_cancel:
+  case amd64_x32_sys_io_cancel:
     return gdb_sys_io_cancel;
 
   case amd64_sys_lookup_dcookie:
+  case amd64_x32_sys_lookup_dcookie:
     return gdb_sys_lookup_dcookie;
 
   case amd64_sys_epoll_create:
+  case amd64_x32_sys_epoll_create:
     return gdb_sys_epoll_create;
 
   case amd64_sys_remap_file_pages:
+  case amd64_x32_sys_remap_file_pages:
     return gdb_sys_remap_file_pages;
 
   case amd64_sys_getdents64:
+  case amd64_x32_sys_getdents64:
     return gdb_sys_getdents64;
 
   case amd64_sys_set_tid_address:
+  case amd64_x32_sys_set_tid_address:
     return gdb_sys_set_tid_address;
 
   case amd64_sys_restart_syscall:
+  case amd64_x32_sys_restart_syscall:
     return gdb_sys_restart_syscall;
 
   case amd64_sys_semtimedop:
+  case amd64_x32_sys_semtimedop:
     return gdb_sys_semtimedop;
 
   case amd64_sys_fadvise64:
+  case amd64_x32_sys_fadvise64:
     return gdb_sys_fadvise64;
 
   case amd64_sys_timer_create:
+  case amd64_x32_sys_timer_create:
     return gdb_sys_timer_create;
 
   case amd64_sys_timer_settime:
+  case amd64_x32_sys_timer_settime:
     return gdb_sys_timer_settime;
 
   case amd64_sys_timer_gettime:
+  case amd64_x32_sys_timer_gettime:
     return gdb_sys_timer_gettime;
 
   case amd64_sys_timer_getoverrun:
+  case amd64_x32_sys_timer_getoverrun:
     return gdb_sys_timer_getoverrun;
 
   case amd64_sys_timer_delete:
+  case amd64_x32_sys_timer_delete:
     return gdb_sys_timer_delete;
 
   case amd64_sys_clock_settime:
+  case amd64_x32_sys_clock_settime:
     return gdb_sys_clock_settime;
 
   case amd64_sys_clock_gettime:
+  case amd64_x32_sys_clock_gettime:
     return gdb_sys_clock_gettime;
 
   case amd64_sys_clock_getres:
+  case amd64_x32_sys_clock_getres:
     return gdb_sys_clock_getres;
 
   case amd64_sys_clock_nanosleep:
+  case amd64_x32_sys_clock_nanosleep:
     return gdb_sys_clock_nanosleep;
 
   case amd64_sys_exit_group:
+  case amd64_x32_sys_exit_group:
     return gdb_sys_exit_group;
 
   case amd64_sys_epoll_wait:
+  case amd64_x32_sys_epoll_wait:
     return gdb_sys_epoll_wait;
 
   case amd64_sys_epoll_ctl:
+  case amd64_x32_sys_epoll_ctl:
     return gdb_sys_epoll_ctl;
 
   case amd64_sys_tgkill:
+  case amd64_x32_sys_tgkill:
     return gdb_sys_tgkill;
 
   case amd64_sys_utimes:
+  case amd64_x32_sys_utimes:
     return gdb_sys_utimes;
 
   case amd64_sys_mbind:
+  case amd64_x32_sys_mbind:
     return gdb_sys_mbind;
 
   case amd64_sys_set_mempolicy:
+  case amd64_x32_sys_set_mempolicy:
     return gdb_sys_set_mempolicy;
 
   case amd64_sys_get_mempolicy:
+  case amd64_x32_sys_get_mempolicy:
     return gdb_sys_get_mempolicy;
 
   case amd64_sys_mq_open:
+  case amd64_x32_sys_mq_open:
     return gdb_sys_mq_open;
 
   case amd64_sys_mq_unlink:
+  case amd64_x32_sys_mq_unlink:
     return gdb_sys_mq_unlink;
 
   case amd64_sys_mq_timedsend:
+  case amd64_x32_sys_mq_timedsend:
     return gdb_sys_mq_timedsend;
 
   case amd64_sys_mq_timedreceive:
+  case amd64_x32_sys_mq_timedreceive:
     return gdb_sys_mq_timedreceive;
 
   case amd64_sys_mq_notify:
+  case amd64_x32_sys_mq_notify:
     return gdb_sys_mq_notify;
 
   case amd64_sys_mq_getsetattr:
+  case amd64_x32_sys_mq_getsetattr:
     return gdb_sys_mq_getsetattr;
 
   case amd64_sys_kexec_load:
+  case amd64_x32_sys_kexec_load:
     return gdb_sys_kexec_load;
 
   case amd64_sys_waitid:
+  case amd64_x32_sys_waitid:
     return gdb_sys_waitid;
 
   case amd64_sys_add_key:
+  case amd64_x32_sys_add_key:
     return gdb_sys_add_key;
 
   case amd64_sys_request_key:
+  case amd64_x32_sys_request_key:
     return gdb_sys_request_key;
 
   case amd64_sys_keyctl:
+  case amd64_x32_sys_keyctl:
     return gdb_sys_keyctl;
 
   case amd64_sys_ioprio_set:
+  case amd64_x32_sys_ioprio_set:
     return gdb_sys_ioprio_set;
 
   case amd64_sys_ioprio_get:
+  case amd64_x32_sys_ioprio_get:
     return gdb_sys_ioprio_get;
 
   case amd64_sys_inotify_init:
+  case amd64_x32_sys_inotify_init:
     return gdb_sys_inotify_init;
 
   case amd64_sys_inotify_add_watch:
+  case amd64_x32_sys_inotify_add_watch:
     return gdb_sys_inotify_add_watch;
 
   case amd64_sys_inotify_rm_watch:
+  case amd64_x32_sys_inotify_rm_watch:
     return gdb_sys_inotify_rm_watch;
 
   case amd64_sys_migrate_pages:
+  case amd64_x32_sys_migrate_pages:
     return gdb_sys_migrate_pages;
 
   case amd64_sys_openat:
+  case amd64_x32_sys_openat:
     return gdb_sys_openat;
 
   case amd64_sys_mkdirat:
+  case amd64_x32_sys_mkdirat:
     return gdb_sys_mkdirat;
 
   case amd64_sys_mknodat:
+  case amd64_x32_sys_mknodat:
     return gdb_sys_mknodat;
 
   case amd64_sys_fchownat:
+  case amd64_x32_sys_fchownat:
     return gdb_sys_fchownat;
 
   case amd64_sys_futimesat:
+  case amd64_x32_sys_futimesat:
     return gdb_sys_futimesat;
 
   case amd64_sys_newfstatat:
+  case amd64_x32_sys_newfstatat:
     return gdb_sys_newfstatat;
 
   case amd64_sys_unlinkat:
+  case amd64_x32_sys_unlinkat:
     return gdb_sys_unlinkat;
 
   case amd64_sys_renameat:
+  case amd64_x32_sys_renameat:
     return gdb_sys_renameat;
 
   case amd64_sys_linkat:
+  case amd64_x32_sys_linkat:
     return gdb_sys_linkat;
 
   case amd64_sys_symlinkat:
+  case amd64_x32_sys_symlinkat:
     return gdb_sys_symlinkat;
 
   case amd64_sys_readlinkat:
+  case amd64_x32_sys_readlinkat:
     return gdb_sys_readlinkat;
 
   case amd64_sys_fchmodat:
+  case amd64_x32_sys_fchmodat:
     return gdb_sys_fchmodat;
 
   case amd64_sys_faccessat:
+  case amd64_x32_sys_faccessat:
     return gdb_sys_faccessat;
 
   case amd64_sys_pselect6:
+  case amd64_x32_sys_pselect6:
     return gdb_sys_pselect6;
 
   case amd64_sys_ppoll:
+  case amd64_x32_sys_ppoll:
     return gdb_sys_ppoll;
 
   case amd64_sys_unshare:
+  case amd64_x32_sys_unshare:
     return gdb_sys_unshare;
 
   case amd64_sys_set_robust_list:
+  case amd64_x32_sys_set_robust_list:
     return gdb_sys_set_robust_list;
 
   case amd64_sys_get_robust_list:
+  case amd64_x32_sys_get_robust_list:
     return gdb_sys_get_robust_list;
 
   case amd64_sys_splice:
+  case amd64_x32_sys_splice:
     return gdb_sys_splice;
 
   case amd64_sys_tee:
+  case amd64_x32_sys_tee:
     return gdb_sys_tee;
 
   case amd64_sys_sync_file_range:
+  case amd64_x32_sys_sync_file_range:
     return gdb_sys_sync_file_range;
 
   case amd64_sys_vmsplice:
+  case amd64_x32_sys_vmsplice:
     return gdb_sys_vmsplice;
 
   case amd64_sys_move_pages:
+  case amd64_x32_sys_move_pages:
     return gdb_sys_move_pages;
 
   default:
@@ -1172,12 +1437,14 @@ amd64_canonicalize_syscall (enum amd64_syscall syscall_number)
    Return -1 if something wrong.  */
 
 static struct linux_record_tdep amd64_linux_record_tdep;
+static struct linux_record_tdep amd64_x32_linux_record_tdep;
 
 #define RECORD_ARCH_GET_FS	0x1003
 #define RECORD_ARCH_GET_GS	0x1004
 
 static int
-amd64_linux_syscall_record (struct regcache *regcache)
+amd64_linux_syscall_record_common (struct regcache *regcache,
+				   struct linux_record_tdep *linux_record_tdep_p)
 {
   int ret;
   ULONGEST syscall_native;
@@ -1188,26 +1455,27 @@ amd64_linux_syscall_record (struct regcache *regcache)
   switch (syscall_native)
     {
     case amd64_sys_rt_sigreturn:
+    case amd64_x32_sys_rt_sigreturn:
       if (amd64_all_but_ip_registers_record (regcache))
         return -1;
       return 0;
       break;
 
     case amd64_sys_arch_prctl:
+    case amd64_x32_sys_arch_prctl:
       {
 	ULONGEST arg3;
-
-	regcache_raw_read_unsigned (regcache, amd64_linux_record_tdep.arg3,
+	regcache_raw_read_unsigned (regcache, linux_record_tdep_p->arg3,
 				    &arg3);
 	if (arg3 == RECORD_ARCH_GET_FS || arg3 == RECORD_ARCH_GET_GS)
 	  {
 	    CORE_ADDR addr;
 
 	    regcache_raw_read_unsigned (regcache,
-					amd64_linux_record_tdep.arg2,
+					linux_record_tdep_p->arg2,
 					&addr);
 	    if (record_full_arch_list_add_mem
-		(addr, amd64_linux_record_tdep.size_ulong))
+		(addr, linux_record_tdep_p->size_ulong))
 	      return -1;
 	  }
 	goto record_regs;
@@ -1227,7 +1495,7 @@ amd64_linux_syscall_record (struct regcache *regcache)
   else
     {
       ret = record_linux_system_call (syscall_gdb, regcache,
-                                      &amd64_linux_record_tdep);
+                                      linux_record_tdep_p);
       if (ret)
         return ret;
     }
@@ -1242,6 +1510,20 @@ amd64_linux_syscall_record (struct regcache *regcache)
   return 0;
 }
 
+static int
+amd64_linux_syscall_record (struct regcache *regcache)
+{
+  return amd64_linux_syscall_record_common (regcache,
+					    &amd64_linux_record_tdep);
+}
+
+static int
+amd64_x32_linux_syscall_record (struct regcache *regcache)
+{
+  return amd64_linux_syscall_record_common (regcache,
+					    &amd64_x32_linux_record_tdep);
+}
+
 #define AMD64_LINUX_redzone    128
 #define AMD64_LINUX_xstate     512
 #define AMD64_LINUX_frame_size 560
@@ -1364,6 +1646,43 @@ amd64_linux_init_abi_common(struct gdbarch_info info, struct gdbarch *gdbarch)
 
   set_gdbarch_process_record (gdbarch, i386_process_record);
   set_gdbarch_process_record_signal (gdbarch, amd64_linux_record_signal);
+}
+
+static void
+amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
+{
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+  const struct target_desc *tdesc = info.target_desc;
+  struct tdesc_arch_data *tdesc_data = (void *) info.tdep_info;
+  const struct tdesc_feature *feature;
+  int valid_p;
+
+  gdb_assert (tdesc_data);
+
+  tdep->gregset_reg_offset = amd64_linux_gregset_reg_offset;
+  tdep->gregset_num_regs = ARRAY_SIZE (amd64_linux_gregset_reg_offset);
+  tdep->sizeof_gregset = 27 * 8;
+
+  amd64_init_abi (info, gdbarch);
+
+  /* Reserve a number for orig_rax.  */
+  set_gdbarch_num_regs (gdbarch, AMD64_LINUX_NUM_REGS);
+
+  if (! tdesc_has_registers (tdesc))
+    tdesc = tdesc_amd64_linux;
+  tdep->tdesc = tdesc;
+
+  feature = tdesc_find_feature (tdesc, "org.gnu.gdb.i386.linux");
+  if (feature == NULL)
+    return;
+
+  valid_p = tdesc_numbered_register (feature, tdesc_data,
+				     AMD64_LINUX_ORIG_RAX_REGNUM,
+				     "orig_rax");
+  if (!valid_p)
+    return;
+
+  amd64_linux_init_abi_common (info, gdbarch);
 
   /* Initialize the amd64_linux_record_tdep.  */
   /* These values are the size of the type that will be used in a system
@@ -1449,6 +1768,20 @@ amd64_linux_init_abi_common(struct gdbarch_info info, struct gdbarch *gdbarch)
   amd64_linux_record_tdep.size_size_t = 8;
   amd64_linux_record_tdep.size_iovec = 16;
 
+  /* These values are the second argument of system call "sys_fcntl"
+     and "sys_fcntl64".  They are obtained from Linux Kernel source.  */
+  amd64_linux_record_tdep.fcntl_F_GETLK = 5;
+  amd64_linux_record_tdep.fcntl_F_GETLK64 = 12;
+  amd64_linux_record_tdep.fcntl_F_SETLK64 = 13;
+  amd64_linux_record_tdep.fcntl_F_SETLKW64 = 14;
+
+  amd64_linux_record_tdep.arg1 = AMD64_RDI_REGNUM;
+  amd64_linux_record_tdep.arg2 = AMD64_RSI_REGNUM;
+  amd64_linux_record_tdep.arg3 = AMD64_RDX_REGNUM;
+  amd64_linux_record_tdep.arg4 = AMD64_R10_REGNUM;
+  amd64_linux_record_tdep.arg5 = AMD64_R8_REGNUM;
+  amd64_linux_record_tdep.arg6 = AMD64_R9_REGNUM;
+
   /* These values are the second argument of system call "sys_ioctl".
      They are obtained from Linux Kernel source.  */
   amd64_linux_record_tdep.ioctl_TCGETS = 0x5401;
@@ -1518,58 +1851,7 @@ amd64_linux_init_abi_common(struct gdbarch_info info, struct gdbarch *gdbarch)
   amd64_linux_record_tdep.ioctl_TIOCSHAYESESP = 0x545F;
   amd64_linux_record_tdep.ioctl_FIOQSIZE = 0x5460;
 
-  /* These values are the second argument of system call "sys_fcntl"
-     and "sys_fcntl64".  They are obtained from Linux Kernel source.  */
-  amd64_linux_record_tdep.fcntl_F_GETLK = 5;
-  amd64_linux_record_tdep.fcntl_F_GETLK64 = 12;
-  amd64_linux_record_tdep.fcntl_F_SETLK64 = 13;
-  amd64_linux_record_tdep.fcntl_F_SETLKW64 = 14;
-
-  amd64_linux_record_tdep.arg1 = AMD64_RDI_REGNUM;
-  amd64_linux_record_tdep.arg2 = AMD64_RSI_REGNUM;
-  amd64_linux_record_tdep.arg3 = AMD64_RDX_REGNUM;
-  amd64_linux_record_tdep.arg4 = AMD64_R10_REGNUM;
-  amd64_linux_record_tdep.arg5 = AMD64_R8_REGNUM;
-  amd64_linux_record_tdep.arg6 = AMD64_R9_REGNUM;
-
   tdep->i386_syscall_record = amd64_linux_syscall_record;
-}
-
-static void
-amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
-{
-  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-  const struct target_desc *tdesc = info.target_desc;
-  struct tdesc_arch_data *tdesc_data = (void *) info.tdep_info;
-  const struct tdesc_feature *feature;
-  int valid_p;
-
-  gdb_assert (tdesc_data);
-
-  tdep->gregset_reg_offset = amd64_linux_gregset_reg_offset;
-  tdep->gregset_num_regs = ARRAY_SIZE (amd64_linux_gregset_reg_offset);
-  tdep->sizeof_gregset = 27 * 8;
-
-  amd64_init_abi (info, gdbarch);
-
-  /* Reserve a number for orig_rax.  */
-  set_gdbarch_num_regs (gdbarch, AMD64_LINUX_NUM_REGS);
-
-  if (! tdesc_has_registers (tdesc))
-    tdesc = tdesc_amd64_linux;
-  tdep->tdesc = tdesc;
-
-  feature = tdesc_find_feature (tdesc, "org.gnu.gdb.i386.linux");
-  if (feature == NULL)
-    return;
-
-  valid_p = tdesc_numbered_register (feature, tdesc_data,
-				     AMD64_LINUX_ORIG_RAX_REGNUM,
-				     "orig_rax");
-  if (!valid_p)
-    return;
-
-  amd64_linux_init_abi_common (info, gdbarch);
 
   /* GNU/Linux uses SVR4-style shared libraries.  */
   set_solib_svr4_fetch_link_map_offsets
@@ -1612,6 +1894,174 @@ amd64_x32_linux_init_abi(struct gdbarch_info info, struct gdbarch *gdbarch)
 
   amd64_linux_init_abi_common (info, gdbarch);
 
+  /* Initialize the amd64_x32_linux_record_tdep.  */
+  /* These values are the size of the type that will be used in a system
+     call.  They are obtained from Linux Kernel source.  */
+  amd64_x32_linux_record_tdep.size_pointer
+    = gdbarch_ptr_bit (gdbarch) / TARGET_CHAR_BIT;
+  amd64_x32_linux_record_tdep.size__old_kernel_stat = 32;
+  amd64_x32_linux_record_tdep.size_tms = 32;
+  amd64_x32_linux_record_tdep.size_loff_t = 8;
+  amd64_x32_linux_record_tdep.size_flock = 32;
+  amd64_x32_linux_record_tdep.size_oldold_utsname = 45;
+  amd64_x32_linux_record_tdep.size_ustat = 32;
+  /* ADM64 doesn't need this size because it doesn't have sys_sigaction
+     but sys_rt_sigaction.  */
+  amd64_x32_linux_record_tdep.size_old_sigaction = 152;
+  /* ADM64 doesn't need this size because it doesn't have sys_sigpending
+     but sys_rt_sigpending.  */
+  amd64_x32_linux_record_tdep.size_old_sigset_t = 128;
+  amd64_x32_linux_record_tdep.size_rlimit = 16;
+  amd64_x32_linux_record_tdep.size_rusage = 144;
+  amd64_x32_linux_record_tdep.size_timeval = 16;
+  amd64_x32_linux_record_tdep.size_timezone = 8;
+  /* ADM64 doesn't need this size because it doesn't have sys_getgroups16
+     but sys_getgroups.  */
+  amd64_x32_linux_record_tdep.size_old_gid_t = 2;
+  /* ADM64 doesn't need this size because it doesn't have sys_getresuid16
+     but sys_getresuid.  */
+  amd64_x32_linux_record_tdep.size_old_uid_t = 2;
+  amd64_x32_linux_record_tdep.size_fd_set = 128;
+  amd64_x32_linux_record_tdep.size_dirent = 280;
+  amd64_x32_linux_record_tdep.size_dirent64 = 280;
+  amd64_x32_linux_record_tdep.size_statfs = 120;
+  amd64_x32_linux_record_tdep.size_statfs64 = 120;
+  amd64_x32_linux_record_tdep.size_sockaddr = 16;
+  amd64_x32_linux_record_tdep.size_int
+    = gdbarch_int_bit (gdbarch) / TARGET_CHAR_BIT;
+  amd64_x32_linux_record_tdep.size_long
+    = gdbarch_long_bit (gdbarch) / TARGET_CHAR_BIT;
+  amd64_x32_linux_record_tdep.size_ulong
+    = gdbarch_long_bit (gdbarch) / TARGET_CHAR_BIT;
+  amd64_x32_linux_record_tdep.size_msghdr = 56;
+  amd64_x32_linux_record_tdep.size_itimerval = 32;
+  amd64_x32_linux_record_tdep.size_stat = 144;
+  amd64_x32_linux_record_tdep.size_old_utsname = 325;
+  amd64_x32_linux_record_tdep.size_sysinfo = 112;
+  amd64_x32_linux_record_tdep.size_msqid_ds = 120;
+  amd64_x32_linux_record_tdep.size_shmid_ds = 112;
+  amd64_x32_linux_record_tdep.size_new_utsname = 390;
+  amd64_x32_linux_record_tdep.size_timex = 208;
+  amd64_x32_linux_record_tdep.size_mem_dqinfo = 24;
+  amd64_x32_linux_record_tdep.size_if_dqblk = 72;
+  amd64_x32_linux_record_tdep.size_fs_quota_stat = 80;
+  amd64_x32_linux_record_tdep.size_timespec = 16;
+  amd64_x32_linux_record_tdep.size_pollfd = 8;
+  amd64_x32_linux_record_tdep.size_NFS_FHSIZE = 32;
+  amd64_x32_linux_record_tdep.size_knfsd_fh = 132;
+  amd64_x32_linux_record_tdep.size_TASK_COMM_LEN = 16;
+  amd64_x32_linux_record_tdep.size_sigaction = 152;
+  amd64_x32_linux_record_tdep.size_sigset_t = 128;
+  amd64_x32_linux_record_tdep.size_siginfo_t = 128;
+  amd64_x32_linux_record_tdep.size_cap_user_data_t = 8;
+  amd64_x32_linux_record_tdep.size_stack_t = 24;
+  amd64_x32_linux_record_tdep.size_off_t = 8;
+  amd64_x32_linux_record_tdep.size_stat64 = 144;
+  amd64_x32_linux_record_tdep.size_gid_t = 4;
+  amd64_x32_linux_record_tdep.size_uid_t = 4;
+  amd64_x32_linux_record_tdep.size_PAGE_SIZE = 4096;
+  amd64_x32_linux_record_tdep.size_flock64 = 32;
+  amd64_x32_linux_record_tdep.size_user_desc = 16;
+  amd64_x32_linux_record_tdep.size_io_event = 32;
+  amd64_x32_linux_record_tdep.size_iocb = 64;
+  amd64_x32_linux_record_tdep.size_epoll_event = 12;
+  amd64_x32_linux_record_tdep.size_itimerspec = 32;
+  amd64_x32_linux_record_tdep.size_mq_attr = 64;
+  amd64_x32_linux_record_tdep.size_siginfo = 128;
+  amd64_x32_linux_record_tdep.size_termios = 60;
+  amd64_x32_linux_record_tdep.size_termios2 = 44;
+  amd64_x32_linux_record_tdep.size_pid_t = 4;
+  amd64_x32_linux_record_tdep.size_winsize = 8;
+  amd64_x32_linux_record_tdep.size_serial_struct = 72;
+  amd64_x32_linux_record_tdep.size_serial_icounter_struct = 80;
+  amd64_x32_linux_record_tdep.size_hayes_esp_config = 12;
+  amd64_x32_linux_record_tdep.size_size_t = 8;
+  amd64_x32_linux_record_tdep.size_iovec = 16;
+
+  /* These values are the second argument of system call "sys_fcntl"
+     and "sys_fcntl64".  They are obtained from Linux Kernel source.  */
+  amd64_x32_linux_record_tdep.fcntl_F_GETLK = 5;
+  amd64_x32_linux_record_tdep.fcntl_F_GETLK64 = 12;
+  amd64_x32_linux_record_tdep.fcntl_F_SETLK64 = 13;
+  amd64_x32_linux_record_tdep.fcntl_F_SETLKW64 = 14;
+
+  amd64_x32_linux_record_tdep.arg1 = AMD64_RDI_REGNUM;
+  amd64_x32_linux_record_tdep.arg2 = AMD64_RSI_REGNUM;
+  amd64_x32_linux_record_tdep.arg3 = AMD64_RDX_REGNUM;
+  amd64_x32_linux_record_tdep.arg4 = AMD64_R10_REGNUM;
+  amd64_x32_linux_record_tdep.arg5 = AMD64_R8_REGNUM;
+  amd64_x32_linux_record_tdep.arg6 = AMD64_R9_REGNUM;
+
+  /* These values are the second argument of system call "sys_ioctl".
+     They are obtained from Linux Kernel source.  */
+  amd64_x32_linux_record_tdep.ioctl_TCGETS = 0x5401;
+  amd64_x32_linux_record_tdep.ioctl_TCSETS = 0x5402;
+  amd64_x32_linux_record_tdep.ioctl_TCSETSW = 0x5403;
+  amd64_x32_linux_record_tdep.ioctl_TCSETSF = 0x5404;
+  amd64_x32_linux_record_tdep.ioctl_TCGETA = 0x5405;
+  amd64_x32_linux_record_tdep.ioctl_TCSETA = 0x5406;
+  amd64_x32_linux_record_tdep.ioctl_TCSETAW = 0x5407;
+  amd64_x32_linux_record_tdep.ioctl_TCSETAF = 0x5408;
+  amd64_x32_linux_record_tdep.ioctl_TCSBRK = 0x5409;
+  amd64_x32_linux_record_tdep.ioctl_TCXONC = 0x540A;
+  amd64_x32_linux_record_tdep.ioctl_TCFLSH = 0x540B;
+  amd64_x32_linux_record_tdep.ioctl_TIOCEXCL = 0x540C;
+  amd64_x32_linux_record_tdep.ioctl_TIOCNXCL = 0x540D;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSCTTY = 0x540E;
+  amd64_x32_linux_record_tdep.ioctl_TIOCGPGRP = 0x540F;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSPGRP = 0x5410;
+  amd64_x32_linux_record_tdep.ioctl_TIOCOUTQ = 0x5411;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSTI = 0x5412;
+  amd64_x32_linux_record_tdep.ioctl_TIOCGWINSZ = 0x5413;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSWINSZ = 0x5414;
+  amd64_x32_linux_record_tdep.ioctl_TIOCMGET = 0x5415;
+  amd64_x32_linux_record_tdep.ioctl_TIOCMBIS = 0x5416;
+  amd64_x32_linux_record_tdep.ioctl_TIOCMBIC = 0x5417;
+  amd64_x32_linux_record_tdep.ioctl_TIOCMSET = 0x5418;
+  amd64_x32_linux_record_tdep.ioctl_TIOCGSOFTCAR = 0x5419;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSSOFTCAR = 0x541A;
+  amd64_x32_linux_record_tdep.ioctl_FIONREAD = 0x541B;
+  amd64_x32_linux_record_tdep.ioctl_TIOCINQ = amd64_x32_linux_record_tdep.ioctl_FIONREAD;
+  amd64_x32_linux_record_tdep.ioctl_TIOCLINUX = 0x541C;
+  amd64_x32_linux_record_tdep.ioctl_TIOCCONS = 0x541D;
+  amd64_x32_linux_record_tdep.ioctl_TIOCGSERIAL = 0x541E;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSSERIAL = 0x541F;
+  amd64_x32_linux_record_tdep.ioctl_TIOCPKT = 0x5420;
+  amd64_x32_linux_record_tdep.ioctl_FIONBIO = 0x5421;
+  amd64_x32_linux_record_tdep.ioctl_TIOCNOTTY = 0x5422;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSETD = 0x5423;
+  amd64_x32_linux_record_tdep.ioctl_TIOCGETD = 0x5424;
+  amd64_x32_linux_record_tdep.ioctl_TCSBRKP = 0x5425;
+  amd64_x32_linux_record_tdep.ioctl_TIOCTTYGSTRUCT = 0x5426;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSBRK = 0x5427;
+  amd64_x32_linux_record_tdep.ioctl_TIOCCBRK = 0x5428;
+  amd64_x32_linux_record_tdep.ioctl_TIOCGSID = 0x5429;
+  amd64_x32_linux_record_tdep.ioctl_TCGETS2 = 0x802c542a;
+  amd64_x32_linux_record_tdep.ioctl_TCSETS2 = 0x402c542b;
+  amd64_x32_linux_record_tdep.ioctl_TCSETSW2 = 0x402c542c;
+  amd64_x32_linux_record_tdep.ioctl_TCSETSF2 = 0x402c542d;
+  amd64_x32_linux_record_tdep.ioctl_TIOCGPTN = 0x80045430;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSPTLCK = 0x40045431;
+  amd64_x32_linux_record_tdep.ioctl_FIONCLEX = 0x5450;
+  amd64_x32_linux_record_tdep.ioctl_FIOCLEX = 0x5451;
+  amd64_x32_linux_record_tdep.ioctl_FIOASYNC = 0x5452;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSERCONFIG = 0x5453;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSERGWILD = 0x5454;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSERSWILD = 0x5455;
+  amd64_x32_linux_record_tdep.ioctl_TIOCGLCKTRMIOS = 0x5456;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSLCKTRMIOS = 0x5457;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSERGSTRUCT = 0x5458;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSERGETLSR = 0x5459;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSERGETMULTI = 0x545A;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSERSETMULTI = 0x545B;
+  amd64_x32_linux_record_tdep.ioctl_TIOCMIWAIT = 0x545C;
+  amd64_x32_linux_record_tdep.ioctl_TIOCGICOUNT = 0x545D;
+  amd64_x32_linux_record_tdep.ioctl_TIOCGHAYESESP = 0x545E;
+  amd64_x32_linux_record_tdep.ioctl_TIOCSHAYESESP = 0x545F;
+  amd64_x32_linux_record_tdep.ioctl_FIOQSIZE = 0x5460;
+
+  tdep->i386_syscall_record = amd64_x32_linux_syscall_record;
+
   /* GNU/Linux uses SVR4-style shared libraries.  */
   set_solib_svr4_fetch_link_map_offsets
     (gdbarch, svr4_ilp32_fetch_link_map_offsets);
diff --git a/gdb/amd64-linux-tdep.h b/gdb/amd64-linux-tdep.h
index 6e85a5b..13044f4 100644
--- a/gdb/amd64-linux-tdep.h
+++ b/gdb/amd64-linux-tdep.h
@@ -311,4 +311,284 @@ enum amd64_syscall {
   amd64_sys_move_pages = 279,
 };
 
+/* Enum that defines the syscall identifiers for x32 linux.
+   Used for process record/replay, these will be translated into
+   a gdb-canonical set of syscall ids in linux-record.c.  */
+
+enum amd64_x32_syscall {
+  amd64_x32_syscall_bit = 0x40000000,
+  amd64_x32_sys_read = (amd64_x32_syscall_bit + 0),
+  amd64_x32_sys_write = (amd64_x32_syscall_bit + 1),
+  amd64_x32_sys_open = (amd64_x32_syscall_bit + 2),
+  amd64_x32_sys_close = (amd64_x32_syscall_bit + 3),
+  amd64_x32_sys_newstat = (amd64_x32_syscall_bit + 4),
+  amd64_x32_sys_newfstat = (amd64_x32_syscall_bit + 5),
+  amd64_x32_sys_newlstat = (amd64_x32_syscall_bit + 6),
+  amd64_x32_sys_poll = (amd64_x32_syscall_bit + 7),
+  amd64_x32_sys_lseek = (amd64_x32_syscall_bit + 8),
+  amd64_x32_sys_mmap = (amd64_x32_syscall_bit + 9),
+  amd64_x32_sys_mprotect = (amd64_x32_syscall_bit + 10),
+  amd64_x32_sys_munmap = (amd64_x32_syscall_bit + 11),
+  amd64_x32_sys_brk = (amd64_x32_syscall_bit + 12),
+  amd64_x32_sys_rt_sigprocmask = (amd64_x32_syscall_bit + 14),
+  amd64_x32_sys_pread64 = (amd64_x32_syscall_bit + 17),
+  amd64_x32_sys_pwrite64 = (amd64_x32_syscall_bit + 18),
+  amd64_x32_sys_access = (amd64_x32_syscall_bit + 21),
+  amd64_x32_sys_pipe = (amd64_x32_syscall_bit + 22),
+  amd64_x32_sys_select = (amd64_x32_syscall_bit + 23),
+  amd64_x32_sys_sched_yield = (amd64_x32_syscall_bit + 24),
+  amd64_x32_sys_mremap = (amd64_x32_syscall_bit + 25),
+  amd64_x32_sys_msync = (amd64_x32_syscall_bit + 26),
+  amd64_x32_sys_mincore = (amd64_x32_syscall_bit + 27),
+  amd64_x32_sys_madvise = (amd64_x32_syscall_bit + 28),
+  amd64_x32_sys_shmget = (amd64_x32_syscall_bit + 29),
+  amd64_x32_sys_shmat = (amd64_x32_syscall_bit + 30),
+  amd64_x32_sys_shmctl = (amd64_x32_syscall_bit + 31),
+  amd64_x32_sys_dup = (amd64_x32_syscall_bit + 32),
+  amd64_x32_sys_dup2 = (amd64_x32_syscall_bit + 33),
+  amd64_x32_sys_pause = (amd64_x32_syscall_bit + 34),
+  amd64_x32_sys_nanosleep = (amd64_x32_syscall_bit + 35),
+  amd64_x32_sys_getitimer = (amd64_x32_syscall_bit + 36),
+  amd64_x32_sys_alarm = (amd64_x32_syscall_bit + 37),
+  amd64_x32_sys_setitimer = (amd64_x32_syscall_bit + 38),
+  amd64_x32_sys_getpid = (amd64_x32_syscall_bit + 39),
+  amd64_x32_sys_sendfile64 = (amd64_x32_syscall_bit + 40),
+  amd64_x32_sys_socket = (amd64_x32_syscall_bit + 41),
+  amd64_x32_sys_connect = (amd64_x32_syscall_bit + 42),
+  amd64_x32_sys_accept = (amd64_x32_syscall_bit + 43),
+  amd64_x32_sys_sendto = (amd64_x32_syscall_bit + 44),
+  amd64_x32_sys_shutdown = (amd64_x32_syscall_bit + 48),
+  amd64_x32_sys_bind = (amd64_x32_syscall_bit + 49),
+  amd64_x32_sys_listen = (amd64_x32_syscall_bit + 50),
+  amd64_x32_sys_getsockname = (amd64_x32_syscall_bit + 51),
+  amd64_x32_sys_getpeername = (amd64_x32_syscall_bit + 52),
+  amd64_x32_sys_socketpair = (amd64_x32_syscall_bit + 53),
+  amd64_x32_sys_clone = (amd64_x32_syscall_bit + 56),
+  amd64_x32_sys_fork = (amd64_x32_syscall_bit + 57),
+  amd64_x32_sys_vfork = (amd64_x32_syscall_bit + 58),
+  amd64_x32_sys_exit = (amd64_x32_syscall_bit + 60),
+  amd64_x32_sys_wait4 = (amd64_x32_syscall_bit + 61),
+  amd64_x32_sys_kill = (amd64_x32_syscall_bit + 62),
+  amd64_x32_sys_uname = (amd64_x32_syscall_bit + 63),
+  amd64_x32_sys_semget = (amd64_x32_syscall_bit + 64),
+  amd64_x32_sys_semop = (amd64_x32_syscall_bit + 65),
+  amd64_x32_sys_semctl = (amd64_x32_syscall_bit + 66),
+  amd64_x32_sys_shmdt = (amd64_x32_syscall_bit + 67),
+  amd64_x32_sys_msgget = (amd64_x32_syscall_bit + 68),
+  amd64_x32_sys_msgsnd = (amd64_x32_syscall_bit + 69),
+  amd64_x32_sys_msgrcv = (amd64_x32_syscall_bit + 70),
+  amd64_x32_sys_msgctl = (amd64_x32_syscall_bit + 71),
+  amd64_x32_sys_fcntl = (amd64_x32_syscall_bit + 72),
+  amd64_x32_sys_flock = (amd64_x32_syscall_bit + 73),
+  amd64_x32_sys_fsync = (amd64_x32_syscall_bit + 74),
+  amd64_x32_sys_fdatasync = (amd64_x32_syscall_bit + 75),
+  amd64_x32_sys_truncate = (amd64_x32_syscall_bit + 76),
+  amd64_x32_sys_ftruncate = (amd64_x32_syscall_bit + 77),
+  amd64_x32_sys_getdents = (amd64_x32_syscall_bit + 78),
+  amd64_x32_sys_getcwd = (amd64_x32_syscall_bit + 79),
+  amd64_x32_sys_chdir = (amd64_x32_syscall_bit + 80),
+  amd64_x32_sys_fchdir = (amd64_x32_syscall_bit + 81),
+  amd64_x32_sys_rename = (amd64_x32_syscall_bit + 82),
+  amd64_x32_sys_mkdir = (amd64_x32_syscall_bit + 83),
+  amd64_x32_sys_rmdir = (amd64_x32_syscall_bit + 84),
+  amd64_x32_sys_creat = (amd64_x32_syscall_bit + 85),
+  amd64_x32_sys_link = (amd64_x32_syscall_bit + 86),
+  amd64_x32_sys_unlink = (amd64_x32_syscall_bit + 87),
+  amd64_x32_sys_symlink = (amd64_x32_syscall_bit + 88),
+  amd64_x32_sys_readlink = (amd64_x32_syscall_bit + 89),
+  amd64_x32_sys_chmod = (amd64_x32_syscall_bit + 90),
+  amd64_x32_sys_fchmod = (amd64_x32_syscall_bit + 91),
+  amd64_x32_sys_chown = (amd64_x32_syscall_bit + 92),
+  amd64_x32_sys_fchown = (amd64_x32_syscall_bit + 93),
+  amd64_x32_sys_lchown = (amd64_x32_syscall_bit + 94),
+  amd64_x32_sys_umask = (amd64_x32_syscall_bit + 95),
+  amd64_x32_sys_gettimeofday = (amd64_x32_syscall_bit + 96),
+  amd64_x32_sys_getrlimit = (amd64_x32_syscall_bit + 97),
+  amd64_x32_sys_getrusage = (amd64_x32_syscall_bit + 98),
+  amd64_x32_sys_sysinfo = (amd64_x32_syscall_bit + 99),
+  amd64_x32_sys_times = (amd64_x32_syscall_bit + 100),
+  amd64_x32_sys_getuid = (amd64_x32_syscall_bit + 102),
+  amd64_x32_sys_syslog = (amd64_x32_syscall_bit + 103),
+  amd64_x32_sys_getgid = (amd64_x32_syscall_bit + 104),
+  amd64_x32_sys_setuid = (amd64_x32_syscall_bit + 105),
+  amd64_x32_sys_setgid = (amd64_x32_syscall_bit + 106),
+  amd64_x32_sys_geteuid = (amd64_x32_syscall_bit + 107),
+  amd64_x32_sys_getegid = (amd64_x32_syscall_bit + 108),
+  amd64_x32_sys_setpgid = (amd64_x32_syscall_bit + 109),
+  amd64_x32_sys_getppid = (amd64_x32_syscall_bit + 110),
+  amd64_x32_sys_getpgrp = (amd64_x32_syscall_bit + 111),
+  amd64_x32_sys_setsid = (amd64_x32_syscall_bit + 112),
+  amd64_x32_sys_setreuid = (amd64_x32_syscall_bit + 113),
+  amd64_x32_sys_setregid = (amd64_x32_syscall_bit + 114),
+  amd64_x32_sys_getgroups = (amd64_x32_syscall_bit + 115),
+  amd64_x32_sys_setgroups = (amd64_x32_syscall_bit + 116),
+  amd64_x32_sys_setresuid = (amd64_x32_syscall_bit + 117),
+  amd64_x32_sys_getresuid = (amd64_x32_syscall_bit + 118),
+  amd64_x32_sys_setresgid = (amd64_x32_syscall_bit + 119),
+  amd64_x32_sys_getresgid = (amd64_x32_syscall_bit + 120),
+  amd64_x32_sys_getpgid = (amd64_x32_syscall_bit + 121),
+  amd64_x32_sys_setfsuid = (amd64_x32_syscall_bit + 122),
+  amd64_x32_sys_setfsgid = (amd64_x32_syscall_bit + 123),
+  amd64_x32_sys_getsid = (amd64_x32_syscall_bit + 124),
+  amd64_x32_sys_capget = (amd64_x32_syscall_bit + 125),
+  amd64_x32_sys_capset = (amd64_x32_syscall_bit + 126),
+  amd64_x32_sys_rt_sigsuspend = (amd64_x32_syscall_bit + 130),
+  amd64_x32_sys_utime = (amd64_x32_syscall_bit + 132),
+  amd64_x32_sys_mknod = (amd64_x32_syscall_bit + 133),
+  amd64_x32_sys_personality = (amd64_x32_syscall_bit + 135),
+  amd64_x32_sys_ustat = (amd64_x32_syscall_bit + 136),
+  amd64_x32_sys_statfs = (amd64_x32_syscall_bit + 137),
+  amd64_x32_sys_fstatfs = (amd64_x32_syscall_bit + 138),
+  amd64_x32_sys_sysfs = (amd64_x32_syscall_bit + 139),
+  amd64_x32_sys_getpriority = (amd64_x32_syscall_bit + 140),
+  amd64_x32_sys_setpriority = (amd64_x32_syscall_bit + 141),
+  amd64_x32_sys_sched_setparam = (amd64_x32_syscall_bit + 142),
+  amd64_x32_sys_sched_getparam = (amd64_x32_syscall_bit + 143),
+  amd64_x32_sys_sched_setscheduler = (amd64_x32_syscall_bit + 144),
+  amd64_x32_sys_sched_getscheduler = (amd64_x32_syscall_bit + 145),
+  amd64_x32_sys_sched_get_priority_max = (amd64_x32_syscall_bit + 146),
+  amd64_x32_sys_sched_get_priority_min = (amd64_x32_syscall_bit + 147),
+  amd64_x32_sys_sched_rr_get_interval = (amd64_x32_syscall_bit + 148),
+  amd64_x32_sys_mlock = (amd64_x32_syscall_bit + 149),
+  amd64_x32_sys_munlock = (amd64_x32_syscall_bit + 150),
+  amd64_x32_sys_mlockall = (amd64_x32_syscall_bit + 151),
+  amd64_x32_sys_munlockall = (amd64_x32_syscall_bit + 152),
+  amd64_x32_sys_vhangup = (amd64_x32_syscall_bit + 153),
+  amd64_x32_sys_modify_ldt = (amd64_x32_syscall_bit + 154),
+  amd64_x32_sys_pivot_root = (amd64_x32_syscall_bit + 155),
+  amd64_x32_sys_sysctl = (amd64_x32_syscall_bit + 156),
+  amd64_x32_sys_prctl = (amd64_x32_syscall_bit + 157),
+  amd64_x32_sys_arch_prctl = (amd64_x32_syscall_bit + 158),
+  amd64_x32_sys_adjtimex = (amd64_x32_syscall_bit + 159),
+  amd64_x32_sys_setrlimit = (amd64_x32_syscall_bit + 160),
+  amd64_x32_sys_chroot = (amd64_x32_syscall_bit + 161),
+  amd64_x32_sys_sync = (amd64_x32_syscall_bit + 162),
+  amd64_x32_sys_acct = (amd64_x32_syscall_bit + 163),
+  amd64_x32_sys_settimeofday = (amd64_x32_syscall_bit + 164),
+  amd64_x32_sys_mount = (amd64_x32_syscall_bit + 165),
+  amd64_x32_sys_umount = (amd64_x32_syscall_bit + 166),
+  amd64_x32_sys_swapon = (amd64_x32_syscall_bit + 167),
+  amd64_x32_sys_swapoff = (amd64_x32_syscall_bit + 168),
+  amd64_x32_sys_reboot = (amd64_x32_syscall_bit + 169),
+  amd64_x32_sys_sethostname = (amd64_x32_syscall_bit + 170),
+  amd64_x32_sys_setdomainname = (amd64_x32_syscall_bit + 171),
+  amd64_x32_sys_iopl = (amd64_x32_syscall_bit + 172),
+  amd64_x32_sys_ioperm = (amd64_x32_syscall_bit + 173),
+  amd64_x32_sys_init_module = (amd64_x32_syscall_bit + 175),
+  amd64_x32_sys_delete_module = (amd64_x32_syscall_bit + 176),
+  amd64_x32_sys_quotactl = (amd64_x32_syscall_bit + 179),
+  amd64_x32_sys_gettid = (amd64_x32_syscall_bit + 186),
+  amd64_x32_sys_readahead = (amd64_x32_syscall_bit + 187),
+  amd64_x32_sys_setxattr = (amd64_x32_syscall_bit + 188),
+  amd64_x32_sys_lsetxattr = (amd64_x32_syscall_bit + 189),
+  amd64_x32_sys_fsetxattr = (amd64_x32_syscall_bit + 190),
+  amd64_x32_sys_getxattr = (amd64_x32_syscall_bit + 191),
+  amd64_x32_sys_lgetxattr = (amd64_x32_syscall_bit + 192),
+  amd64_x32_sys_fgetxattr = (amd64_x32_syscall_bit + 193),
+  amd64_x32_sys_listxattr = (amd64_x32_syscall_bit + 194),
+  amd64_x32_sys_llistxattr = (amd64_x32_syscall_bit + 195),
+  amd64_x32_sys_flistxattr = (amd64_x32_syscall_bit + 196),
+  amd64_x32_sys_removexattr = (amd64_x32_syscall_bit + 197),
+  amd64_x32_sys_lremovexattr = (amd64_x32_syscall_bit + 198),
+  amd64_x32_sys_fremovexattr = (amd64_x32_syscall_bit + 199),
+  amd64_x32_sys_tkill = (amd64_x32_syscall_bit + 200),
+  amd64_x32_sys_time = (amd64_x32_syscall_bit + 201),
+  amd64_x32_sys_futex = (amd64_x32_syscall_bit + 202),
+  amd64_x32_sys_sched_setaffinity = (amd64_x32_syscall_bit + 203),
+  amd64_x32_sys_sched_getaffinity = (amd64_x32_syscall_bit + 204),
+  amd64_x32_sys_io_setup = (amd64_x32_syscall_bit + 206),
+  amd64_x32_sys_io_destroy = (amd64_x32_syscall_bit + 207),
+  amd64_x32_sys_io_getevents = (amd64_x32_syscall_bit + 208),
+  amd64_x32_sys_io_submit = (amd64_x32_syscall_bit + 209),
+  amd64_x32_sys_io_cancel = (amd64_x32_syscall_bit + 210),
+  amd64_x32_sys_lookup_dcookie = (amd64_x32_syscall_bit + 212),
+  amd64_x32_sys_epoll_create = (amd64_x32_syscall_bit + 213),
+  amd64_x32_sys_remap_file_pages = (amd64_x32_syscall_bit + 216),
+  amd64_x32_sys_getdents64 = (amd64_x32_syscall_bit + 217),
+  amd64_x32_sys_set_tid_address = (amd64_x32_syscall_bit + 218),
+  amd64_x32_sys_restart_syscall = (amd64_x32_syscall_bit + 219),
+  amd64_x32_sys_semtimedop = (amd64_x32_syscall_bit + 220),
+  amd64_x32_sys_fadvise64 = (amd64_x32_syscall_bit + 221),
+  amd64_x32_sys_timer_settime = (amd64_x32_syscall_bit + 223),
+  amd64_x32_sys_timer_gettime = (amd64_x32_syscall_bit + 224),
+  amd64_x32_sys_timer_getoverrun = (amd64_x32_syscall_bit + 225),
+  amd64_x32_sys_timer_delete = (amd64_x32_syscall_bit + 226),
+  amd64_x32_sys_clock_settime = (amd64_x32_syscall_bit + 227),
+  amd64_x32_sys_clock_gettime = (amd64_x32_syscall_bit + 228),
+  amd64_x32_sys_clock_getres = (amd64_x32_syscall_bit + 229),
+  amd64_x32_sys_clock_nanosleep = (amd64_x32_syscall_bit + 230),
+  amd64_x32_sys_exit_group = (amd64_x32_syscall_bit + 231),
+  amd64_x32_sys_epoll_wait = (amd64_x32_syscall_bit + 232),
+  amd64_x32_sys_epoll_ctl = (amd64_x32_syscall_bit + 233),
+  amd64_x32_sys_tgkill = (amd64_x32_syscall_bit + 234),
+  amd64_x32_sys_utimes = (amd64_x32_syscall_bit + 235),
+  amd64_x32_sys_mbind = (amd64_x32_syscall_bit + 237),
+  amd64_x32_sys_set_mempolicy = (amd64_x32_syscall_bit + 238),
+  amd64_x32_sys_get_mempolicy = (amd64_x32_syscall_bit + 239),
+  amd64_x32_sys_mq_open = (amd64_x32_syscall_bit + 240),
+  amd64_x32_sys_mq_unlink = (amd64_x32_syscall_bit + 241),
+  amd64_x32_sys_mq_timedsend = (amd64_x32_syscall_bit + 242),
+  amd64_x32_sys_mq_timedreceive = (amd64_x32_syscall_bit + 243),
+  amd64_x32_sys_mq_getsetattr = (amd64_x32_syscall_bit + 245),
+  amd64_x32_sys_add_key = (amd64_x32_syscall_bit + 248),
+  amd64_x32_sys_request_key = (amd64_x32_syscall_bit + 249),
+  amd64_x32_sys_keyctl = (amd64_x32_syscall_bit + 250),
+  amd64_x32_sys_ioprio_set = (amd64_x32_syscall_bit + 251),
+  amd64_x32_sys_ioprio_get = (amd64_x32_syscall_bit + 252),
+  amd64_x32_sys_inotify_init = (amd64_x32_syscall_bit + 253),
+  amd64_x32_sys_inotify_add_watch = (amd64_x32_syscall_bit + 254),
+  amd64_x32_sys_inotify_rm_watch = (amd64_x32_syscall_bit + 255),
+  amd64_x32_sys_migrate_pages = (amd64_x32_syscall_bit + 256),
+  amd64_x32_sys_openat = (amd64_x32_syscall_bit + 257),
+  amd64_x32_sys_mkdirat = (amd64_x32_syscall_bit + 258),
+  amd64_x32_sys_mknodat = (amd64_x32_syscall_bit + 259),
+  amd64_x32_sys_fchownat = (amd64_x32_syscall_bit + 260),
+  amd64_x32_sys_futimesat = (amd64_x32_syscall_bit + 261),
+  amd64_x32_sys_newfstatat = (amd64_x32_syscall_bit + 262),
+  amd64_x32_sys_unlinkat = (amd64_x32_syscall_bit + 263),
+  amd64_x32_sys_renameat = (amd64_x32_syscall_bit + 264),
+  amd64_x32_sys_linkat = (amd64_x32_syscall_bit + 265),
+  amd64_x32_sys_symlinkat = (amd64_x32_syscall_bit + 266),
+  amd64_x32_sys_readlinkat = (amd64_x32_syscall_bit + 267),
+  amd64_x32_sys_fchmodat = (amd64_x32_syscall_bit + 268),
+  amd64_x32_sys_faccessat = (amd64_x32_syscall_bit + 269),
+  amd64_x32_sys_pselect6 = (amd64_x32_syscall_bit + 270),
+  amd64_x32_sys_ppoll = (amd64_x32_syscall_bit + 271),
+  amd64_x32_sys_unshare = (amd64_x32_syscall_bit + 272),
+  amd64_x32_sys_splice = (amd64_x32_syscall_bit + 275),
+  amd64_x32_sys_tee = (amd64_x32_syscall_bit + 276),
+  amd64_x32_sys_sync_file_range = (amd64_x32_syscall_bit + 277),
+  amd64_x32_sys_rt_sigaction = (amd64_x32_syscall_bit + 512),
+  amd64_x32_sys_rt_sigreturn = (amd64_x32_syscall_bit + 513),
+  amd64_x32_sys_ioctl = (amd64_x32_syscall_bit + 514),
+  amd64_x32_sys_readv = (amd64_x32_syscall_bit + 515),
+  amd64_x32_sys_writev = (amd64_x32_syscall_bit + 516),
+  amd64_x32_sys_recvfrom = (amd64_x32_syscall_bit + 517),
+  amd64_x32_sys_sendmsg = (amd64_x32_syscall_bit + 518),
+  amd64_x32_sys_recvmsg = (amd64_x32_syscall_bit + 519),
+  amd64_x32_sys_execve = (amd64_x32_syscall_bit + 520),
+  amd64_x32_sys_ptrace = (amd64_x32_syscall_bit + 521),
+  amd64_x32_sys_rt_sigpending = (amd64_x32_syscall_bit + 522),
+  amd64_x32_sys_rt_sigtimedwait = (amd64_x32_syscall_bit + 523),
+  amd64_x32_sys_rt_sigqueueinfo = (amd64_x32_syscall_bit + 524),
+  amd64_x32_sys_sigaltstack = (amd64_x32_syscall_bit + 525),
+  amd64_x32_sys_timer_create = (amd64_x32_syscall_bit + 526),
+  amd64_x32_sys_mq_notify = (amd64_x32_syscall_bit + 527),
+  amd64_x32_sys_kexec_load = (amd64_x32_syscall_bit + 528),
+  amd64_x32_sys_waitid = (amd64_x32_syscall_bit + 529),
+  amd64_x32_sys_set_robust_list = (amd64_x32_syscall_bit + 530),
+  amd64_x32_sys_get_robust_list = (amd64_x32_syscall_bit + 531),
+  amd64_x32_sys_vmsplice = (amd64_x32_syscall_bit + 532),
+  amd64_x32_sys_move_pages = (amd64_x32_syscall_bit + 533),
+  amd64_x32_sys_preadv = (amd64_x32_syscall_bit + 534),
+  amd64_x32_sys_pwritev = (amd64_x32_syscall_bit + 535),
+  amd64_x32_sys_rt_tgsigqueueinfo = (amd64_x32_syscall_bit + 536),
+  amd64_x32_sys_recvmmsg = (amd64_x32_syscall_bit + 537),
+  amd64_x32_sys_sendmmsg = (amd64_x32_syscall_bit + 538),
+  amd64_x32_sys_process_vm_readv = (amd64_x32_syscall_bit + 539),
+  amd64_x32_sys_process_vm_writev = (amd64_x32_syscall_bit + 540),
+  amd64_x32_sys_setsockopt = (amd64_x32_syscall_bit + 541),
+  amd64_x32_sys_getsockopt = (amd64_x32_syscall_bit + 542),
+};
+
 #endif /* amd64-linux-tdep.h */