diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-05-05 14:01:51 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-05-05 14:01:51 -0400 |
| commit | f80f9e60d170329f4c3210d28914daa732ce0a48 (patch) | |
| tree | bf7c5142c22a35aa8b56adfcd4812873a0b2efca /tapsets.cxx | |
| parent | b03d329d5ad9d22d684b61859971a7b12b5e5104 (diff) | |
| parent | 7c4e9d57761b10058d36756df3b39039e292812d (diff) | |
| download | systemtap-steved-f80f9e60d170329f4c3210d28914daa732ce0a48.tar.gz systemtap-steved-f80f9e60d170329f4c3210d28914daa732ce0a48.tar.xz systemtap-steved-f80f9e60d170329f4c3210d28914daa732ce0a48.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts:
modsign.cxx
runtime/staprun/modverify.c
runtime/staprun/staprun_funcs.c
stap-authorize-server-cert
stap-authorize-signing-cert
stap-serverd
systemtap.spec
Diffstat (limited to 'tapsets.cxx')
| -rw-r--r-- | tapsets.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index eac69322..9051d744 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -3072,7 +3072,10 @@ dwflpp::iterate_over_labels (Dwarf_Die *begin_die, case DW_TAG_label: break; case DW_TAG_subprogram: - function_name = name; + if (!dwarf_hasattr(&die, DW_AT_declaration)) + function_name = name; + else + continue; default: if (dwarf_haschildren (&die)) iterate_over_labels (&die, q, callback); |