diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | buildrun.cxx | 1 | ||||
| -rw-r--r-- | translate.cxx | 7 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2006-09-18 Martin Hunt <hunt@redhat.com> + + * buildrun.cxx (run_pass): Remove "-m" option to stpd. + * translate.cxx (translate_pass): #define STP_RELAYFS_MERGE + if appropriate. + 2006-09-13 Martin Hunt <hunt@redhat.com> * buildrun.cxx (run_pass): Remove "-r" option to stpd. diff --git a/buildrun.cxx b/buildrun.cxx index 0062abea..1c21d1c5 100644 --- a/buildrun.cxx +++ b/buildrun.cxx @@ -129,7 +129,6 @@ run_pass (systemtap_session& s) string stpd_cmd = string("sudo ") + string(PKGLIBDIR) + "/stpd " + (s.verbose>1 ? "" : "-q ") - + (s.merge ? "" : "-m ") + "-u " + username + " " + (s.output_file.empty() ? "" : "-o " + s.output_file + " "); diff --git a/translate.cxx b/translate.cxx index 88b6ca4d..2dd144db 100644 --- a/translate.cxx +++ b/translate.cxx @@ -3785,7 +3785,12 @@ translate_pass (systemtap_session& s) s.op->newline() << "#define STP_NUM_STRINGS 1"; if (s.bulk_mode) - s.op->newline() << "#define STP_RELAYFS"; + { + s.op->newline() << "#define STP_RELAYFS"; + + if (s.merge) + s.op->newline() << "#define STP_RELAYFS_MERGE"; + } if (s.timing) s.op->newline() << "#define STP_TIMING" << " " << s.timing ; |