Merge r6126:

New option --sym-offsets=yes|no [no], which causes all symbols to be
shown in the form 'name+offset'.  Mostly useful for debugging Valgrind
itself.

Also move command-line-error functions from m_main into m_options.

[Will move them back shortly.]

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

diff --git a/coregrind/m_options.c b/coregrind/m_options.c
index dd3033c2f08d0236416badf9d8dd61d4ea8047b9..ece214155e6b5234b5ccb8697cea3f309a7fb94d 100644 (file)
--- a/coregrind/m_options.c
+++ b/coregrind/m_options.c
@@ -70,6 +70,7 @@ Bool   VG_(clo_trace_pthreads) = False;
 Int    VG_(clo_dump_error)     = 0;
 Int    VG_(clo_backtrace_size) = 12;
 Char*  VG_(clo_sim_hints)      = NULL;
+Bool   VG_(clo_sym_offsets)    = False;
 Bool   VG_(clo_run_libc_freeres) = True;
 Bool   VG_(clo_track_fds)      = False;
 Bool   VG_(clo_show_below_main)= False;

diff --git a/coregrind/pub_core_options.h b/coregrind/pub_core_options.h
index 8223b65874860ddbe7f9a426665b49327349db19..532a73d9ee0d87046d8984b7793d6f253eb999ee 100644 (file)
--- a/coregrind/pub_core_options.h
+++ b/coregrind/pub_core_options.h
@@ -127,6 +127,8 @@ extern Int   VG_(clo_dump_error);
 extern Int   VG_(clo_backtrace_size);
 /* Engage miscellaneous weird hacks needed for some progs. */
 extern Char* VG_(clo_sim_hints);
+/* Show symbols in the form 'name+offset' ?  Default: NO */
+extern Bool VG_(clo_sym_offsets);
 
 /* Track open file descriptors? */
 extern Bool  VG_(clo_track_fds);