--branchpred= doesn't do anything (I'm not sure what it ever did do). Rm'd.

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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 6c81e835660d52386b3baf964bac865493bbcc75..17a5d01e06b26b1cfaa73cf03741d3e44e1904ae 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -1300,7 +1300,6 @@ static void usage ( Bool debug_help )
 "    --single-step=no|yes      translate each instr separately? [no]\n"
 "    --optimise=no|yes         improve intermediate code? [yes]\n"
 "    --profile=no|yes          profile? (tool must be built for it) [no]\n"
-"    --branchpred=yes|no       generate branch prediction hints [no]\n"
 "    --trace-flags=<XXXXXXXX>   show generated code? (X = 0|1) [00000000]\n"
 "    --profile-flags=<XXXXXXXX> ditto, but for profiling (X = 0|1) [00000000]\n"
 "    --trace-notbelow=<number>    only show BBs above <number> [0]\n"
@@ -1475,7 +1474,6 @@ static void process_cmd_line_options( UInt* client_auxv, const char* toolname )
       }
 
       else VG_BOOL_CLO(arg, "--xml",              VG_(clo_xml))
-      else VG_BOOL_CLO(arg, "--branchpred",       VG_(clo_branchpred))
       else VG_BOOL_CLO(arg, "--db-attach",        VG_(clo_db_attach))
       else VG_BOOL_CLO(arg, "--demangle",         VG_(clo_demangle))
       else VG_BOOL_CLO(arg, "--error-limit",      VG_(clo_error_limit))

diff --git a/coregrind/m_options.c b/coregrind/m_options.c
index c0980fc8865dc9a68938accaa2ea386fe1b7198a..ac917b1b0ae8475972373a2216449e4aec3a2b8e 100644 (file)
--- a/coregrind/m_options.c
+++ b/coregrind/m_options.c
@@ -72,7 +72,6 @@ Bool   VG_(clo_run_libc_freeres) = True;
 Bool   VG_(clo_track_fds)      = False;
 Bool   VG_(clo_show_below_main)= False;
 Bool   VG_(clo_pointercheck)   = True;
-Bool   VG_(clo_branchpred)     = False;
 Bool   VG_(clo_model_pthreads) = False;
 Bool   VG_(clo_show_emwarns)   = False;
 Int    VG_(clo_max_stackframe) = 2000000;

diff --git a/coregrind/pub_core_options.h b/coregrind/pub_core_options.h
index 4bbf84467ac4538bc4f6862822f66cd8c3c20a8c..58d60d509cc96f2012d54ebab529c972147ae75e 100644 (file)
--- a/coregrind/pub_core_options.h
+++ b/coregrind/pub_core_options.h
@@ -135,8 +135,6 @@ extern Bool  VG_(clo_track_fds);
    is ignored.  Ie if a tool says no, I don't want this to run, that
    cannot be overridden from the command line. */
 extern Bool  VG_(clo_run_libc_freeres);
-/* Generate branch-prediction hints? */
-extern Bool VG_(clo_branchpred);
 /* Continue stack traces below main()?  Default: NO */
 extern Bool VG_(clo_show_below_main);
 /* Test each client pointer dereference to check it's within the

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index 316d9fa6d424af565c1a94488b279dd5e650c8cd..04167cd2b47b9dc674f5f549779f47c622008c3a 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -47,7 +47,6 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
     --single-step=no|yes      translate each instr separately? [no]
     --optimise=no|yes         improve intermediate code? [yes]
     --profile=no|yes          profile? (tool must be built for it) [no]
-    --branchpred=yes|no       generate branch prediction hints [no]
     --trace-flags=<XXXXXXXX>   show generated code? (X = 0|1) [00000000]
     --profile-flags=<XXXXXXXX> ditto, but for profiling (X = 0|1) [00000000]
     --trace-notbelow=<number>    only show BBs above <number> [0]