2006-12-21 David Smith <dsmith@redhat.com>

	* hash.cxx (find_hash): Added two more options into the hash that
	change the generated C file - '-M' (merge) and '-t' (benchmark
	timing).

2 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index eea37ec1..99d86eb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-21  David Smith  <dsmith@redhat.com>
+
+	* hash.cxx (find_hash): Added two more options into the hash that
+	change the generated C file - '-M' (merge) and '-t' (benchmark
+	timing).
+
 2006-12-20  David Smith  <dsmith@redhat.com>
 
 	PR 3519.
diff --git a/hash.cxx b/hash.cxx
index 3c552f2d..b1440377 100644
--- a/hash.cxx
+++ b/hash.cxx
@@ -94,7 +94,9 @@ find_hash (systemtap_session& s, const string& script)
   h.add(s.architecture);
 
   // Hash user-specified arguments (that change the generated module).
-  h.add(s.bulk_mode);
+  h.add(s.bulk_mode);			// '-b'
+  h.add(s.merge);			// '-M'
+  h.add(s.timing);			// '-t'
   for (unsigned i = 0; i < s.macros.size(); i++)
     h.add(s.macros[i]);