Get rid of longstanding and now pointless restriction that disallowed

using --db-attach=yes and --trace-children=yes together.

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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 9a16050fdb77b43be630a27302b011ffd7fc28bb..adf0be836bff69122638cf3146757f531dd34512 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -563,15 +563,6 @@ static Bool main_process_cmd_line_options( UInt* client_auxv,
    if (VG_(clo_verbosity) < 0)
       VG_(clo_verbosity) = 0;
 
-   if (VG_(clo_db_attach) && VG_(clo_trace_children)) {
-      VG_(message)(Vg_UserMsg, "");
-      VG_(message)(Vg_UserMsg, 
-         "--db-attach=yes conflicts with --trace-children=yes");
-      VG_(message)(Vg_UserMsg, 
-         "Please choose one or the other, but not both.");
-      VG_(err_bad_option)("--db-attach=yes and --trace-children=yes");
-   }
-
    if (VG_(clo_gen_suppressions) > 0 && 
        !VG_(needs).core_errors && !VG_(needs).tool_errors) {
       VG_(message)(Vg_UserMsg, 

diff --git a/docs/xml/manual-core.xml b/docs/xml/manual-core.xml
index 285512034c96fb19dd953a7de7a7c421336b7fc0..7d556fc7f708e70f965e881b979c4cc543539ba5 100644 (file)
--- a/docs/xml/manual-core.xml
+++ b/docs/xml/manual-core.xml
@@ -950,18 +950,6 @@ that can report errors, e.g. Memcheck, but not Cachegrind.</para>
 
       <para><varname>C Ret</varname> or <varname>c Ret</varname> causes
       Valgrind not to start a debugger, and not to ask again.</para>
-
-      <para><command>Note:</command> <option>--db-attach=yes</option>
-      conflicts with <option>--trace-children=yes</option>.  You can't
-      use them together.  Valgrind refuses to start up in this
-      situation.</para>
-
-      <para>May 2002: this is a historical relic which could be easily
-      fixed if it gets in your way.  Mail us and complain if this is a
-      problem for you.</para>
-      <para>Nov 2002: if you're sending output to a logfile or to a
-      network socket, I guess this option doesn't make any sense.
-      Caveat emptor.</para>
     </listitem>
   </varlistentry>