     Int     loglevel, i;
     struct vki_rlimit zero = { 0, 0 };
     XArray* addr2dihandle = NULL;
-@@ -1872,8 +1856,7 @@
+@@ -1872,8 +1872,7 @@
     VG_(debugLog)(1, "main",
                      "(main_) Process Valgrind's command line options, "
                      "setup logging\n");

       VG_(printf_xml)("\n");
       VG_(printf_xml)("<pid>%d</pid>\n", VG_(getpid)());
       VG_(printf_xml)("<ppid>%d</ppid>\n", VG_(getppid)());
@@ -1374,7 +1359,6 @@
    Int     need_help          = 0; // 0 = no, 1 = --help, 2 = --help-debug
    ThreadId tid_main          = VG_INVALID_THREADID;
    Bool    logging_to_fd      = False;

===================================================================
--- coregrind/m_main.c	(revision 10880)
+++ coregrind/m_main.c	(working copy)
@@ -313,6 +313,64 @@
    }
 }
 
