Module Name: src Committed By: christos Date: Tue Jul 15 17:35:54 UTC 2014
Modified Files: src/external/gpl3/gdb/dist/gdb: amd64bsd-nat.c armnbsd-nat.c hppanbsd-nat.c i386bsd-nat.c m68kbsd-nat.c mipsnbsd-nat.c ppcnbsd-nat.c shnbsd-nat.c sparc-nat.c vaxbsd-nat.c Log Message: PR/47430: Fix debugging threads again, GETTID == ptid_get_lwp for us, not ptid_get_tid :-) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/dist/gdb/amd64bsd-nat.c \ src/external/gpl3/gdb/dist/gdb/hppanbsd-nat.c \ src/external/gpl3/gdb/dist/gdb/i386bsd-nat.c \ src/external/gpl3/gdb/dist/gdb/sparc-nat.c cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/m68kbsd-nat.c \ src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c \ src/external/gpl3/gdb/dist/gdb/ppcnbsd-nat.c \ src/external/gpl3/gdb/dist/gdb/shnbsd-nat.c cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/gpl3/gdb/dist/gdb/amd64bsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/amd64bsd-nat.c:1.5 src/external/gpl3/gdb/dist/gdb/amd64bsd-nat.c:1.6 --- src/external/gpl3/gdb/dist/gdb/amd64bsd-nat.c:1.5 Sun Jun 22 19:52:57 2014 +++ src/external/gpl3/gdb/dist/gdb/amd64bsd-nat.c Tue Jul 15 13:35:54 2014 @@ -47,7 +47,7 @@ amd64bsd_fetch_inferior_registers (struc struct reg regs; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); amd64_supply_native_gregset (regcache, ®s, -1); @@ -60,7 +60,7 @@ amd64bsd_fetch_inferior_registers (struc struct fpreg fpregs; if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get floating point status")); amd64_supply_fxsave (regcache, -1, &fpregs); @@ -81,13 +81,13 @@ amd64bsd_store_inferior_registers (struc struct reg regs; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); amd64_collect_native_gregset (regcache, ®s, regnum); if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't write registers")); if (regnum != -1) @@ -99,13 +99,13 @@ amd64bsd_store_inferior_registers (struc struct fpreg fpregs; if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get floating point status")); amd64_collect_fxsave (regcache, regnum, &fpregs); if (ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't write floating point status")); } } Index: src/external/gpl3/gdb/dist/gdb/hppanbsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/hppanbsd-nat.c:1.5 src/external/gpl3/gdb/dist/gdb/hppanbsd-nat.c:1.6 --- src/external/gpl3/gdb/dist/gdb/hppanbsd-nat.c:1.5 Sun Jun 22 19:52:58 2014 +++ src/external/gpl3/gdb/dist/gdb/hppanbsd-nat.c Tue Jul 15 13:35:54 2014 @@ -178,7 +178,7 @@ hppanbsd_fetch_registers (struct target_ struct reg regs; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); hppanbsd_supply_gregset (regcache, ®s); @@ -189,7 +189,7 @@ hppanbsd_fetch_registers (struct target_ struct fpreg fpregs; if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get floating point status")); hppanbsd_supply_fpregset (regcache, &fpregs); @@ -208,13 +208,13 @@ hppanbsd_store_registers (struct target_ struct reg regs; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); hppanbsd_collect_gregset (regcache, ®s, regnum); if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't write registers")); } @@ -223,13 +223,13 @@ hppanbsd_store_registers (struct target_ struct fpreg fpregs; if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get floating point status")); hppanbsd_collect_fpregset (regcache, &fpregs, regnum); if (ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't write floating point status")); } } Index: src/external/gpl3/gdb/dist/gdb/i386bsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/i386bsd-nat.c:1.5 src/external/gpl3/gdb/dist/gdb/i386bsd-nat.c:1.6 --- src/external/gpl3/gdb/dist/gdb/i386bsd-nat.c:1.5 Sun Jun 22 19:52:58 2014 +++ src/external/gpl3/gdb/dist/gdb/i386bsd-nat.c Tue Jul 15 13:35:54 2014 @@ -137,7 +137,7 @@ i386bsd_fetch_inferior_registers (struct struct reg regs; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); i386bsd_supply_gregset (regcache, ®s); @@ -153,7 +153,7 @@ i386bsd_fetch_inferior_registers (struct if (have_ptrace_xmmregs != 0 && ptrace(PT_GETXMMREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) xmmregs, ptid_get_tid (inferior_ptid)) == 0) + (PTRACE_TYPE_ARG3) xmmregs, ptid_get_lwp (inferior_ptid)) == 0) { have_ptrace_xmmregs = 1; i387_supply_fxsave (regcache, -1, xmmregs); @@ -161,14 +161,14 @@ i386bsd_fetch_inferior_registers (struct else { if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get floating point status")); i387_supply_fsave (regcache, -1, &fpregs); } #else if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get floating point status")); i387_supply_fsave (regcache, -1, &fpregs); @@ -188,13 +188,13 @@ i386bsd_store_inferior_registers (struct struct reg regs; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); i386bsd_collect_gregset (regcache, ®s, regnum); if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't write registers")); if (regnum != -1) @@ -209,14 +209,14 @@ i386bsd_store_inferior_registers (struct if (have_ptrace_xmmregs != 0 && ptrace(PT_GETXMMREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) xmmregs, ptid_get_tid (inferior_ptid)) == 0) + (PTRACE_TYPE_ARG3) xmmregs, ptid_get_lwp (inferior_ptid)) == 0) { have_ptrace_xmmregs = 1; i387_collect_fxsave (regcache, regnum, xmmregs); if (ptrace (PT_SETXMMREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) xmmregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) xmmregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't write XMM registers")); } else @@ -224,13 +224,13 @@ i386bsd_store_inferior_registers (struct have_ptrace_xmmregs = 0; #endif if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get floating point status")); i387_collect_fsave (regcache, regnum, &fpregs); if (ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't write floating point status")); #ifdef HAVE_PT_GETXMMREGS } @@ -281,7 +281,7 @@ i386bsd_dr_set (int regnum, unsigned int struct dbreg dbregs; if (ptrace (PT_GETDBREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &dbregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &dbregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get debug registers")); /* For some mysterious reason, some of the reserved bits in the @@ -292,7 +292,7 @@ i386bsd_dr_set (int regnum, unsigned int DBREG_DRX ((&dbregs), regnum) = value; if (ptrace (PT_SETDBREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &dbregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &dbregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't write debug registers")); } Index: src/external/gpl3/gdb/dist/gdb/sparc-nat.c diff -u src/external/gpl3/gdb/dist/gdb/sparc-nat.c:1.5 src/external/gpl3/gdb/dist/gdb/sparc-nat.c:1.6 --- src/external/gpl3/gdb/dist/gdb/sparc-nat.c:1.5 Sun Jun 22 19:52:58 2014 +++ src/external/gpl3/gdb/dist/gdb/sparc-nat.c Tue Jul 15 13:35:54 2014 @@ -171,7 +171,7 @@ sparc_fetch_inferior_registers (struct t { gregset_t regs; - if (ptrace (PTRACE_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + if (ptrace (PTRACE_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); sparc_supply_gregset (sparc_gregset, regcache, -1, ®s); @@ -183,7 +183,7 @@ sparc_fetch_inferior_registers (struct t { fpregset_t fpregs; - if (ptrace (PTRACE_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + if (ptrace (PTRACE_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get floating point status")); sparc_supply_fpregset (sparc_fpregset, regcache, -1, &fpregs); @@ -207,12 +207,12 @@ sparc_store_inferior_registers (struct t { gregset_t regs; - if (ptrace (PTRACE_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + if (ptrace (PTRACE_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); sparc_collect_gregset (sparc_gregset, regcache, regnum, ®s); - if (ptrace (PTRACE_SETREGS, pid, (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + if (ptrace (PTRACE_SETREGS, pid, (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't write registers")); /* Deal with the stack regs. */ @@ -233,7 +233,7 @@ sparc_store_inferior_registers (struct t { fpregset_t fpregs, saved_fpregs; - if (ptrace (PTRACE_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + if (ptrace (PTRACE_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get floating-point registers")); memcpy (&saved_fpregs, &fpregs, sizeof (fpregs)); @@ -246,7 +246,7 @@ sparc_store_inferior_registers (struct t if (memcmp (&saved_fpregs, &fpregs, sizeof (fpregs)) != 0) { if (ptrace (PTRACE_SETFPREGS, pid, - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't write floating-point registers")); } Index: src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c:1.10 src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c:1.11 --- src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c:1.10 Sun Jun 22 19:52:57 2014 +++ src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c Tue Jul 15 13:35:54 2014 @@ -202,7 +202,7 @@ fetch_register (struct regcache *regcach int ret; ret = ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &inferior_registers, ptid_get_tid (inferior_ptid)); + (PTRACE_TYPE_ARG3) &inferior_registers, ptid_get_lwp(inferior_ptid)); if (ret < 0) { @@ -255,7 +255,7 @@ fetch_regs (struct regcache *regcache) int regno; ret = ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &inferior_registers, ptid_get_tid (inferior_ptid)); + (PTRACE_TYPE_ARG3) &inferior_registers, ptid_get_lwp(inferior_ptid)); if (ret < 0) { @@ -273,7 +273,7 @@ fetch_fp_register (struct regcache *regc int ret; ret = ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &inferior_fp_registers, ptid_get_tid (inferior_ptid)); + (PTRACE_TYPE_ARG3) &inferior_fp_registers, ptid_get_lwp(inferior_ptid)); if (ret < 0) { @@ -303,7 +303,7 @@ fetch_fp_regs (struct regcache *regcache int regno; ret = ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &inferior_fp_registers, ptid_get_tid (inferior_ptid)); + (PTRACE_TYPE_ARG3) &inferior_fp_registers, ptid_get_lwp(inferior_ptid)); if (ret < 0) { @@ -341,7 +341,7 @@ store_register (const struct regcache *r int ret; ret = ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &inferior_registers, ptid_get_tid (inferior_ptid)); + (PTRACE_TYPE_ARG3) &inferior_registers, ptid_get_lwp(inferior_ptid)); if (ret < 0) { @@ -404,7 +404,7 @@ store_register (const struct regcache *r } ret = ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &inferior_registers, ptid_get_tid (inferior_ptid)); + (PTRACE_TYPE_ARG3) &inferior_registers, ptid_get_lwp(inferior_ptid)); if (ret < 0) warning (_("unable to write register %d to inferior"), regno); @@ -452,7 +452,7 @@ store_regs (const struct regcache *regca } ret = ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &inferior_registers, ptid_get_tid (inferior_ptid)); + (PTRACE_TYPE_ARG3) &inferior_registers, ptid_get_lwp(inferior_ptid)); if (ret < 0) warning (_("unable to store general registers")); @@ -465,7 +465,7 @@ store_fp_register (const struct regcache int ret; ret = ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &inferior_fp_registers, ptid_get_tid (inferior_ptid)); + (PTRACE_TYPE_ARG3) &inferior_fp_registers, ptid_get_lwp(inferior_ptid)); if (ret < 0) { @@ -488,7 +488,7 @@ store_fp_register (const struct regcache } ret = ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &inferior_fp_registers, ptid_get_tid (inferior_ptid)); + (PTRACE_TYPE_ARG3) &inferior_fp_registers, ptid_get_lwp(inferior_ptid)); if (ret < 0) warning (_("unable to write register %d to inferior"), regno); @@ -511,7 +511,7 @@ store_fp_regs (const struct regcache *re (char *) &inferior_fp_registers.fpr_vfp.vfp_fpscr); ret = ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &inferior_fp_registers, ptid_get_tid (inferior_ptid)); + (PTRACE_TYPE_ARG3) &inferior_fp_registers, ptid_get_lwp(inferior_ptid)); if (ret < 0) warning (_("unable to store floating-point registers")); Index: src/external/gpl3/gdb/dist/gdb/m68kbsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/m68kbsd-nat.c:1.7 src/external/gpl3/gdb/dist/gdb/m68kbsd-nat.c:1.8 --- src/external/gpl3/gdb/dist/gdb/m68kbsd-nat.c:1.7 Sun Jun 22 19:52:58 2014 +++ src/external/gpl3/gdb/dist/gdb/m68kbsd-nat.c Tue Jul 15 13:35:54 2014 @@ -158,7 +158,7 @@ m68kbsd_fetch_inferior_registers (struct struct reg regs; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); m68kbsd_supply_gregset (regcache, ®s); @@ -169,7 +169,7 @@ m68kbsd_fetch_inferior_registers (struct struct fpreg fpregs; if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get floating point status")); m68kbsd_supply_fpregset (regcache, &fpregs); @@ -188,13 +188,13 @@ m68kbsd_store_inferior_registers (struct struct reg regs; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); m68kbsd_collect_gregset (regcache, ®s, regnum); if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't write registers")); } @@ -203,13 +203,13 @@ m68kbsd_store_inferior_registers (struct struct fpreg fpregs; if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get floating point status")); m68kbsd_collect_fpregset (regcache, &fpregs, regnum); if (ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't write floating point status")); } } Index: src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c:1.7 src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c:1.8 --- src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c:1.7 Sun Jun 22 19:52:58 2014 +++ src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c Tue Jul 15 13:35:54 2014 @@ -61,7 +61,7 @@ mipsnbsd_fetch_inferior_registers (struc struct reg regs; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); mipsnbsd_supply_reg (regcache, (char *) ®s, regno); @@ -75,7 +75,7 @@ mipsnbsd_fetch_inferior_registers (struc struct fpreg fpregs; if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get floating point status")); mipsnbsd_supply_fpreg (regcache, (char *) &fpregs, regno); @@ -92,13 +92,13 @@ mipsnbsd_store_inferior_registers (struc struct reg regs; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); mipsnbsd_fill_reg (regcache, (char *) ®s, regno); if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't write registers")); if (regno != -1) @@ -111,13 +111,13 @@ mipsnbsd_store_inferior_registers (struc struct fpreg fpregs; if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get floating point status")); mipsnbsd_fill_fpreg (regcache, (char *) &fpregs, regno); if (ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't write floating point status")); } } Index: src/external/gpl3/gdb/dist/gdb/ppcnbsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/ppcnbsd-nat.c:1.7 src/external/gpl3/gdb/dist/gdb/ppcnbsd-nat.c:1.8 --- src/external/gpl3/gdb/dist/gdb/ppcnbsd-nat.c:1.7 Sun Jun 22 19:52:58 2014 +++ src/external/gpl3/gdb/dist/gdb/ppcnbsd-nat.c Tue Jul 15 13:35:54 2014 @@ -100,7 +100,7 @@ ppcnbsd_fetch_inferior_registers (struct struct reg regs; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); ppc_supply_gregset (&ppcnbsd_gregset, regcache, @@ -112,7 +112,7 @@ ppcnbsd_fetch_inferior_registers (struct struct fpreg fpregs; if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get FP registers")); ppc_supply_fpregset (&ppcnbsd_fpregset, regcache, @@ -131,14 +131,14 @@ ppcnbsd_store_inferior_registers (struct struct reg regs; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); ppc_collect_gregset (&ppcnbsd_gregset, regcache, regnum, ®s, sizeof regs); if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) ®s, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't write registers")); } @@ -147,14 +147,14 @@ ppcnbsd_store_inferior_registers (struct struct fpreg fpregs; if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get FP registers")); ppc_collect_fpregset (&ppcnbsd_fpregset, regcache, regnum, &fpregs, sizeof fpregs); if (ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't set FP registers")); } } @@ -163,7 +163,7 @@ void supply_gregset (struct regcache *regcache, const gregset_t *gregs) { if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) gregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) gregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't write registers")); } @@ -171,7 +171,7 @@ void supply_fpregset (struct regcache *regcache, const fpregset_t *fpregs) { if (ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't set FP registers")); } @@ -179,7 +179,7 @@ void fill_gregset (const struct regcache *regcache, gregset_t *gregs, int regnum) { if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) gregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) gregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); } @@ -187,7 +187,7 @@ void fill_fpregset (const struct regcache *regcache, fpregset_t *fpregs, int regnum) { if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get FP registers")); } Index: src/external/gpl3/gdb/dist/gdb/shnbsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/shnbsd-nat.c:1.7 src/external/gpl3/gdb/dist/gdb/shnbsd-nat.c:1.8 --- src/external/gpl3/gdb/dist/gdb/shnbsd-nat.c:1.7 Sun Jun 22 19:52:58 2014 +++ src/external/gpl3/gdb/dist/gdb/shnbsd-nat.c Tue Jul 15 13:35:54 2014 @@ -62,7 +62,7 @@ shnbsd_fetch_inferior_registers (struct struct reg inferior_registers; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &inferior_registers, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &inferior_registers, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); sh_corefile_supply_regset (&sh_corefile_gregset, regcache, regno, @@ -83,7 +83,7 @@ shnbsd_store_inferior_registers (struct struct reg inferior_registers; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &inferior_registers, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &inferior_registers, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); sh_corefile_collect_regset (&sh_corefile_gregset, regcache, regno, @@ -91,7 +91,7 @@ shnbsd_store_inferior_registers (struct SHNBSD_SIZEOF_GREGS); if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &inferior_registers, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) &inferior_registers, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't set registers")); if (regno != -1) @@ -103,7 +103,7 @@ void supply_gregset (struct regcache *regcache, const gregset_t *gregs) { if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) gregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) gregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't set registers")); } @@ -111,7 +111,7 @@ void fill_gregset (const struct regcache *regcache, gregset_t *gregs, int regnum) { if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) gregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) gregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); } Index: src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c:1.6 src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c:1.7 --- src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c:1.6 Sun Jun 22 19:52:58 2014 +++ src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c Tue Jul 15 13:35:54 2014 @@ -67,7 +67,7 @@ void supply_gregset (struct regcache *regcache, const gregset_t *gregs) { if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) gregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) gregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't write registers")); } @@ -75,7 +75,7 @@ void fill_gregset (const struct regcache *regcache, gregset_t *gregs, int regnum) { if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) gregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) gregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_("Couldn't get registers")); }