Don't write to inferior_ptid in go32-nat.c

[deliverable/binutils-gdb.git] / gdb / nat / linux-ptrace.c

diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
index 49a1d011bddbdf3e30c71fd5371223b3a5bf3681..5335d6909228b01ab960a8c57a007d0f909898c5 100644 (file)
--- a/gdb/nat/linux-ptrace.c
+++ b/gdb/nat/linux-ptrace.c
@@ -1,5 +1,5 @@
 /* Linux-specific ptrace manipulation routines.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
+   Copyright (C) 2012-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -16,11 +16,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
+#include "gdbsupport/common-defs.h"
 #include "linux-ptrace.h"
 #include "linux-procfs.h"
 #include "linux-waitpid.h"
-#include "buffer.h"
+#include "gdbsupport/buffer.h"
 #ifdef HAVE_SYS_PROCFS_H
 #include <sys/procfs.h>
 #endif
@@ -89,7 +89,7 @@ kill_child (pid_t child, const char *who)
 
   if (kill (child, SIGKILL) != 0)
     {
-      warning (_("%s: failed to kill child pid %ld %s\n"),
+      warning (_("%s: failed to kill child pid %ld %s"),
               who, (long) child, safe_strerror (errno));
       return;
     }
@@ -161,14 +161,14 @@ linux_ptrace_test_ret_to_nx (void)
                        ".globl linux_ptrace_test_ret_to_nx_instr;"
                        "linux_ptrace_test_ret_to_nx_instr:"
                        "ret"
-                       : : "r" (return_address) : "%esp", "memory");
+                       : : "r" (return_address) : "memory");
 #elif defined __x86_64__
          asm volatile ("pushq %0;"
                        ".globl linux_ptrace_test_ret_to_nx_instr;"
                        "linux_ptrace_test_ret_to_nx_instr:"
                        "ret"
                        : : "r" ((uint64_t) (uintptr_t) return_address)
-                       : "%rsp", "memory");
+                       : "memory");
 #else
 # error "!__i386__ && !__x86_64__"
 #endif