Get rid of old flags that memcheck no longer has.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5039

diff --git a/memcheck/docs/mc-manual.xml b/memcheck/docs/mc-manual.xml
index 0a0a0780de72feb3aafd08aa9db5e887fa22a756..06b9d459f980475ea81f9ac95fa1225643d1a3f7 100644 (file)
--- a/memcheck/docs/mc-manual.xml
+++ b/memcheck/docs/mc-manual.xml
@@ -177,15 +177,6 @@ Memcheck can detect the following problems:</para>
     </para>
   </listitem>
 
-  <listitem id="strlen">
-    <para><computeroutput>--avoid-strlen-errors=no</computeroutput></para>
-    <para><computeroutput>--avoid-strlen-errors=yes</computeroutput> [default]</para>
-    <para>Enable or disable a heuristic for dealing with highly-optimized 
-    versions of strlen.  These versions of strlen can cause spurious errors 
-    to be reported by Memcheck, so it's usually a good idea to leave this
-    enabled.</para>
-  </listitem>
-
 </itemizedlist>
 </sect1>
 

diff --git a/memcheck/mc_include.h b/memcheck/mc_include.h
index 5bf8bece5ed9da0f3f077c6601c3b8ac51d39006..16064ca075f0335bcee796844039bc68a7471e94 100644 (file)
--- a/memcheck/mc_include.h
+++ b/memcheck/mc_include.h
@@ -44,9 +44,8 @@
 /*--- Command line options                                 ---*/
 /*------------------------------------------------------------*/
 
-/* When instrumenting, omit some checks if tell-tale literals for
-   inlined strlen() are visible in the basic block.  default: YES */
-extern Bool MC_(clo_avoid_strlen_errors);
+/* There are no memcheck-specific ones, only mac-specific
+   ones (those shared by both memcheck and addrcheck). */
 
 
 /*------------------------------------------------------------*/

diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index ba8183960222c1e00d23aaa8592e3812a68a0e37..258060f78b4c9ba8724f1d3aa55b0c83e3aa9bb1 100644 (file)
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -2272,33 +2272,22 @@ static Bool mc_expensive_sanity_check ( void )
 /*--- Command line args                                    ---*/
 /*------------------------------------------------------------*/
 
-Bool MC_(clo_avoid_strlen_errors)    = True;
-
 static Bool mc_process_cmd_line_option(Char* arg)
 {
-        VG_BOOL_CLO(arg, "--avoid-strlen-errors", MC_(clo_avoid_strlen_errors))
-   else
-      return MAC_(process_common_cmd_line_option)(arg);
-
-   return True;
+   return MAC_(process_common_cmd_line_option)(arg);
 }
 
 static void mc_print_usage(void)
 {  
    MAC_(print_common_usage)();
-   VG_(printf)(
-"    --avoid-strlen-errors=no|yes     suppress errs from inlined strlen [yes]\n"
-   );
 }
 
 static void mc_print_debug_usage(void)
 {  
    MAC_(print_common_debug_usage)();
-   VG_(printf)(
-"    --cleanup=no|yes          improve after instrumentation? [yes]\n"
-   );
 }
 
+
 /*------------------------------------------------------------*/
 /*--- Client requests                                      ---*/
 /*------------------------------------------------------------*/