12166 resync smatch to 0.6.1-rc1-il-3

@@ -32,11 +32,10 @@
 char *data_dir;
 int option_no_data = 0;
 int option_spammy = 0;
 int option_info = 0;
 int option_full_path = 0;
-int option_param_mapper = 0;
 int option_call_tree = 0;
 int option_no_db = 0;
 int option_enable = 0;
 int option_disable = 0;
 int option_file_output;

@@ -140,11 +139,10 @@
         printf("--project=<name> or -p=<name>: project specific tests\n");
         printf("--succeed: don't exit with an error\n");
         printf("--spammy:  print superfluous crap.\n");
         printf("--info:  print info used to fill smatch_data/.\n");
         printf("--debug:  print lots of debug output.\n");
-        printf("--param-mapper:  enable param_mapper output.\n");
         printf("--no-data:  do not use the /smatch_data/ directory.\n");
         printf("--data=<dir>: overwrite path to default smatch data directory.\n");
         printf("--full-path:  print the full pathname.\n");
         printf("--debug-implied:  print debug output about implications.\n");
         printf("--assume-loops:  assume loops always go through at least once.\n");

@@ -233,11 +231,10 @@
                 OPTION(debug);
                 OPTION(assume_loops);
                 OPTION(no_data);
                 OPTION(two_passes);
                 OPTION(full_path);
-                OPTION(param_mapper);
                 OPTION(call_tree);
                 OPTION(file_output);
                 OPTION(time);
                 OPTION(mem);
                 OPTION(no_db);