aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2013-02-25 17:32:06 +0000
committerPedro Alves <palves@redhat.com>2013-02-25 17:32:06 +0000
commit025e6dce58745ef9494cb301a952132e7a7ce453 (patch)
treec91df46c00bae3bed398c30f9868c3fa6c0517ac
parent70a8bc5bb9fa408e4b4b150fca9f8a39867eb607 (diff)
downloadgdb-025e6dce58745ef9494cb301a952132e7a7ce453.zip
gdb-025e6dce58745ef9494cb301a952132e7a7ce453.tar.gz
gdb-025e6dce58745ef9494cb301a952132e7a7ce453.tar.bz2
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.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/common/linux-ptrace.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6158d72..a308ba8 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 886be80..e1001c6 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__ */
}