From: Pedro Alves <palves@redhat.com>
Date: Mon, 25 Feb 2013 17:32:06 +0000 (+0000)
Subject: Tweak warning output on Linux kernels with broken i386 NX support.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=025e6dce58745ef9494cb301a952132e7a7ce453;p=binutils-gdb.git

Tweak warning output on Linux kernels with broken i386 NX support.

The "you have broken" bit of this text reads to me as if I had broken
it myself somehow.  This patch eliminates that ambiguity.

2013-02-25  Pedro Alves  <palves@redhat.com>

	* common/linux-ptrace.c (linux_ptrace_test_ret_to_nx): Change
	warning text.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6158d7286dc..a308ba81ead 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-25  Pedro Alves  <palves@redhat.com>
+
+	* common/linux-ptrace.c (linux_ptrace_test_ret_to_nx): Change
+	warning text.
+
 2013-02-24  Maciej W. Rozycki  <macro@codesourcery.com>
 
 	* mips-tdep.c (mips32_scan_prologue): Reset frame_offset to zero
diff --git a/gdb/common/linux-ptrace.c b/gdb/common/linux-ptrace.c
index 886be809d1d..e1001c67290 100644
--- a/gdb/common/linux-ptrace.c
+++ b/gdb/common/linux-ptrace.c
@@ -224,8 +224,9 @@ linux_ptrace_test_ret_to_nx (void)
 	       "address %p nor is the return instruction %p!"),
 	     pc, return_address, &linux_ptrace_test_ret_to_nx_instr);
   else
-    warning (_("Cannot call inferior functions, you have broken "
-	       "Linux kernel i386 NX (non-executable pages) support!"));
+    warning (_("Cannot call inferior functions on this system - "
+	       "Linux kernel with broken i386 NX (non-executable pages) "
+	       "support detected!"));
 #endif /* defined __i386__ || defined __x86_64__ */
 }