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.

7 files changed, 3 insertions, 33 deletions

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
diff --git a/initscript/README.initscript b/initscript/README.initscript
index ee11f3be..c7bb4888 100644
--- a/initscript/README.initscript
+++ b/initscript/README.initscript
@@ -223,7 +223,7 @@ Configuration file allows us
  - Below options are ignored when compiling script.
    -p,-m,-r,-c,-x,-e,-s,-o,-h,-V,-k
  - Below options are ignored when starting script.
-   -h,-V,-M,-v,-t,-p,-I,-e,-R,-r,-m,-k,-g,-P,-D,-b,-u,-q,-w,-l,-d,-L,-F, and
+   -h,-V,-v,-t,-p,-I,-e,-R,-r,-m,-k,-g,-P,-D,-b,-u,-q,-w,-l,-d,-L,-F, and
    other long options.
 
 4.2.2 <script-name>_REQ
diff --git a/initscript/systemtap.in b/initscript/systemtap.in
index 7552df44..21bcd65b 100644
--- a/initscript/systemtap.in
+++ b/initscript/systemtap.in
@@ -287,7 +287,7 @@ stap_getopt () { # opts
   # TODO: support quoted options
   getopt -s bash -u \
          -l 'kelf,kmap::,ignore-vmlinux,ignore-dwarf,vp:' \
-         -o 'hVMvtp:I:e:o:R:r:m:kgPc:x:D:bs:uqwl:d:L:FS:' -- $@
+         -o 'hVvtp:I:e:o:R:r:m:kgPc:x:D:bs:uqwl:d:L:FS:' -- $@
   ret=$?
   [ $ret -ne 0 ] && slog "Failed to parse parameters. ($@)"
   return $ret
diff --git a/main.cxx b/main.cxx
index 9887f2b7..b97d0092 100644
--- a/main.cxx
+++ b/main.cxx
@@ -368,18 +368,6 @@ checkOptions (systemtap_session &s)
 {
   bool optionsConflict = false;
 
-  if(!s.bulk_mode && !s.merge)
-    {
-      cerr << "-M option is valid only for bulk (relayfs) mode." <<endl;
-      optionsConflict = true;
-    }
-
-  if(!s.output_file.empty() && s.bulk_mode && !s.merge)
-    {
-      cerr << "You can't specify -M, -b and -o options together." <<endl;
-      optionsConflict = true;
-    }
-
   if((s.cmd != "") && (s.target_pid))
     {
       cerr << "You can't specify -c and -x options together." <<endl;
@@ -504,7 +492,6 @@ main (int argc, char * const argv [])
   s.keep_tmpdir = false;
   s.cmd = "";
   s.target_pid = 0;
-  s.merge=true;
   s.perfmon=0;
   s.symtab = false;
   s.use_cache = true;
@@ -610,7 +597,7 @@ main (int argc, char * const argv [])
         { "unprivileged", 0, &long_opt, LONG_OPT_UNPRIVILEGED },
         { NULL, 0, NULL, 0 }
       };
-      int grc = getopt_long (argc, argv, "hVMvtp:I:e:o:R:r:a:m:kgPc:x:D:bs:uqwl:d:L:FS:B:",
+      int grc = getopt_long (argc, argv, "hVvtp:I:e:o:R:r:a:m:kgPc:x:D:bs:uqwl:d:L:FS:B:",
                              long_options, NULL);
       if (grc < 0)
         break;
@@ -620,10 +607,6 @@ main (int argc, char * const argv [])
           version ();
           exit (0);
 
-        case 'M':
-          s.merge = false;
-          break;
-
         case 'v':
           for (unsigned i=0; i<5; i++)
             s.perpass_verbose[i] ++;
diff --git a/session.h b/session.h
index 24e6ae80..a2176793 100644
--- a/session.h
+++ b/session.h
@@ -107,7 +107,6 @@ struct systemtap_session
   bool listing_mode_vars;
   bool bulk_mode;
   bool unoptimized;
-  bool merge;
   bool suppress_warnings;
   int buffer_size;
   unsigned perfmon;
diff --git a/testsuite/parseko/cmdline01.stp b/testsuite/parseko/cmdline01.stp
deleted file mode 100755
index c793c43e..00000000
--- a/testsuite/parseko/cmdline01.stp
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# -M (merge) option is only valid for bulk mode
-
-stap -p1 -M -e 'probe begin { exit() }' >/dev/null 2>&1  # otherwise, ERROR: message confuses dejagnu
-exit $?
diff --git a/testsuite/parseko/cmdline05.stp b/testsuite/parseko/cmdline05.stp
deleted file mode 100755
index 0f43d7b4..00000000
--- a/testsuite/parseko/cmdline05.stp
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# You can't specify '-M', '-b', and '-o' simultaneously.
-
-stap -p1 -b -M -o stdout -e 'probe begin { exit() }'