summaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorsergiodj <sergiodj>2012-05-08 01:35:32 +0000
committersergiodj <sergiodj>2012-05-08 01:35:32 +0000
commitdc93b99d1966948172d9f3a2b80b5e71814d6533 (patch)
tree7d3251eb9f341b27b2a9d9601f376d6b7ef73798 /gdb
parent83abc3972e39abde65375503a8b8c5cad1763caa (diff)
downloadgdb-dc93b99d1966948172d9f3a2b80b5e71814d6533.tar.gz
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.
Diffstat (limited to 'gdb')
-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 979909a1d87..51918a55266 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 ee94f9c22bb..77f3b13478a 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 273ae0753ca..506e6c3e0cc 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. */