diff options
-rw-r--r-- | gdb/ChangeLog | 5 | ||||
-rw-r--r-- | gdb/btrace.c | 5 | ||||
-rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
-rw-r--r-- | gdb/testsuite/lib/gdb.exp | 3 |
4 files changed, 19 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fbc56ac..9c8b9e7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-11-26 Markus Metzger <markus.t.metzger@intel.com> + + PR 19297 + * btrace.c (btrace_enable): Check whether HAVE_LIBIPT is defined. + 2015-11-24 Pedro Alves <palves@redhat.com> * NEWS: Mention that a few "info" commands now list the diff --git a/gdb/btrace.c b/gdb/btrace.c index 2bf7177..35431cb 100644 --- a/gdb/btrace.c +++ b/gdb/btrace.c @@ -1035,6 +1035,11 @@ btrace_enable (struct thread_info *tp, const struct btrace_config *conf) if (tp->btrace.target != NULL) return; +#if !defined (HAVE_LIBIPT) + if (conf->format == BTRACE_FORMAT_PT) + error (_("GDB does not support Intel(R) Processor Trace.")); +#endif /* !defined (HAVE_LIBIPT) */ + if (!target_supports_btrace (conf->format)) error (_("Target does not support branch tracing.")); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index fd7c1f4..9f6d7e6 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2015-11-26 Markus Metzger <markus.t.metzger@intel.com> + + PR 19297 + * lib/gdb.exp (skip_btrace_pt_tests): Check for a "GDB does not + support" error. + 2015-11-24 Pedro Alves <palves@redhat.com> PR 17539 diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index a420181..90e8644 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -2826,6 +2826,9 @@ gdb_caching_proc skip_btrace_pt_tests { -re "Could not enable branch tracing.*\r\n$gdb_prompt $" { set skip_btrace_tests 1 } + -re "GDB does not support.*\r\n$gdb_prompt $" { + set skip_btrace_tests 1 + } -re "^record btrace pt\r\n$gdb_prompt $" { set skip_btrace_tests 0 } |