|
From: Nicholas N. <nj...@ca...> - 2004-09-06 15:34:43
|
CVS commit by nethercote:
Arch-abstraction: arch-neutralise the startup message.
M +2 -1 coregrind/Makefile.am 1.83
M +5 -4 coregrind/vg_main.c 1.203
M +2 -2 tests/filter_stderr_basic 1.19
--- valgrind/coregrind/Makefile.am #1.82:1.83
@@ -5,5 +5,6 @@
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
--- valgrind/coregrind/vg_main.c #1.202:1.203
@@ -1917,16 +1917,17 @@ static void process_cmd_line_options( UI
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.");
--- valgrind/tests/filter_stderr_basic #1.18:1.19
@@ -7,7 +7,7 @@
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
|