diff options
| author | David Smith <dsmith@redhat.com> | 2009-06-19 10:58:03 -0500 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2009-06-19 10:58:03 -0500 |
| commit | 76d9a838820b78ab93f9faeb1dcf20f2ec509fc3 (patch) | |
| tree | 93bdad0ee02177e9af895772d3ad6ebccc156138 /translate.cxx | |
| parent | ac4f1eca71edee2feb2cbdad1a044549f30da023 (diff) | |
| parent | 0c98234c86877cfea3df762dc8627b3f05c38e75 (diff) | |
| download | systemtap-steved-76d9a838820b78ab93f9faeb1dcf20f2ec509fc3.tar.gz systemtap-steved-76d9a838820b78ab93f9faeb1dcf20f2ec509fc3.tar.xz systemtap-steved-76d9a838820b78ab93f9faeb1dcf20f2ec509fc3.zip | |
Merge commit 'origin/master' into pr7043
Diffstat (limited to 'translate.cxx')
| -rw-r--r-- | translate.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/translate.cxx b/translate.cxx index 518e5584..cc634555 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) { |