summaryrefslogtreecommitdiffstats
path: root/translate.cxx
diff options
context:
space:
mode:
authorhunt <hunt>2006-09-18 16:55:01 +0000
committerhunt <hunt>2006-09-18 16:55:01 +0000
commit1cb28d0992e3f5d3a91daeb3f7ff8991f41b68ed (patch)
treef24e9f9ba28f4fbdce038310fcb17376e2c39595 /translate.cxx
parent5b2bb5eb687441555f28f336f22d283e41d079fa (diff)
downloadsystemtap-steved-1cb28d0992e3f5d3a91daeb3f7ff8991f41b68ed.tar.gz
systemtap-steved-1cb28d0992e3f5d3a91daeb3f7ff8991f41b68ed.tar.xz
systemtap-steved-1cb28d0992e3f5d3a91daeb3f7ff8991f41b68ed.zip
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.
Diffstat (limited to 'translate.cxx')
-rw-r--r--translate.cxx7
1 files changed, 6 insertions, 1 deletions
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 ;