Arch-abstraction: arch-neutralise the startup message.

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

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index cd9705481fb604cd02cb3c4c979bb82992a0fd12..49ab635a72a608484c1af440e8f5becd04953469 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -4,7 +4,8 @@ include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
 SUBDIRS = $(VG_ARCH) demangle . docs
 
 AM_CPPFLAGS += -DVG_LIBDIR="\"$(valdir)"\" -I$(srcdir)/demangle \
-               -DKICKSTART_BASE=$(KICKSTART_BASE)
+               -DKICKSTART_BASE=$(KICKSTART_BASE) \
+               -DVG_PLATFORM="\"$(VG_PLATFORM)"\"
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fno-omit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g -DELFSZ=32
 AM_CCASFLAGS = $(add_includes) -I..

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 729803b4b7c6522f6f47df4c841724c7e8931336..adff5c50f123208f896964263aae02aab8dc866c 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -1916,18 +1916,19 @@ static void process_cmd_line_options( UInt* client_auxv, const char* toolname )
 
    if (VG_(clo_verbosity > 0)) {
       /* Tool details */
-      VG_(message)(Vg_UserMsg, "%s%s%s, %s for x86-linux.",
+      VG_(message)(Vg_UserMsg, "%s%s%s, %s for %s.",
                    VG_(details).name, 
                    NULL == VG_(details).version ?        "" : "-",
                    NULL == VG_(details).version 
                       ? (Char*)"" : VG_(details).version,
-                   VG_(details).description);
+                   VG_(details).description,
+                   VG_PLATFORM);
       VG_(message)(Vg_UserMsg, "%s", VG_(details).copyright_author);
 
       /* Core details */
       VG_(message)(Vg_UserMsg,
-         "Using valgrind-%s, a program supervision framework for x86-linux.",
-         VERSION);
+         "Using valgrind-%s, a program supervision framework for %s.",
+         VERSION, VG_PLATFORM);
       VG_(message)(Vg_UserMsg, 
          "Copyright (C) 2000-2004, and GNU GPL'd, by Julian Seward et al.");
    }

diff --git a/tests/filter_stderr_basic b/tests/filter_stderr_basic
index c14b9160f992c6121beb38cade20f9dd932b8c65..b6cb7b75edc21f45cfeca73e1c76db146dea3f86 100755 (executable)
--- a/tests/filter_stderr_basic
+++ b/tests/filter_stderr_basic
@@ -6,9 +6,9 @@
 # Remove ==pid== and --pid-- and ++pid++ and **pid** strings 
 sed "s/\(==\|--\|\+\+\|\*\*\)[0-9]\{1,5\}\1 //"             |
 
-# Remove "<name>, a <description> for x86-linux." line and the following
+# Remove "<name>, a <description> for $ARCH-$OS." line and the following
 # copyright notice line.  Works for tool and core intro lines.
-sed "/^.*, .* for x86-linux\./ , /./ d"                                | 
+sed "/^.*, .* for .*-.*\./ , /./ d"                                | 
 
 # Remove other introductory lines
 sed "/Estimated CPU clock rate is [0-9]* MHz/d"                       |