summaryrefslogtreecommitdiffstats
path: root/translate.cxx
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2009-06-22 11:37:08 -0400
committerDave Brolley <brolley@redhat.com>2009-06-22 11:37:08 -0400
commitd6454850dd3c9d74b700924b56378c4c9ab9fa57 (patch)
tree6665a24339ca689b1156ea7e93d4f93811c3f794 /translate.cxx
parentd729143af5242b17645d3f405141918940680894 (diff)
parent4116c576d5654287b0af598aee4a14eb2af73224 (diff)
downloadsystemtap-steved-d6454850dd3c9d74b700924b56378c4c9ab9fa57.tar.gz
systemtap-steved-d6454850dd3c9d74b700924b56378c4c9ab9fa57.tar.xz
systemtap-steved-d6454850dd3c9d74b700924b56378c4c9ab9fa57.zip
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'translate.cxx')
-rw-r--r--translate.cxx13
1 files changed, 7 insertions, 6 deletions
diff --git a/translate.cxx b/translate.cxx
index d9d99507..5336dc66 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -5212,18 +5212,19 @@ translate_pass (systemtap_session& s)
s.op->newline(-1) << "}";
s.op->assert_0_indent();
+ emit_symbol_data (s);
+
+ s.op->newline() << "MODULE_DESCRIPTION(\"systemtap-generated probe\");";
+ s.op->newline() << "MODULE_LICENSE(\"GPL\");";
+ s.op->assert_0_indent();
+
+ // PR10298: attempt to avoid collisions with symbols
for (unsigned i=0; i<s.globals.size(); i++)
{
s.op->newline();
s.up->emit_global_param (s.globals[i]);
}
s.op->assert_0_indent();
-
- emit_symbol_data (s);
-
- s.op->newline() << "MODULE_DESCRIPTION(\"systemtap-generated probe\");";
- s.op->newline() << "MODULE_LICENSE(\"GPL\");";
- s.op->assert_0_indent();
}
catch (const semantic_error& e)
{