Use all_non_exited_inferiors in infrun.c
[deliverable/binutils-gdb.git] / gdb / amd64-linux-tdep.c
index e7f966b5cc2ec7f48157fce2f4c791dcd506ca42..07820a05597053668baa001d97e2fe8a7c142067 100644 (file)
@@ -1,7 +1,6 @@
 /* Target-dependent code for GNU/Linux x86-64.
 
-   Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 2001-2020 Free Software Foundation, Inc.
    Contributed by Jiri Smid, SuSE Labs.
 
    This file is part of GDB.
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "reggroups.h"
+#include "regset.h"
+#include "parser-defs.h"
+#include "user-regs.h"
 #include "amd64-linux-tdep.h"
+#include "i386-linux-tdep.h"
 #include "linux-tdep.h"
-
-#include "gdb_string.h"
+#include "gdbsupport/x86-xstate.h"
 
 #include "amd64-tdep.h"
 #include "solib-svr4.h"
+#include "xml-syscall.h"
+#include "glibc-tdep.h"
+#include "arch/amd64.h"
+#include "target-descriptions.h"
+
+/* The syscall's XML filename for i386.  */
+#define XML_SYSCALL_FILENAME_AMD64 "syscalls/amd64-linux.xml"
 
-#include "record.h"
+#include "record-full.h"
 #include "linux-record.h"
 
 /* Mapping between the general-purpose registers in `struct user'
    format and GDB's register cache layout.  */
 
 /* From <sys/reg.h>.  */
-static int amd64_linux_gregset_reg_offset[] =
+int amd64_linux_gregset_reg_offset[] =
 {
   10 * 8,                      /* %rax */
   5 * 8,                       /* %rbx */
@@ -53,7 +62,7 @@ static int amd64_linux_gregset_reg_offset[] =
   14 * 8,                      /* %rdi */
   4 * 8,                       /* %rbp */
   19 * 8,                      /* %rsp */
-  9 * 8,                       /* %r8 ... */
+  9 * 8,                       /* %r8 ...  */
   8 * 8,
   7 * 8,
   6 * 8,
@@ -68,7 +77,29 @@ static int amd64_linux_gregset_reg_offset[] =
   23 * 8,                      /* %ds */
   24 * 8,                      /* %es */
   25 * 8,                      /* %fs */
-  26 * 8                       /* %gs */
+  26 * 8,                      /* %gs */
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1,              /* MPX registers BND0 ... BND3.  */
+  -1, -1,                      /* MPX registers BNDCFGU and BNDSTATUS.  */
+  -1, -1, -1, -1, -1, -1, -1, -1,     /* xmm16 ... xmm31 (AVX512)  */
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,     /* ymm16 ... ymm31 (AVX512)  */
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,     /* k0 ... k7 (AVX512)  */
+  -1, -1, -1, -1, -1, -1, -1, -1,     /* zmm0 ... zmm31 (AVX512)  */
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1,                          /* PKEYS register pkru  */
+
+  /* End of hardware registers */
+  21 * 8, 22 * 8,                    /* fs_base and gs_base.  */
+  15 * 8                             /* "orig_rax" */
 };
 \f
 
@@ -79,7 +110,7 @@ static int amd64_linux_gregset_reg_offset[] =
 #define LINUX_SIGTRAMP_INSN1   0x0f    /* syscall */
 #define LINUX_SIGTRAMP_OFFSET1 7
 
-static const gdb_byte linux_sigtramp_code[] =
+static const gdb_byte amd64_linux_sigtramp_code[] =
 {
   /* mov $__NR_rt_sigreturn, %rax */
   LINUX_SIGTRAMP_INSN0, 0xc7, 0xc0, 0x0f, 0x00, 0x00, 0x00,
@@ -87,7 +118,15 @@ static const gdb_byte linux_sigtramp_code[] =
   LINUX_SIGTRAMP_INSN1, 0x05
 };
 
-#define LINUX_SIGTRAMP_LEN (sizeof linux_sigtramp_code)
+static const gdb_byte amd64_x32_linux_sigtramp_code[] =
+{
+  /* mov $__NR_rt_sigreturn, %rax.  */
+  LINUX_SIGTRAMP_INSN0, 0xc7, 0xc0, 0x01, 0x02, 0x00, 0x40,
+  /* syscall */
+  LINUX_SIGTRAMP_INSN1, 0x05
+};
+
+#define LINUX_SIGTRAMP_LEN (sizeof amd64_linux_sigtramp_code)
 
 /* If PC is in a sigtramp routine, return the address of the start of
    the routine.  Otherwise, return 0.  */
@@ -95,6 +134,8 @@ static const gdb_byte linux_sigtramp_code[] =
 static CORE_ADDR
 amd64_linux_sigtramp_start (struct frame_info *this_frame)
 {
+  struct gdbarch *gdbarch;
+  const gdb_byte *sigtramp_code;
   CORE_ADDR pc = get_frame_pc (this_frame);
   gdb_byte buf[LINUX_SIGTRAMP_LEN];
 
@@ -118,7 +159,12 @@ amd64_linux_sigtramp_start (struct frame_info *this_frame)
        return 0;
     }
 
-  if (memcmp (buf, linux_sigtramp_code, LINUX_SIGTRAMP_LEN) != 0)
+  gdbarch = get_frame_arch (this_frame);
+  if (gdbarch_ptr_bit (gdbarch) == 32)
+    sigtramp_code = amd64_x32_linux_sigtramp_code;
+  else
+    sigtramp_code = amd64_linux_sigtramp_code;
+  if (memcmp (buf, sigtramp_code, LINUX_SIGTRAMP_LEN) != 0)
     return 0;
 
   return pc;
@@ -131,7 +177,7 @@ static int
 amd64_linux_sigtramp_p (struct frame_info *this_frame)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
 
@@ -174,6 +220,28 @@ amd64_linux_sigcontext_addr (struct frame_info *this_frame)
 }
 \f
 
+static LONGEST
+amd64_linux_get_syscall_number (struct gdbarch *gdbarch,
+                               thread_info *thread)
+{
+  struct regcache *regcache = get_thread_regcache (thread);
+  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+  /* The content of a register.  */
+  gdb_byte buf[8];
+  /* The result.  */
+  LONGEST ret;
+
+  /* Getting the system call number from the register.
+     When dealing with x86_64 architecture, this information
+     is stored at %rax register.  */
+  regcache->cooked_read (AMD64_LINUX_ORIG_RAX_REGNUM, buf);
+
+  ret = extract_signed_integer (buf, 8, byte_order);
+
+  return ret;
+}
+
+
 /* From <asm/sigcontext.h>.  */
 static int amd64_linux_sc_reg_offset[] =
 {
@@ -208,35 +276,17 @@ static int amd64_linux_sc_reg_offset[] =
   -1                           /* %gs */
 };
 
-/* Replacement register functions which know about %orig_rax.  */
-
-static const char *
-amd64_linux_register_name (struct gdbarch *gdbarch, int reg)
-{
-  if (reg == AMD64_LINUX_ORIG_RAX_REGNUM)
-    return "orig_rax";
-
-  return amd64_register_name (gdbarch, reg);
-}
-
-static struct type *
-amd64_linux_register_type (struct gdbarch *gdbarch, int reg)
-{
-  if (reg == AMD64_LINUX_ORIG_RAX_REGNUM)
-    return builtin_type (gdbarch)->builtin_int64;
-
-  return amd64_register_type (gdbarch, reg);
-}
-
 static int
 amd64_linux_register_reggroup_p (struct gdbarch *gdbarch, int regnum,
                                 struct reggroup *group)
 { 
-  if (regnum == AMD64_LINUX_ORIG_RAX_REGNUM)
+  if (regnum == AMD64_LINUX_ORIG_RAX_REGNUM
+      || regnum == AMD64_FSBASE_REGNUM
+      || regnum == AMD64_GSBASE_REGNUM)
     return (group == system_reggroup
             || group == save_reggroup
             || group == restore_reggroup);
-  return default_register_reggroup_p (gdbarch, regnum, group);
+  return i386_register_reggroup_p (gdbarch, regnum, group);
 }
 
 /* Set the program counter for process PTID to PC.  */
@@ -263,1170 +313,1576 @@ amd64_linux_write_pc (struct regcache *regcache, CORE_ADDR pc)
   regcache_cooked_write_unsigned (regcache, AMD64_LINUX_ORIG_RAX_REGNUM, -1);
 }
 
-/* Parse the arguments of current system call instruction and record
-   the values of the registers and memory that will be changed into
-   "record_arch_list".  This instruction is "syscall".
+/* Record all registers but IP register for process-record.  */
 
-   Return -1 if something wrong.  */
+static int
+amd64_all_but_ip_registers_record (struct regcache *regcache)
+{
+  if (record_full_arch_list_add_reg (regcache, AMD64_RAX_REGNUM))
+    return -1;
+  if (record_full_arch_list_add_reg (regcache, AMD64_RCX_REGNUM))
+    return -1;
+  if (record_full_arch_list_add_reg (regcache, AMD64_RDX_REGNUM))
+    return -1;
+  if (record_full_arch_list_add_reg (regcache, AMD64_RBX_REGNUM))
+    return -1;
+  if (record_full_arch_list_add_reg (regcache, AMD64_RSP_REGNUM))
+    return -1;
+  if (record_full_arch_list_add_reg (regcache, AMD64_RBP_REGNUM))
+    return -1;
+  if (record_full_arch_list_add_reg (regcache, AMD64_RSI_REGNUM))
+    return -1;
+  if (record_full_arch_list_add_reg (regcache, AMD64_RDI_REGNUM))
+    return -1;
+  if (record_full_arch_list_add_reg (regcache, AMD64_R8_REGNUM))
+    return -1;
+  if (record_full_arch_list_add_reg (regcache, AMD64_R9_REGNUM))
+    return -1;
+  if (record_full_arch_list_add_reg (regcache, AMD64_R10_REGNUM))
+    return -1;
+  if (record_full_arch_list_add_reg (regcache, AMD64_R11_REGNUM))
+    return -1;
+  if (record_full_arch_list_add_reg (regcache, AMD64_R12_REGNUM))
+    return -1;
+  if (record_full_arch_list_add_reg (regcache, AMD64_R13_REGNUM))
+    return -1;
+  if (record_full_arch_list_add_reg (regcache, AMD64_R14_REGNUM))
+    return -1;
+  if (record_full_arch_list_add_reg (regcache, AMD64_R15_REGNUM))
+    return -1;
+  if (record_full_arch_list_add_reg (regcache, AMD64_EFLAGS_REGNUM))
+    return -1;
 
-static struct linux_record_tdep amd64_linux_record_tdep;
+  return 0;
+}
 
-#define RECORD_ARCH_GET_FS     0x1003
-#define RECORD_ARCH_GET_GS     0x1004
+/* amd64_canonicalize_syscall maps from the native amd64 Linux set 
+   of syscall ids into a canonical set of syscall ids used by 
+   process record.  */
 
-static int
-amd64_linux_syscall_record (struct regcache *regcache)
+static enum gdb_syscall
+amd64_canonicalize_syscall (enum amd64_syscall syscall_number)
 {
-  int ret, num = -1;
-  ULONGEST tmpulongest;
+  DIAGNOSTIC_PUSH
+  DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES
 
-  regcache_raw_read_unsigned (regcache, AMD64_RAX_REGNUM, &tmpulongest);
+  switch (syscall_number) {
+  case amd64_sys_read:
+  case amd64_x32_sys_read:
+    return gdb_sys_read;
 
-  /* Convert tmpulongest to number in record_linux_system_call.  */
-  switch (tmpulongest)
-    {
-      /* sys_read */
-    case 0:
-      num = 3;
-      break;
-      /* sys_write */
-    case 1:
-      num = 4;
-      break;
-      /* sys_open */
-    case 2:
-      num = 5;
-      break;
-      /* sys_close */
-    case 3:
-      num = 6;
-      break;
-      /* sys_newstat */
-    case 4:
-      num = 106;
-      break;
-      /* sys_newfstat */
-    case 5:
-      num = 108;
-      break;
-      /* sys_newlstat */
-    case 6:
-      num = 107;
-      break;
-      /* sys_poll */
-    case 7:
-      num = 168;
-      break;
-      /* sys_lseek */
-    case 8:
-      num = 19;
-      break;
-      /* sys_mmap */
-    case 9:
-      num = 192;
-      break;
-      /* sys_mprotect */
-    case 10:
-      num = 125;
-      break;
-      /* sys_munmap */
-    case 11:
-      num = 91;
-      break;
-      /* sys_brk */
-    case 12:
-      num = 45;
-      break;
-      /* sys_rt_sigaction */
-    case 13:
-      num = 174;
-      break;
-      /* sys_rt_sigprocmask */
-    case 14:
-      num = 175;
-      break;
-      /* sys_rt_sigreturn */
-    case 15:
-      num = 173;
-      break;
-      /* sys_ioctl */
-    case 16:
-      num = 54;
-      break;
-      /* sys_pread64 */
-    case 17:
-      num = 180;
-      break;
-      /* sys_pwrite64 */
-    case 18:
-      num = 181;
-      break;
-      /* sys_readv */
-    case 19:
-      num = 145;
-      break;
-      /* sys_writev */
-    case 20:
-      num = 146;
-      break;
-      /* sys_access */
-    case 21:
-      num = 33;
-      break;
-      /* sys_pipe */
-    case 22:
-      num = 42;
-      break;
-      /* sys_select */
-    case 23:
-      num = 142;
-      break;
-      /* sys_sched_yield */
-    case 24:
-      num = 158;
-      break;
-      /* sys_mremap */
-    case 25:
-      num = 163;
-      break;
-      /* sys_msync */
-    case 26:
-      num = 144;
-      break;
-      /* sys_mincore */
-    case 27:
-      num = 218;
-      break;
-      /* sys_madvise */
-    case 28:
-      num = 219;
-      break;
-      /* sys_shmget */
-    case 29:
-      num = 520;
-      break;
-      /* sys_shmat */
-    case 30:
-      num = 521;
-      break;
-      /* sys_shmctl */
-    case 31:
-      num = 522;
-      break;
-      /* sys_dup */
-    case 32:
-      num = 41;
-      break;
-      /* sys_dup2 */
-    case 33:
-      num = 63;
-      break;
-      /* sys_pause */
-    case 34:
-      num = 29;
-      break;
-      /* sys_nanosleep */
-    case 35:
-      num = 162;
-      break;
-      /* sys_getitimer */
-    case 36:
-      num = 105;
-      break;
-      /* sys_alarm */
-    case 37:
-      num = 27;
-      break;
-      /* sys_setitimer */
-    case 38:
-      num = 104;
-      break;
-      /* sys_getpid */
-    case 39:
-      num = 20;
-      break;
-      /* sys_sendfile64 */
-    case 40:
-      num = 239;
-      break;
-      /* sys_socket */
-    case 41:
-      num = 500;
-      break;
-      /* sys_connect */
-    case 42:
-      num = 501;
-      break;
-      /* sys_accept */
-    case 43:
-      num = 502;
-      break;
-      /* sys_sendto */
-    case 44:
-      num = 503;
-      break;
-      /* sys_recvfrom */
-    case 45:
-      num = 504;
-      break;
-      /* sys_sendmsg */
-    case 46:
-      num = 505;
-      break;
-      /* sys_recvmsg */
-    case 47:
-      num = 506;
-      break;
-      /* sys_shutdown */
-    case 48:
-      num = 507;
-      break;
-      /* sys_bind */
-    case 49:
-      num = 508;
-      break;
-      /* sys_listen */
-    case 50:
-      num = 509;
-      break;
-      /* sys_getsockname */
-    case 51:
-      num = 510;
-      break;
-      /* sys_getpeername */
-    case 52:
-      num = 511;
-      break;
-      /* sys_socketpair */
-    case 53:
-      num = 512;
-      break;
-      /* sys_setsockopt */
-    case 54:
-      num = 513;
-      break;
-      /* sys_getsockopt */
-    case 55:
-      num = 514;
-      break;
-      /* sys_clone */
-    case 56:
-      num = 120;
-      break;
-      /* sys_fork */
-    case 57:
-      num = 2;
-      break;
-      /* sys_vfork */
-    case 58:
-      num = 190;
-      break;
-      /* sys_execve */
-    case 59:
-      num = 11;
-      break;
-      /* sys_exit */
-    case 60:
-      num = 1;
-      break;
-      /* sys_wait4 */
-    case 61:
-      num = 114;
-      break;
-      /* sys_kill */
-    case 62:
-      num = 37;
-      break;
-      /* sys_uname */
-    case 63:
-      num = 109;
-      break;
-      /* sys_semget */
-    case 64:
-      num = 523;
-      break;
-      /* sys_semop */
-    case 65:
-      num = 524;
-      break;
-      /* sys_semctl */
-    case 66:
-      num = 525;
-      break;
-      /* sys_shmdt */
-    case 67:
-      num = 527;
-      break;
-      /* sys_msgget */
-    case 68:
-      num = 528;
-      break;
-      /* sys_msgsnd */
-    case 69:
-      num = 529;
-      break;
-      /* sys_msgrcv */
-    case 70:
-      num = 530;
-      break;
-      /* sys_msgctl */
-    case 71:
-      num = 531;
-      break;
-      /* sys_fcntl */
-    case 72:
-      num = 55;
-      break;
-      /* sys_flock */
-    case 73:
-      num = 143;
-      break;
-      /* sys_fsync */
-    case 74:
-      num = 118;
-      break;
-      /* sys_fdatasync */
-    case 75:
-      num = 148;
-      break;
-      /* sys_truncate */
-    case 76:
-      num = 92;
-      break;
-      /* sys_ftruncate */
-    case 77:
-      num = 93;
-      break;
-      /* sys_getdents */
-    case 78:
-      num = 141;
-      break;
-      /* sys_getcwd */
-    case 79:
-      num = 183;
-      break;
-      /* sys_chdir */
-    case 80:
-      num = 12;
-      break;
-      /* sys_fchdir */
-    case 81:
-      num = 133;
-      break;
-      /* sys_rename */
-    case 82:
-      num = 38;
-      break;
-      /* sys_mkdir */
-    case 83:
-      num = 39;
-      break;
-      /* sys_rmdir */
-    case 84:
-      num = 40;
-      break;
-      /* sys_creat */
-    case 85:
-      num = 8;
-      break;
-      /* sys_link */
-    case 86:
-      num = 9;
-      break;
-      /* sys_unlink */
-    case 87:
-      num = 10;
-      break;
-      /* sys_symlink */
-    case 88:
-      num = 83;
-      break;
-      /* sys_readlink */
-    case 89:
-      num = 85;
-      break;
-      /* sys_chmod */
-    case 90:
-      num = 15;
-      break;
-      /* sys_fchmod */
-    case 91:
-      num = 94;
-      break;
-      /* sys_chown */
-    case 92:
-      num = 212;
-      break;
-      /* sys_fchown */
-    case 93:
-      num = 207;
-      break;
-      /* sys_lchown */
-    case 94:
-      num = 198;
-      break;
-      /* sys_umask */
-    case 95:
-      num = 60;
-      break;
-      /* sys_gettimeofday */
-    case 96:
-      num = 78;
-      break;
-      /* sys_getrlimit */
-    case 97:
-      num = 191;
-      break;
-      /* sys_getrusage */
-    case 98:
-      num = 77;
-      break;
-      /* sys_sysinfo */
-    case 99:
-      num = 116;
-      break;
-      /* sys_times */
-    case 100:
-      num = 43;
-      break;
-      /* sys_ptrace */
-    case 101:
-      num = 26;
-      break;
-      /* sys_getuid */
-    case 102:
-      num = 199;
-      break;
-      /* sys_syslog */
-    case 103:
-      num = 103;
-      break;
-      /* sys_getgid */
-    case 104:
-      num = 200;
-      break;
-      /* sys_setuid */
-    case 105:
-      num = 213;
-      break;
-      /* sys_setgid */
-    case 106:
-      num = 214;
-      break;
-      /* sys_geteuid */
-    case 107:
-      num = 201;
-      break;
-      /* sys_getegid */
-    case 108:
-      num = 202;
-      break;
-      /* sys_setpgid */
-    case 109:
-      num = 57;
-      break;
-      /* sys_getppid */
-    case 110:
-      num = 64;
-      break;
-      /* sys_getpgrp */
-    case 111:
-      num = 65;
-      break;
-      /* sys_setsid */
-    case 112:
-      num = 66;
-      break;
-      /* sys_setreuid */
-    case 113:
-      num = 203;
-      break;
-      /* sys_setregid */
-    case 114:
-      num = 204;
-      break;
-      /* sys_getgroups */
-    case 115:
-      num = 205;
-      break;
-      /* sys_setgroups */
-    case 116:
-      num = 206;
-      break;
-      /* sys_setresuid */
-    case 117:
-      num = 208;
-      break;
-      /* sys_getresuid */
-    case 118:
-      num = 209;
-      break;
-      /* sys_setresgid */
-    case 119:
-      num = 210;
-      break;
-      /* sys_getresgid */
-    case 120:
-      num = 211;
-      break;
-      /* sys_getpgid */
-    case 121:
-      num = 132;
-      break;
-      /* sys_setfsuid */
-    case 122:
-      num = 215;
-      break;
-      /* sys_setfsgid */
-    case 123:
-      num = 216;
-      break;
-      /* sys_getsid */
-    case 124:
-      num = 147;
-      break;
-      /* sys_capget */
-    case 125:
-      num = 184;
-      break;
-      /* sys_capset */
-    case 126:
-      num = 185;
-      break;
-      /* sys_rt_sigpending */
-    case 127:
-      num = 176;
-      break;
-      /* sys_rt_sigtimedwait */
-    case 128:
-      num = 177;
-      break;
-      /* sys_rt_sigqueueinfo */
-    case 129:
-      num = 178;
-      break;
-      /* sys_rt_sigsuspend */
-    case 130:
-      num = 179;
-      break;
-      /* sys_sigaltstack */
-    case 131:
-      num = 186;
-      break;
-      /* sys_utime */
-    case 132:
-      num = 30;
-      break;
-      /* sys_mknod */
-    case 133:
-      num = 14;
-      break;
-      /* sys_personality */
-    case 135:
-      num = 136;
-      break;
-      /* sys_ustat */
-    case 136:
-      num = 62;
-      break;
-      /* sys_statfs */
-    case 137:
-      num = 99;
-      break;
-      /* sys_fstatfs */
-    case 138:
-      num = 100;
-      break;
-      /* sys_sysfs */
-    case 139:
-      num = 135;
-      break;
-      /* sys_getpriority */
-    case 140:
-      num = 96;
-      break;
-      /* sys_setpriority */
-    case 141:
-      num = 97;
-      break;
-      /* sys_sched_setparam */
-    case 142:
-      num = 154;
-      break;
-      /* sys_sched_getparam */
-    case 143:
-      num = 155;
-      break;
-      /* sys_sched_setscheduler */
-    case 144:
-      num = 156;
-      break;
-      /* sys_sched_getscheduler */
-    case 145:
-      num = 157;
-      break;
-      /* sys_sched_get_priority_max */
-    case 146:
-      num = 159;
-      break;
-      /* sys_sched_get_priority_min */
-    case 147:
-      num = 160;
-      break;
-      /* sys_sched_rr_get_interval */
-    case 148:
-      num = 161;
-      break;
-      /* sys_mlock */
-    case 149:
-      num = 150;
-      break;
-      /* sys_munlock */
-    case 150:
-      num = 151;
-      break;
-      /* sys_mlockall */
-    case 151:
-      num = 152;
-      break;
-      /* sys_munlockall */
-    case 152:
-      num = 153;
-      break;
-      /* sys_vhangup */
-    case 153:
-      num = 111;
-      break;
-      /* sys_modify_ldt */
-    case 154:
-      num = 123;
-      break;
-      /* sys_pivot_root */
-    case 155:
-      num = 217;
-      break;
-      /* sys_sysctl */
-    case 156:
-      num = 149;
-      break;
-      /* sys_prctl */
-    case 157:
-      num = 172;
-      break;
-      /* sys_arch_prctl */
-    case 158:
-      regcache_raw_read_unsigned (regcache, amd64_linux_record_tdep.arg3,
-                                  &tmpulongest);
-      if (tmpulongest == RECORD_ARCH_GET_FS
-          || tmpulongest == RECORD_ARCH_GET_GS)
-        {
-          regcache_raw_read_unsigned (regcache, amd64_linux_record_tdep.arg2,
-                                      &tmpulongest);
-          if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest,
-                                        amd64_linux_record_tdep.size_ulong))
-            return -1;
-        }
-      break;
-      /* sys_adjtimex */
-    case 159:
-      num = 124;
-      break;
-      /* sys_setrlimit */
-    case 160:
-      num = 75;
-      break;
-      /* sys_chroot */
-    case 161:
-      num = 61;
-      break;
-      /* sys_sync */
-    case 162:
-      num = 36;
-      break;
-      /* sys_acct */
-    case 163:
-      num = 51;
-      break;
-      /* sys_settimeofday */
-    case 164:
-      num = 79;
-      break;
-      /* sys_mount */
-    case 165:
-      num = 21;
-      break;
-      /* sys_umount */
-    case 166:
-      num = 52;
-      break;
-      /* sys_swapon */
-    case 167:
-      num = 87;
-      break;
-      /* sys_swapoff */
-    case 168:
-      num = 115;
-      break;
-      /* sys_reboot */
-    case 169:
-      num = 88;
-      break;
-      /* sys_sethostname */
-    case 170:
-      num = 74;
-      break;
-      /* sys_setdomainname */
-    case 171:
-      num = 121;
-      break;
-      /* sys_iopl */
-    case 172:
-      num = 110;
-      break;
-      /* sys_ioperm */
-    case 173:
-      num = 101;
-      break;
-      /* sys_init_module */
-    case 175:
-      num = 128;
-      break;
-      /* sys_delete_module */
-    case 176:
-      num = 129;
-      break;
-      /* sys_quotactl */
-    case 179:
-      num = 131;
-      break;
-      /* sys_nfsservctl */
-    case 180:
-      num = 169;
-      break;
-      /* sys_gettid */
-    case 186:
-      num = 224;
-      break;
-      /* sys_readahead */
-    case 187:
-      num = 225;
-      break;
-      /* sys_setxattr */
-    case 188:
-      num = 226;
-      break;
-      /* sys_lsetxattr */
-    case 189:
-      num = 227;
-      break;
-      /* sys_fsetxattr */
-    case 190:
-      num = 228;
-      break;
-      /* sys_getxattr */
-    case 191:
-      num = 229;
-      break;
-      /* sys_lgetxattr */
-    case 192:
-      num = 230;
-      break;
-      /* sys_fgetxattr */
-    case 193:
-      num = 231;
-      break;
-      /* sys_listxattr */
-    case 194:
-      num = 232;
-      break;
-      /* sys_llistxattr */
-    case 195:
-      num = 233;
-      break;
-      /* sys_flistxattr */
-    case 196:
-      num = 234;
-      break;
-      /* sys_removexattr */
-    case 197:
-      num = 235;
-      break;
-      /* sys_lremovexattr */
-    case 198:
-      num = 236;
-      break;
-      /* sys_fremovexattr */
-    case 199:
-      num = 237;
-      break;
-      /* sys_tkill */
-    case 200:
-      num = 238;
-      break;
-      /* sys_time */
-    case 201:
-      num = 13;
-      break;
-      /* sys_futex */
-    case 202:
-      num = 240;
-      break;
-      /* sys_sched_setaffinity */
-    case 203:
-      num = 241;
-      break;
-      /* sys_sched_getaffinity */
-    case 204:
-      num = 242;
-      break;
-      /* sys_io_setup */
-    case 206:
-      num = 245;
-      break;
-      /* sys_io_destroy */
-    case 207:
-      num = 246;
-      break;
-      /* sys_io_getevents */
-    case 208:
-      num = 247;
-      break;
-      /* sys_io_submit */
-    case 209:
-      num = 248;
-      break;
-      /* sys_io_cancel */
-    case 210:
-      num = 249;
-      break;
-      /* sys_lookup_dcookie */
-    case 212:
-      num = 253;
-      break;
-      /* sys_epoll_create */
-    case 213:
-      num = 254;
-      break;
-      /* sys_remap_file_pages */
-    case 216:
-      num = 257;
-      break;
-      /* sys_getdents64 */
-    case 217:
-      num = 220;
-      break;
-      /* sys_set_tid_address */
-    case 218:
-      num = 258;
-      break;
-      /* sys_restart_syscall */
-    case 219:
-      num = 0;
-      break;
-      /* sys_semtimedop */
-    case 220:
-      num = 532;
-      break;
-      /* sys_fadvise64 */
-    case 221:
-      num = 250;
-      break;
-      /* sys_timer_create */
-    case 222:
-      num = 259;
-      break;
-      /* sys_timer_settime */
-    case 223:
-      num = 260;
-      break;
-      /* sys_timer_gettime */
-    case 224:
-      num = 261;
-      break;
-      /* sys_timer_getoverrun */
-    case 225:
-      num = 262;
-      break;
-      /* sys_timer_delete */
-    case 226:
-      num = 263;
-      break;
-      /* sys_clock_settime */
-    case 227:
-      num = 264;
-      break;
-      /* sys_clock_gettime */
-    case 228:
-      num = 265;
-      break;
-      /* sys_clock_getres */
-    case 229:
-      num = 266;
-      break;
-      /* sys_clock_nanosleep */
-    case 230:
-      num = 267;
-      break;
-      /* sys_exit_group */
-    case 231:
-      num = 252;
-      break;
-      /* sys_epoll_wait */
-    case 232:
-      num = 256;
-      break;
-      /* sys_epoll_ctl */
-    case 233:
-      num = 255;
-      break;
-      /* sys_tgkill */
-    case 234:
-      num = 270;
-      break;
-      /* sys_utimes */
-    case 235:
-      num = 271;
-      break;
-      /* sys_mbind */
-    case 237:
-      num = 274;
-      break;
-      /* sys_set_mempolicy */
-    case 238:
-      num = 276;
-      break;
-      /* sys_get_mempolicy */
-    case 239:
-      num = 275;
-      break;
-      /* sys_mq_open */
-    case 240:
-      num = 277;
-      break;
-      /* sys_mq_unlink */
-    case 241:
-      num = 278;
-      break;
-      /* sys_mq_timedsend */
-    case 242:
-      num = 279;
-      break;
-      /* sys_mq_timedreceive */
-    case 243:
-      num = 280;
-      break;
-      /* sys_mq_notify */
-    case 244:
-      num = 281;
-      break;
-      /* sys_mq_getsetattr */
-    case 245:
-      num = 282;
-      break;
-      /* sys_kexec_load */
-    case 246:
-      num = 283;
-      break;
-      /* sys_waitid */
-    case 247:
-      num = 284;
-      break;
-      /* sys_add_key */
-    case 248:
-      num = 286;
-      break;
-      /* sys_request_key */
-    case 249:
-      num = 287;
-      break;
-      /* sys_keyctl */
-    case 250:
-      num = 288;
-      break;
-      /* sys_ioprio_set */
-    case 251:
-      num = 289;
-      break;
-      /* sys_ioprio_get */
-    case 252:
-      num = 290;
-      break;
-      /* sys_inotify_init */
-    case 253:
-      num = 291;
-      break;
-      /* sys_inotify_add_watch */
-    case 254:
-      num = 292;
-      break;
-      /* sys_inotify_rm_watch */
-    case 255:
-      num = 293;
-      break;
-      /* sys_migrate_pages */
-    case 256:
-      num = 294;
-      break;
-      /* sys_openat */
-    case 257:
-      num = 295;
-      break;
-      /* sys_mkdirat */
-    case 258:
-      num = 296;
-      break;
-      /* sys_mknodat */
-    case 259:
-      num = 297;
-      break;
-      /* sys_fchownat */
-    case 260:
-      num = 298;
-      break;
-      /* sys_futimesat */
-    case 261:
-      num = 299;
-      break;
-      /* sys_newfstatat */
-    case 262:
-      num = 540;
-      break;
-      /* sys_unlinkat */
-    case 263:
-      num = 301;
-      break;
-      /* sys_renameat */
-    case 264:
-      num = 302;
-      break;
-      /* sys_linkat */
-    case 265:
-      num = 303;
-      break;
-      /* sys_symlinkat */
-    case 266:
-      num = 304;
-      break;
-      /* sys_readlinkat */
-    case 267:
-      num = 305;
-      break;
-      /* sys_fchmodat */
-    case 268:
-      num = 306;
-      break;
-      /* sys_faccessat */
-    case 269:
-      num = 307;
-      break;
-      /* sys_pselect6 */
-    case 270:
-      num = 308;
-      break;
-      /* sys_ppoll */
-    case 271:
-      num = 309;
-      break;
-      /* sys_unshare */
-    case 272:
-      num = 310;
-      break;
-      /* sys_set_robust_list */
-    case 273:
-      num = 311;
-      break;
-      /* sys_get_robust_list */
-    case 274:
-      num = 312;
-      break;
-      /* sys_splice */
-    case 275:
-      num = 313;
-      break;
-      /* sys_tee */
-    case 276:
-      num = 315;
-      break;
-      /* sys_sync_file_range */
-    case 277:
-      num = 314;
-      break;
-      /* sys_vmsplice */
-    case 278:
-      num = 316;
-      break;
-      /* sys_move_pages */
-    case 279:
-      num = 317;
+  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 gdb_sys_no_syscall; /* 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:
+    return gdb_sys_no_syscall;
+  }
+
+  DIAGNOSTIC_POP
+}
+
+/* Parse the arguments of current system call instruction and record
+   the values of the registers and memory that will be changed into
+   "record_full_arch_list".  This instruction is "syscall".
+
+   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_common (struct regcache *regcache,
+                                  struct linux_record_tdep *linux_record_tdep_p)
+{
+  int ret;
+  ULONGEST syscall_native;
+  enum gdb_syscall syscall_gdb = gdb_sys_no_syscall;
+
+  regcache_raw_read_unsigned (regcache, AMD64_RAX_REGNUM, &syscall_native);
+
+  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, 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,
+                                       linux_record_tdep_p->arg2,
+                                       &addr);
+           if (record_full_arch_list_add_mem
+               (addr, linux_record_tdep_p->size_ulong))
+             return -1;
+         }
+       goto record_regs;
+      }
       break;
-    default:
+    }
+
+  syscall_gdb
+    = amd64_canonicalize_syscall ((enum amd64_syscall) syscall_native);
+
+  if (syscall_gdb == gdb_sys_no_syscall)
+    {
       printf_unfiltered (_("Process record and replay target doesn't "
-                           "support syscall number %d\n"), (int) tmpulongest);
+                           "support syscall number %s\n"), 
+                        pulongest (syscall_native));
       return -1;
-      break;
     }
-
-  if (num >= 0)
+  else
     {
-      ret = record_linux_system_call (num, regcache,
-                                      &amd64_linux_record_tdep);
+      ret = record_linux_system_call (syscall_gdb, regcache,
+                                      linux_record_tdep_p);
       if (ret)
         return ret;
     }
 
+ record_regs:
   /* Record the return value of the system call.  */
-  if (record_arch_list_add_reg (regcache, AMD64_RCX_REGNUM))
+  if (record_full_arch_list_add_reg (regcache, AMD64_RCX_REGNUM))
+    return -1;
+  if (record_full_arch_list_add_reg (regcache, AMD64_R11_REGNUM))
+    return -1;
+
+  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
+
+static int
+amd64_linux_record_signal (struct gdbarch *gdbarch,
+                           struct regcache *regcache,
+                           enum gdb_signal signal)
+{
+  ULONGEST rsp;
+
+  if (amd64_all_but_ip_registers_record (regcache))
+    return -1;
+
+  if (record_full_arch_list_add_reg (regcache, AMD64_RIP_REGNUM))
     return -1;
-  if (record_arch_list_add_reg (regcache, AMD64_R11_REGNUM))
+
+  /* Record the change in the stack.  */
+  regcache_raw_read_unsigned (regcache, AMD64_RSP_REGNUM, &rsp);
+  /* redzone
+     sp -= 128; */
+  rsp -= AMD64_LINUX_redzone;
+  /* This is for xstate.
+     sp -= sizeof (struct _fpstate);  */
+  rsp -= AMD64_LINUX_xstate;
+  /* This is for frame_size.
+     sp -= sizeof (struct rt_sigframe);  */
+  rsp -= AMD64_LINUX_frame_size;
+  if (record_full_arch_list_add_mem (rsp, AMD64_LINUX_redzone
+                                     + AMD64_LINUX_xstate
+                                     + AMD64_LINUX_frame_size))
     return -1;
 
+  if (record_full_arch_list_add_end ())
+    return -1;
 
   return 0;
 }
 
+const target_desc *
+amd64_linux_read_description (uint64_t xcr0_features_bit, bool is_x32)
+{
+  static target_desc *amd64_linux_tdescs \
+    [2/*AVX*/][2/*MPX*/][2/*AVX512*/][2/*PKRU*/] = {};
+  static target_desc *x32_linux_tdescs[2/*AVX*/][2/*AVX512*/] = {};
+
+  target_desc **tdesc;
+
+  if (is_x32)
+    {
+      tdesc = &x32_linux_tdescs[(xcr0_features_bit & X86_XSTATE_AVX) ? 1 : 0 ]
+       [(xcr0_features_bit & X86_XSTATE_AVX512) ? 1 : 0];
+    }
+  else
+    {
+      tdesc = &amd64_linux_tdescs[(xcr0_features_bit & X86_XSTATE_AVX) ? 1 : 0]
+       [(xcr0_features_bit & X86_XSTATE_MPX) ? 1 : 0]
+       [(xcr0_features_bit & X86_XSTATE_AVX512) ? 1 : 0]
+       [(xcr0_features_bit & X86_XSTATE_PKRU) ? 1 : 0];
+    }
+
+  if (*tdesc == NULL)
+    *tdesc = amd64_create_target_description (xcr0_features_bit, is_x32,
+                                             true, true);
+
+  return *tdesc;
+}
+
+/* Get Linux/x86 target description from core dump.  */
+
+static const struct target_desc *
+amd64_linux_core_read_description (struct gdbarch *gdbarch,
+                                 struct target_ops *target,
+                                 bfd *abfd)
+{
+  /* Linux/x86-64.  */
+  uint64_t xcr0 = i386_linux_core_read_xcr0 (abfd);
+
+  return amd64_linux_read_description (xcr0 & X86_XSTATE_ALL_MASK,
+                                      gdbarch_ptr_bit (gdbarch) == 32);
+}
+
+/* Similar to amd64_supply_fpregset, but use XSAVE extended state.  */
+
+static void
+amd64_linux_supply_xstateregset (const struct regset *regset,
+                                struct regcache *regcache, int regnum,
+                                const void *xstateregs, size_t len)
+{
+  amd64_supply_xsave (regcache, regnum, xstateregs);
+}
+
+/* Similar to amd64_collect_fpregset, but use XSAVE extended state.  */
+
 static void
-amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
+amd64_linux_collect_xstateregset (const struct regset *regset,
+                                 const struct regcache *regcache,
+                                 int regnum, void *xstateregs, size_t len)
+{
+  amd64_collect_xsave (regcache, regnum, xstateregs, 1);
+}
+
+static const struct regset amd64_linux_xstateregset =
+  {
+    NULL,
+    amd64_linux_supply_xstateregset,
+    amd64_linux_collect_xstateregset
+  };
+
+/* Iterate over core file register note sections.  */
+
+static void
+amd64_linux_iterate_over_regset_sections (struct gdbarch *gdbarch,
+                                         iterate_over_regset_sections_cb *cb,
+                                         void *cb_data,
+                                         const struct regcache *regcache)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
-  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;
+  cb (".reg", 27 * 8, 27 * 8, &i386_gregset, NULL, cb_data);
+  cb (".reg2", 512, 512, &amd64_fpregset, NULL, cb_data);
+  cb (".reg-xstate", X86_XSTATE_SIZE (tdep->xcr0), X86_XSTATE_SIZE (tdep->xcr0),
+      &amd64_linux_xstateregset, "XSAVE extended state", cb_data);
+}
+
+/* The instruction sequences used in x86_64 machines for a
+   disabled is-enabled probe.  */
+
+const gdb_byte amd64_dtrace_disabled_probe_sequence_1[] = {
+  /* xor %rax, %rax */  0x48, 0x33, 0xc0,
+  /* nop            */  0x90,
+  /* nop            */  0x90
+};
+
+const gdb_byte amd64_dtrace_disabled_probe_sequence_2[] = {
+  /* xor %rax, %rax */  0x48, 0x33, 0xc0,
+  /* ret            */  0xc3,
+  /* nop            */  0x90
+};
+
+/* The instruction sequence used in x86_64 machines for enabling a
+   DTrace is-enabled probe.  */
+
+const gdb_byte amd64_dtrace_enable_probe_sequence[] = {
+  /* mov $0x1, %eax */ 0xb8, 0x01, 0x00, 0x00, 0x00
+};
+
+/* The instruction sequence used in x86_64 machines for disabling a
+   DTrace is-enabled probe.  */
+
+const gdb_byte amd64_dtrace_disable_probe_sequence[] = {
+  /* xor %rax, %rax; nop; nop */ 0x48, 0x33, 0xC0, 0x90, 0x90
+};
+
+/* Implementation of `gdbarch_dtrace_probe_is_enabled', as defined in
+   gdbarch.h.  */
+
+static int
+amd64_dtrace_probe_is_enabled (struct gdbarch *gdbarch, CORE_ADDR addr)
+{
+  gdb_byte buf[5];
+
+  /* This function returns 1 if the instructions at ADDR do _not_
+     follow any of the amd64_dtrace_disabled_probe_sequence_*
+     patterns.
+
+     Note that ADDR is offset 3 bytes from the beginning of these
+     sequences.  */
+  
+  read_code (addr - 3, buf, 5);
+  return (memcmp (buf, amd64_dtrace_disabled_probe_sequence_1, 5) != 0
+         && memcmp (buf, amd64_dtrace_disabled_probe_sequence_2, 5) != 0);
+}
 
-  amd64_init_abi (info, gdbarch);
+/* Implementation of `gdbarch_dtrace_enable_probe', as defined in
+   gdbarch.h.  */
+
+static void
+amd64_dtrace_enable_probe (struct gdbarch *gdbarch, CORE_ADDR addr)
+{
+  /* Note also that ADDR is offset 3 bytes from the beginning of
+     amd64_dtrace_enable_probe_sequence.  */
+
+  write_memory (addr - 3, amd64_dtrace_enable_probe_sequence, 5);
+}
+
+/* Implementation of `gdbarch_dtrace_disable_probe', as defined in
+   gdbarch.h.  */
+
+static void
+amd64_dtrace_disable_probe (struct gdbarch *gdbarch, CORE_ADDR addr)
+{
+  /* Note also that ADDR is offset 3 bytes from the beginning of
+     amd64_dtrace_disable_probe_sequence.  */
+
+  write_memory (addr - 3, amd64_dtrace_disable_probe_sequence, 5);
+}
+
+/* Implementation of `gdbarch_dtrace_parse_probe_argument', as defined
+   in gdbarch.h.  */
+
+static void
+amd64_dtrace_parse_probe_argument (struct gdbarch *gdbarch,
+                                  struct expr_builder *builder,
+                                  int narg)
+{
+  struct stoken str;
+
+  /* DTrace probe arguments can be found on the ABI-defined places for
+     regular arguments at the current PC.  The probe abstraction
+     currently supports up to 12 arguments for probes.  */
+
+  if (narg < 6)
+    {
+      static const int arg_reg_map[6] =
+       {
+         AMD64_RDI_REGNUM,  /* Arg 1.  */
+         AMD64_RSI_REGNUM,  /* Arg 2.  */
+         AMD64_RDX_REGNUM,  /* Arg 3.  */
+         AMD64_RCX_REGNUM,  /* Arg 4.  */
+         AMD64_R8_REGNUM,   /* Arg 5.  */
+         AMD64_R9_REGNUM    /* Arg 6.  */
+       };
+      int regno = arg_reg_map[narg];
+      const char *regname = user_reg_map_regnum_to_name (gdbarch, regno);
+
+      write_exp_elt_opcode (builder, OP_REGISTER);
+      str.ptr = regname;
+      str.length = strlen (regname);
+      write_exp_string (builder, str);
+      write_exp_elt_opcode (builder, OP_REGISTER);
+    }
+  else
+    {
+      /* Additional arguments are passed on the stack.  */
+      const char *regname = user_reg_map_regnum_to_name (gdbarch, AMD64_RSP_REGNUM);
+
+      /* Displacement.  */
+      write_exp_elt_opcode (builder, OP_LONG);
+      write_exp_elt_type (builder, builtin_type (gdbarch)->builtin_long);
+      write_exp_elt_longcst (builder, narg - 6);
+      write_exp_elt_opcode (builder, OP_LONG);
+
+      /* Register: SP.  */
+      write_exp_elt_opcode (builder, OP_REGISTER);
+      str.ptr = regname;
+      str.length = strlen (regname);
+      write_exp_string (builder, str);
+      write_exp_elt_opcode (builder, OP_REGISTER);
+
+      write_exp_elt_opcode (builder, BINOP_ADD);
+
+      /* Cast to long. */
+      write_exp_elt_opcode (builder, UNOP_CAST);
+      write_exp_elt_type (builder,
+                         lookup_pointer_type (builtin_type (gdbarch)->builtin_long));
+      write_exp_elt_opcode (builder, UNOP_CAST);
+
+      write_exp_elt_opcode (builder, UNOP_IND);
+    }
+}
+
+static void
+amd64_linux_init_abi_common(struct gdbarch_info info, struct gdbarch *gdbarch)
+{
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+
+  linux_init_abi (info, gdbarch);
 
   tdep->sigtramp_p = amd64_linux_sigtramp_p;
   tdep->sigcontext_addr = amd64_linux_sigcontext_addr;
   tdep->sc_reg_offset = amd64_linux_sc_reg_offset;
   tdep->sc_num_regs = ARRAY_SIZE (amd64_linux_sc_reg_offset);
 
-  /* GNU/Linux uses SVR4-style shared libraries.  */
-  set_solib_svr4_fetch_link_map_offsets
-    (gdbarch, svr4_lp64_fetch_link_map_offsets);
+  tdep->xsave_xcr0_offset = I386_LINUX_XSAVE_XCR0_OFFSET;
 
   /* Add the %orig_rax register used for syscall restarting.  */
   set_gdbarch_write_pc (gdbarch, amd64_linux_write_pc);
-  set_gdbarch_num_regs (gdbarch, AMD64_LINUX_NUM_REGS);
-  set_gdbarch_register_name (gdbarch, amd64_linux_register_name);
-  set_gdbarch_register_type (gdbarch, amd64_linux_register_type);
-  set_gdbarch_register_reggroup_p (gdbarch, amd64_linux_register_reggroup_p);
+
+  tdep->register_reggroup_p = amd64_linux_register_reggroup_p;
+
+  /* Functions for 'catch syscall'.  */
+  set_xml_syscall_file_name (gdbarch, XML_SYSCALL_FILENAME_AMD64);
+  set_gdbarch_get_syscall_number (gdbarch,
+                                  amd64_linux_get_syscall_number);
 
   /* Enable TLS support.  */
   set_gdbarch_fetch_tls_load_module_address (gdbarch,
                                              svr4_fetch_objfile_link_map);
 
+  /* GNU/Linux uses SVR4-style shared libraries.  */
+  set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
+
+  /* GNU/Linux uses the dynamic linker included in the GNU C Library.  */
+  set_gdbarch_skip_solib_resolver (gdbarch, glibc_skip_solib_resolver);
+
+  /* Iterate over core file register note sections.  */
+  set_gdbarch_iterate_over_regset_sections
+    (gdbarch, amd64_linux_iterate_over_regset_sections);
+
+  set_gdbarch_core_read_description (gdbarch,
+                                    amd64_linux_core_read_description);
+
   /* Displaced stepping.  */
   set_gdbarch_displaced_step_copy_insn (gdbarch,
                                         amd64_displaced_step_copy_insn);
   set_gdbarch_displaced_step_fixup (gdbarch, amd64_displaced_step_fixup);
-  set_gdbarch_displaced_step_free_closure (gdbarch,
-                                           simple_displaced_step_free_closure);
   set_gdbarch_displaced_step_location (gdbarch,
-                                       displaced_step_at_entry_point);
-
-  set_gdbarch_get_siginfo_type (gdbarch, linux_get_siginfo_type);
+                                       linux_displaced_step_location);
 
   set_gdbarch_process_record (gdbarch, i386_process_record);
+  set_gdbarch_process_record_signal (gdbarch, amd64_linux_record_signal);
+
+  set_gdbarch_get_siginfo_type (gdbarch, x86_linux_get_siginfo_type);
+  set_gdbarch_handle_segmentation_fault (gdbarch,
+                                        i386_linux_handle_segmentation_fault);
+}
+
+static void
+amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
+{
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+  struct tdesc_arch_data *tdesc_data = info.tdesc_data;
+  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,
+                 amd64_linux_read_description (X86_XSTATE_SSE_MASK, false));
+
+  const target_desc *tdesc = tdep->tdesc;
+
+  /* Reserve a number for orig_rax.  */
+  set_gdbarch_num_regs (gdbarch, AMD64_LINUX_NUM_REGS);
+
+  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
@@ -1441,10 +1897,10 @@ amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   amd64_linux_record_tdep.size_ustat = 32;
   /* ADM64 doesn't need this size because it doesn't have sys_sigaction
      but sys_rt_sigaction.  */
-  amd64_linux_record_tdep.size_old_sigaction = 152;
+  amd64_linux_record_tdep.size_old_sigaction = 32;
   /* ADM64 doesn't need this size because it doesn't have sys_sigpending
      but sys_rt_sigpending.  */
-  amd64_linux_record_tdep.size_old_sigset_t = 128;
+  amd64_linux_record_tdep.size_old_sigset_t = 8;
   amd64_linux_record_tdep.size_rlimit = 16;
   amd64_linux_record_tdep.size_rusage = 144;
   amd64_linux_record_tdep.size_timeval = 16;
@@ -1456,8 +1912,8 @@ amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
      but sys_getresuid.  */
   amd64_linux_record_tdep.size_old_uid_t = 2;
   amd64_linux_record_tdep.size_fd_set = 128;
-  amd64_linux_record_tdep.size_dirent = 280;
-  amd64_linux_record_tdep.size_dirent64 = 280;
+  /* ADM64 doesn't need this size because it doesn't have sys_readdir. */
+  amd64_linux_record_tdep.size_old_dirent = 280;
   amd64_linux_record_tdep.size_statfs = 120;
   amd64_linux_record_tdep.size_statfs64 = 120;
   amd64_linux_record_tdep.size_sockaddr = 16;
@@ -1484,8 +1940,8 @@ amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   amd64_linux_record_tdep.size_NFS_FHSIZE = 32;
   amd64_linux_record_tdep.size_knfsd_fh = 132;
   amd64_linux_record_tdep.size_TASK_COMM_LEN = 16;
-  amd64_linux_record_tdep.size_sigaction = 152;
-  amd64_linux_record_tdep.size_sigset_t = 128;
+  amd64_linux_record_tdep.size_sigaction = 32;
+  amd64_linux_record_tdep.size_sigset_t = 8;
   amd64_linux_record_tdep.size_siginfo_t = 128;
   amd64_linux_record_tdep.size_cap_user_data_t = 8;
   amd64_linux_record_tdep.size_stack_t = 24;
@@ -1501,8 +1957,7 @@ amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   amd64_linux_record_tdep.size_epoll_event = 12;
   amd64_linux_record_tdep.size_itimerspec = 32;
   amd64_linux_record_tdep.size_mq_attr = 64;
-  amd64_linux_record_tdep.size_siginfo = 128;
-  amd64_linux_record_tdep.size_termios = 60;
+  amd64_linux_record_tdep.size_termios = 36;
   amd64_linux_record_tdep.size_termios2 = 44;
   amd64_linux_record_tdep.size_pid_t = 4;
   amd64_linux_record_tdep.size_winsize = 8;
@@ -1511,6 +1966,21 @@ amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   amd64_linux_record_tdep.size_hayes_esp_config = 12;
   amd64_linux_record_tdep.size_size_t = 8;
   amd64_linux_record_tdep.size_iovec = 16;
+  amd64_linux_record_tdep.size_time_t = 8;
+
+  /* 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.  */
@@ -1581,30 +2051,232 @@ amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   amd64_linux_record_tdep.ioctl_TIOCSHAYESESP = 0x545F;
   amd64_linux_record_tdep.ioctl_FIOQSIZE = 0x5460;
 
+  tdep->i386_syscall_record = amd64_linux_syscall_record;
+
+  /* GNU/Linux uses SVR4-style shared libraries.  */
+  set_solib_svr4_fetch_link_map_offsets
+    (gdbarch, svr4_lp64_fetch_link_map_offsets);
+
+  /* Register DTrace handlers.  */
+  set_gdbarch_dtrace_parse_probe_argument (gdbarch, amd64_dtrace_parse_probe_argument);
+  set_gdbarch_dtrace_probe_is_enabled (gdbarch, amd64_dtrace_probe_is_enabled);
+  set_gdbarch_dtrace_enable_probe (gdbarch, amd64_dtrace_enable_probe);
+  set_gdbarch_dtrace_disable_probe (gdbarch, amd64_dtrace_disable_probe);
+}
+
+static void
+amd64_x32_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
+{
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+  struct tdesc_arch_data *tdesc_data = info.tdesc_data;
+  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_x32_init_abi (info, gdbarch,
+                     amd64_linux_read_description (X86_XSTATE_SSE_MASK,
+                                                   true));
+
+  /* Reserve a number for orig_rax.  */
+  set_gdbarch_num_regs (gdbarch, AMD64_LINUX_NUM_REGS);
+
+  const target_desc *tdesc = tdep->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_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 = 16;
+  /* 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 = 4;
+  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;
+  /* ADM64 doesn't need this size because it doesn't have sys_readdir. */
+  amd64_x32_linux_record_tdep.size_old_dirent = 268;
+  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 = 28;
+  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 = 20;
+  amd64_x32_linux_record_tdep.size_sigset_t = 8;
+  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 = 12;
+  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_termios = 36;
+  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 = 4;
+  amd64_x32_linux_record_tdep.size_iovec = 8;
+  amd64_x32_linux_record_tdep.size_time_t = 8;
+
   /* 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_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;
 
-  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_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;
 
-  tdep->i386_syscall_record = amd64_linux_syscall_record;
+  /* GNU/Linux uses SVR4-style shared libraries.  */
+  set_solib_svr4_fetch_link_map_offsets
+    (gdbarch, svr4_ilp32_fetch_link_map_offsets);
 }
-\f
-
-/* Provide a prototype to silence -Wmissing-prototypes.  */
-extern void _initialize_amd64_linux_tdep (void);
 
 void
 _initialize_amd64_linux_tdep (void)
 {
   gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64,
                          GDB_OSABI_LINUX, amd64_linux_init_abi);
+  gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x64_32,
+                         GDB_OSABI_LINUX, amd64_x32_linux_init_abi);
 }
This page took 0.072418 seconds and 4 git commands to generate.