From 1cb28d0992e3f5d3a91daeb3f7ff8991f41b68ed Mon Sep 17 00:00:00 2001
From: hunt <hunt>
Date: Mon, 18 Sep 2006 16:55:01 +0000
Subject: 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.
---
 translate.cxx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'translate.cxx')

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 ;
-- 
cgit