Fix an outdated comment as pointed out in BZ #211256.

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

diff --git a/NEWS b/NEWS
index 1232c8ee313abf23b47001e610069347f9b68f56..8079ef256975699c8611950cde9b253b79aa591f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -72,6 +72,7 @@ where XXXXXX is the bug number as listed below.
 201435  Fix Darwin: -v does not show kernel version
 210028  ppc32: Unhandled instruction vmhraddshs
         = 338095
+211256  Fixed an outdated comment regarding the default platform.
 211926  Avoid compilation warnings in valgrind.h with -pedantic
 226609  Crediting upstream authors in man page
 231257  Valgrind omits path when executing script from shebang line

diff --git a/coregrind/launcher-linux.c b/coregrind/launcher-linux.c
index 08f38c1ab0a30db4a69461305331ad28d8fa50cc..a5ebb02fe10143c53c162a7ab12e67828375a311 100644 (file)
--- a/coregrind/launcher-linux.c
+++ b/coregrind/launcher-linux.c
@@ -341,14 +341,11 @@ int main(int argc, char** argv, char** envp)
    }
 
    /* Select a platform to use if we can't decide that by looking at
-      the executable (eg because it's a shell script).  Note that the
-      default_platform is not necessarily either the primary or
-      secondary build target.  Instead it's chosen to maximise the
-      chances that /bin/sh will work on it.  Hence for a primary
-      target of ppc64-linux we still choose ppc32-linux as the default
-      target, because on most ppc64-linux setups, the basic /bin,
-      /usr/bin, etc, stuff is built in 32-bit mode, not 64-bit
-      mode. */
+      the executable (eg because it's a shell script).  VG_PLATFORM is the
+      default_platform. Its value is defined in coregrind/Makefile.am and
+      typically it is the primary build target. Unless the primary build
+      target is not built is not built in which case VG_PLATFORM is the
+      secondary build target. */
    if ((0==strcmp(VG_PLATFORM,"x86-linux"))    ||
        (0==strcmp(VG_PLATFORM,"amd64-linux"))  ||
        (0==strcmp(VG_PLATFORM,"ppc32-linux"))  ||