aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Durigan Junior <sergiodj@redhat.com>2012-05-08 01:35:35 +0000
committerSergio Durigan Junior <sergiodj@redhat.com>2012-05-08 01:35:35 +0000
commitd7333987804db4beca078f9b0afa61c8062630e0 (patch)
tree8375d820a22ac89367062b02ba1d9860cd4b35da
parentc8599c937738a8b6798abef38e9270e222cc3b56 (diff)
downloadgdb-d7333987804db4beca078f9b0afa61c8062630e0.zip
gdb-d7333987804db4beca078f9b0afa61c8062630e0.tar.gz
gdb-d7333987804db4beca078f9b0afa61c8062630e0.tar.bz2
2012-05-07 Sergio Durigan Junior <sergiodj@redhat.com>
* probe.c (parse_probes): Move conditional to check for debuginfo files from here... * stap-probe.c (stap_get_probes): ... to here.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/probe.c3
-rw-r--r--gdb/stap-probe.c6
3 files changed, 12 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 979909a..51918a5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-07 Sergio Durigan Junior <sergiodj@redhat.com>
+
+ * probe.c (parse_probes): Move conditional to check for
+ debuginfo files from here...
+ * stap-probe.c (stap_get_probes): ... to here.
+
2012-05-07 Mark Kettenis <kettenis@gnu.org>
H.J. Lu <hongjiu.lu@intel.com>
diff --git a/gdb/probe.c b/gdb/probe.c
index ee94f9c..77f3b13 100644
--- a/gdb/probe.c
+++ b/gdb/probe.c
@@ -120,9 +120,6 @@ parse_probes (char **argptr, struct linespec_result *canonical)
&& FILENAME_CMP (lbasename (objfile->name), objfile_name) != 0)
continue;
- if (objfile->separate_debug_objfile_backlink != NULL)
- continue;
-
probes = objfile->sf->sym_probe_fns->sym_get_probes (objfile);
for (ix = 0; VEC_iterate (probe_p, probes, ix, probe); ix++)
diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
index 273ae07..506e6c3 100644
--- a/gdb/stap-probe.c
+++ b/gdb/stap-probe.c
@@ -1411,6 +1411,12 @@ stap_get_probes (VEC (probe_p) **probesp, struct objfile *objfile)
struct sdt_note *iter;
unsigned save_probesp_len = VEC_length (probe_p, *probesp);
+ if (objfile->separate_debug_objfile_backlink != NULL)
+ {
+ /* This is a .debug file, not the objfile itself. */
+ return;
+ }
+
if (!elf_tdata (obfd)->sdt_note_head)
{
/* There isn't any probe here. */