From 635035ca64e9c6e6ad8252545446bbf9bc2a9c55 Mon Sep 17 00:00:00 2001 From: David Smith Date: Tue, 1 Sep 2009 15:20:39 -0500 Subject: PR10552: Removed references to the merge ('-M') option. * hash.cxx (find_script_hash): Removed unused merge option. * main.cxx (checkOptions): Removed merge option checks. (main): Removed merge option. * session.h: Ditto. * initscript/README.initscript: Removed reference to '-M' option. * initscript/systemtap.in (stap_getopt): Ditto. * testsuite/parseko/cmdline01.stp: Removed merge option test. * testsuite/parseko/cmdline05.stp: Ditto. --- hash.cxx | 1 - 1 file changed, 1 deletion(-) (limited to 'hash.cxx') diff --git a/hash.cxx b/hash.cxx index 105e1115..bcf0ebcc 100644 --- a/hash.cxx +++ b/hash.cxx @@ -168,7 +168,6 @@ find_script_hash (systemtap_session& s, const string& script, const hash &base) // Hash user-specified arguments (that change the generated module). h.add(s.bulk_mode); // '-b' - h.add(s.merge); // '-M' h.add(s.timing); // '-t' h.add(s.prologue_searching); // '-P' h.add(s.ignore_vmlinux); // --ignore-vmlinux -- cgit