Author: njn
Date: 2005-09-22 22:28:11 +0100 (Thu, 22 Sep 2005)
New Revision: 4723
Log:
Now building a single libcoregrind.a instead of multiple sub-libraries.
Simple VPATH builds now work, but make distcheck is still broken. I don'=
t
know how to fix it without converting Vex to use automake/autoconf.
Removed:
branches/ASPACEM/coregrind/m_aspacemgr/Makefile.am
branches/ASPACEM/coregrind/m_debuginfo/Makefile.am
branches/ASPACEM/coregrind/m_demangle/Makefile.am
branches/ASPACEM/coregrind/m_dispatch/Makefile.am
branches/ASPACEM/coregrind/m_replacemalloc/Makefile.am
branches/ASPACEM/coregrind/m_scheduler/Makefile.am
branches/ASPACEM/coregrind/m_sigframe/Makefile.am
branches/ASPACEM/coregrind/m_syswrap/Makefile.am
Modified:
branches/ASPACEM/Makefile.tool.am
branches/ASPACEM/configure.in
branches/ASPACEM/coregrind/Makefile.am
branches/ASPACEM/coregrind/m_demangle/cp-demangle.c
branches/ASPACEM/coregrind/m_demangle/cplus-dem.c
branches/ASPACEM/coregrind/m_demangle/safe-ctype.c
branches/ASPACEM/tests/filter_stderr_basic
Modified: branches/ASPACEM/Makefile.tool.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/Makefile.tool.am 2005-09-22 15:38:39 UTC (rev 4722)
+++ branches/ASPACEM/Makefile.tool.am 2005-09-22 21:28:11 UTC (rev 4723)
@@ -5,26 +5,19 @@
include $(top_srcdir)/Makefile.tool-flags.am
include $(top_srcdir)/Makefile.tool-inplace.am
=20
-LIBREPLACEMALLOC =3D $(top_builddir)/coregrind/m_replacemalloc/libreplac=
emalloc_toolpreload.a
+LIBREPLACEMALLOC =3D $(top_builddir)/coregrind/libreplacemalloc_toolprel=
oad.a
=20
-## Nb: libscheduler.a must precede libdispatch.a in this list.
COREGRIND_LIBS =3D \
- $(top_builddir)/coregrind/libcoregrind_singles.a \
- $(top_builddir)/coregrind/m_aspacemgr/libaspacemgr.a \
- $(top_builddir)/coregrind/m_debuginfo/libdebuginfo.a \
- $(top_builddir)/coregrind/m_demangle/libdemangle.a \
- $(top_builddir)/coregrind/m_scheduler/libscheduler.a \
- $(top_builddir)/coregrind/m_dispatch/libdispatch.a \
- $(top_builddir)/coregrind/m_replacemalloc/libreplacemalloc_core.a \
- $(top_builddir)/coregrind/m_sigframe/libsigframe.a \
- $(top_builddir)/coregrind/m_syswrap/libsyswrap.a \
+ $(top_builddir)/coregrind/libcoregrind.a \
@VEX_DIR@/libvex.a
=20
+.PHONY: @VEX_DIR@/libvex.a
+
@VEX_DIR@/libvex.a: @VEX_DIR@/priv/main/vex_svnversion.h
- $(MAKE) -C @VEX_DIR@ libvex.a
+ $(MAKE) -C @VEX_DIR@ CC=3D"$(CC)" libvex.a EXTRA_CFLAGS=3D"@ARCH_CORE_A=
M_CFLAGS@"
=20
@VEX_DIR@/priv/main/vex_svnversion.h:
- $(MAKE) -C @VEX_DIR@ version
+ $(MAKE) -C @VEX_DIR@ CC=3D"$(CC)" version
=20
## Nb: do not call this variables "TOOL_LINKADD" and "TOOL_LDFLAGS" -- t=
hat
## makes automake think we are building something called "TOOLS".
Modified: branches/ASPACEM/configure.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/configure.in 2005-09-22 15:38:39 UTC (rev 4722)
+++ branches/ASPACEM/configure.in 2005-09-22 21:28:11 UTC (rev 4723)
@@ -450,14 +450,6 @@
include/Makefile=20
auxprogs/Makefile
coregrind/Makefile=20
- coregrind/m_aspacemgr/Makefile=20
- coregrind/m_debuginfo/Makefile=20
- coregrind/m_demangle/Makefile=20
- coregrind/m_dispatch/Makefile=20
- coregrind/m_replacemalloc/Makefile=20
- coregrind/m_scheduler/Makefile=20
- coregrind/m_sigframe/Makefile=20
- coregrind/m_syswrap/Makefile=20
addrcheck/Makefile
addrcheck/tests/Makefile
addrcheck/docs/Makefile
Modified: branches/ASPACEM/coregrind/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/coregrind/Makefile.am 2005-09-22 15:38:39 UTC (rev 4=
722)
+++ branches/ASPACEM/coregrind/Makefile.am 2005-09-22 21:28:11 UTC (rev 4=
723)
@@ -1,29 +1,14 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
=20
-MODULES =3D \
- m_aspacemgr \
- m_debuginfo \
- m_demangle \
- m_dispatch \
- m_replacemalloc \
- m_scheduler \
- m_sigframe \
- m_syswrap
-
-## When building, we are only interested in the current arch/OS/platform=
.
-## But when doing 'make dist', we are interested in every arch/OS/platfo=
rm.
-## That's what DIST_SUBDIRS specifies.
-SUBDIRS =3D $(MODULES) .
-
-DIST_SUBDIRS =3D $(MODULES) .
-
AM_CPPFLAGS +=3D -DVG_LIBDIR=3D"\"$(valdir)"\" \
-DKICKSTART_BASE=3D@KICKSTART_BASE@
=20
default.supp: $(SUPP_FILES)
=20
-noinst_LIBRARIES =3D libcoregrind_singles.a
+noinst_LIBRARIES =3D \
+ libcoregrind.a \
+ libreplacemalloc_toolpreload.a
=20
bin_PROGRAMS =3D \
valgrind
@@ -31,6 +16,14 @@
val_PROGRAMS =3D \
vg_preload_core.so
=20
+# Remember to include all the arch-specific files in the distribution.
+EXTRA_DIST =3D \
+ $(addsuffix .S,$(addprefix m_dispatch/dispatch-,$(VG_ARCH_ALL)))=
\
+ $(addsuffix .c,$(addprefix m_sigframe/sigframe-,$(VG_PLATFORM_AL=
L))) \
+ $(addsuffix .S,$(addprefix m_syswrap/syscall-,$(VG_PLATFORM_ALL)=
)) \
+ $(addsuffix .c,$(addprefix m_syswrap/syswrap-,$(VG_OS_ALL))) \
+ $(addsuffix .c,$(addprefix m_syswrap/syswrap-,$(VG_PLATFORM_ALL)=
))
+
noinst_HEADERS =3D \
coregrind.h \
pub_core_aspacemgr.h \
@@ -80,7 +73,18 @@
vki_unistd.h \
vki_unistd-amd64-linux.h\
vki_unistd-ppc32-linux.h\
- vki_unistd-x86-linux.h
+ vki_unistd-x86-linux.h \
+ m_debuginfo/priv_symtab.h \
+ m_debuginfo/priv_symtypes.h \
+ m_demangle/ansidecl.h \
+ m_demangle/dyn-string.h \
+ m_demangle/demangle.h \
+ m_demangle/safe-ctype.h \
+ m_scheduler/priv_sema.h \
+ m_syswrap/priv_types_n_macros.h \
+ m_syswrap/priv_syswrap-generic.h \
+ m_syswrap/priv_syswrap-linux.h \
+ m_syswrap/priv_syswrap-main.h
=20
BUILT_SOURCES =3D=20
CLEANFILES =3D=20
@@ -89,7 +93,7 @@
m_launcher.c \
m_debuglog.c
=20
-libcoregrind_singles_a_SOURCES =3D \
+libcoregrind_a_SOURCES =3D \
m_commandline.c \
m_cpuid.S \
m_clientstate.c \
@@ -122,8 +126,39 @@
m_trampoline.S \
m_translate.c \
m_transtab.c \
- m_ume.c
+ m_ume.c \
+ m_aspacemgr/read_procselfmaps.c \
+ m_aspacemgr/aspacemgr.c \
+ m_debuginfo/dwarf.c \
+ m_debuginfo/stabs.c \
+ m_debuginfo/symtab.c \
+ m_debuginfo/symtypes.c \
+ m_demangle/cp-demangle.c \
+ m_demangle/cplus-dem.c \
+ m_demangle/demangle.c \
+ m_demangle/dyn-string.c \
+ m_demangle/safe-ctype.c \
+ m_dispatch/dispatch-@VG_ARCH@.S \
+ m_replacemalloc/replacemalloc_core.c \
+ m_scheduler/scheduler.c \
+ m_scheduler/sema.c \
+ m_sigframe/sigframe-@VG_PLATFORM@.c \
+ m_syswrap/syscall-@VG_PLATFORM@.S \
+ m_syswrap/syswrap-generic.c \
+ m_syswrap/syswrap-@VG_OS@.c \
+ m_syswrap/syswrap-@VG_PLATFORM@.c \
+ m_syswrap/syswrap-main.c
=20
+libreplacemalloc_toolpreload_a_SOURCES =3D m_replacemalloc/vg_replace_ma=
lloc.c
+libreplacemalloc_toolpreload_a_CFLAGS =3D $(PIC_AM_CFLAGS)
+
+m_dispatch/dispatch-@VG_ARCH@.S: libvex_guest_offsets.h
+m_syswrap/syscall-@VG_PLATFORM@.S: libvex_guest_offsets.h
+m_syswrap/syswrap-main.c: libvex_guest_offsets.h
+
+libvex_guest_offsets.h:
+ $(MAKE) -C @VEX_DIR@ pub/libvex_guest_offsets.h
+
vg_preload_core_so_SOURCES =3D vg_preloaded.c
vg_preload_core_so_CFLAGS =3D $(AM_CFLAGS) -fpic
vg_preload_core_so_LDADD =3D -ldl
Deleted: branches/ASPACEM/coregrind/m_aspacemgr/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/coregrind/m_aspacemgr/Makefile.am 2005-09-22 15:38:3=
9 UTC (rev 4722)
+++ branches/ASPACEM/coregrind/m_aspacemgr/Makefile.am 2005-09-22 21:28:1=
1 UTC (rev 4723)
@@ -1,8 +0,0 @@
-include $(top_srcdir)/Makefile.all.am
-include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
-
-noinst_LIBRARIES =3D libaspacemgr.a
-
-libaspacemgr_a_SOURCES =3D \
- read_procselfmaps.c \
- aspacemgr.c
Deleted: branches/ASPACEM/coregrind/m_debuginfo/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/coregrind/m_debuginfo/Makefile.am 2005-09-22 15:38:3=
9 UTC (rev 4722)
+++ branches/ASPACEM/coregrind/m_debuginfo/Makefile.am 2005-09-22 21:28:1=
1 UTC (rev 4723)
@@ -1,14 +0,0 @@
-include $(top_srcdir)/Makefile.all.am
-include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
-
-noinst_HEADERS =3D \
- priv_symtab.h \
- priv_symtypes.h
-
-noinst_LIBRARIES =3D libdebuginfo.a
-
-libdebuginfo_a_SOURCES =3D \
- dwarf.c \
- stabs.c \
- symtab.c \
- symtypes.c
Deleted: branches/ASPACEM/coregrind/m_demangle/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/coregrind/m_demangle/Makefile.am 2005-09-22 15:38:39=
UTC (rev 4722)
+++ branches/ASPACEM/coregrind/m_demangle/Makefile.am 2005-09-22 21:28:11=
UTC (rev 4723)
@@ -1,22 +0,0 @@
-include $(top_srcdir)/Makefile.all.am
-include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
-
-noinst_HEADERS =3D \
- ansidecl.h \
- dyn-string.h \
- demangle.h \
- safe-ctype.h=20
-
-noinst_LIBRARIES =3D libdemangle.a
-
-libdemangle_a_SOURCES =3D \
- cp-demangle.c \
- cplus-dem.c \
- demangle.c \
- dyn-string.c \
- safe-ctype.c
-
-## Ignore harmless warnings for these ones
-cp-demangle.o: CFLAGS +=3D -Wno-unused -Wno-shadow=20
-cplus-dem.o: CFLAGS +=3D -Wno-unused
-
Modified: branches/ASPACEM/coregrind/m_demangle/cp-demangle.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/coregrind/m_demangle/cp-demangle.c 2005-09-22 15:38:=
39 UTC (rev 4722)
+++ branches/ASPACEM/coregrind/m_demangle/cp-demangle.c 2005-09-22 21:28:=
11 UTC (rev 4723)
@@ -710,14 +710,14 @@
argument list ARG_LIST. */
=20
static string_list_t
-template_arg_list_get_arg (arg_list, index)
+template_arg_list_get_arg (arg_list, index2)
template_arg_list_t arg_list;
- int index;
+ int index2;
{
string_list_t arg =3D arg_list->first_argument;
/* Scan down the list of arguments to find the one at position
INDEX. */
- while (index--)
+ while (index2--)
{
arg =3D arg->next;
if (arg =3D=3D NULL)
@@ -966,7 +966,7 @@
demangling_t dm;
int c;
{
- static char *error_message =3D NULL;
+ //static char *error_message =3D NULL; // unused
=20
if (peek_char (dm) =3D=3D c)
{
@@ -2988,7 +2988,7 @@
demangle_template_args (dm)
demangling_t dm;
{
- int first =3D 1;
+ //int first =3D 1; // unused
dyn_string_t old_last_source_name;
dyn_string_t new_name;
template_arg_list_t arg_list =3D template_arg_list_new ();
@@ -3894,6 +3894,7 @@
/* Demangle NAME in the G++ V3 ABI demangling style, and return either
zero, indicating that some error occurred, or a demangling_t
holding the results. */
+__attribute__((unused))
static demangling_t
demangle_v3_with_details (name)
const char *name;
Modified: branches/ASPACEM/coregrind/m_demangle/cplus-dem.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/coregrind/m_demangle/cplus-dem.c 2005-09-22 15:38:39=
UTC (rev 4722)
+++ branches/ASPACEM/coregrind/m_demangle/cplus-dem.c 2005-09-22 21:28:11=
UTC (rev 4723)
@@ -54,7 +54,7 @@
char * realloc ();
#endif*/
=20
-#include <demangle.h>
+#include "demangle.h"
#include "dyn-string.h"
#undef CURRENT_DEMANGLING_STYLE
#define CURRENT_DEMANGLING_STYLE work->options
@@ -3852,7 +3852,7 @@
int done =3D 0;
int success =3D 1;
char buf[10];
- unsigned int dec =3D 0;
+ //unsigned int dec =3D 0; // unused
string btype;
type_kind_t tk =3D tk_integral;
=20
Modified: branches/ASPACEM/coregrind/m_demangle/safe-ctype.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/coregrind/m_demangle/safe-ctype.c 2005-09-22 15:38:3=
9 UTC (rev 4722)
+++ branches/ASPACEM/coregrind/m_demangle/safe-ctype.c 2005-09-22 21:28:1=
1 UTC (rev 4723)
@@ -30,7 +30,7 @@
unsigned char. */
=20
#include "ansidecl.h"
-#include <safe-ctype.h>
+#include "safe-ctype.h"
/*#include <stdio.h>*/ /* for EOF */
=20
/* Shorthand */
Deleted: branches/ASPACEM/coregrind/m_dispatch/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/coregrind/m_dispatch/Makefile.am 2005-09-22 15:38:39=
UTC (rev 4722)
+++ branches/ASPACEM/coregrind/m_dispatch/Makefile.am 2005-09-22 21:28:11=
UTC (rev 4723)
@@ -1,16 +0,0 @@
-include $(top_srcdir)/Makefile.all.am
-include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
-
-noinst_LIBRARIES =3D libdispatch.a
-
-# Remember to include all the arch-specific files in the distribution.
-EXTRA_DIST =3D \
- $(addsuffix .S,$(addprefix dispatch-,$(VG_ARCH_ALL)))
-
-libdispatch_a_SOURCES =3D \
- dispatch-@VG_ARCH@.S
-
-dispatch-@VG_ARCH@.S: libvex_guest_offsets.h
-
-libvex_guest_offsets.h:
- $(MAKE) -C @VEX_DIR@ pub/libvex_guest_offsets.h
Deleted: branches/ASPACEM/coregrind/m_replacemalloc/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/coregrind/m_replacemalloc/Makefile.am 2005-09-22 15:=
38:39 UTC (rev 4722)
+++ branches/ASPACEM/coregrind/m_replacemalloc/Makefile.am 2005-09-22 21:=
28:11 UTC (rev 4723)
@@ -1,16 +0,0 @@
-include $(top_srcdir)/Makefile.all.am
-include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
-
-noinst_LIBRARIES =3D \
- libreplacemalloc_core.a \
- libreplacemalloc_toolpreload.a
-
-libreplacemalloc_core_a_SOURCES =3D \
- replacemalloc_core.c
-
-libreplacemalloc_toolpreload_a_SOURCES =3D \
- vg_replace_malloc.c
-libreplacemalloc_toolpreload_a_CFLAGS =3D \
- $(PIC_AM_CFLAGS)
-
-
Deleted: branches/ASPACEM/coregrind/m_scheduler/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/coregrind/m_scheduler/Makefile.am 2005-09-22 15:38:3=
9 UTC (rev 4722)
+++ branches/ASPACEM/coregrind/m_scheduler/Makefile.am 2005-09-22 21:28:1=
1 UTC (rev 4723)
@@ -1,12 +0,0 @@
-include $(top_srcdir)/Makefile.all.am
-include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
-
-noinst_HEADERS =3D \
- priv_sema.h
-
-noinst_LIBRARIES =3D libscheduler.a
-
-libscheduler_a_SOURCES =3D \
- scheduler.c \
- sema.c
-
Deleted: branches/ASPACEM/coregrind/m_sigframe/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/coregrind/m_sigframe/Makefile.am 2005-09-22 15:38:39=
UTC (rev 4722)
+++ branches/ASPACEM/coregrind/m_sigframe/Makefile.am 2005-09-22 21:28:11=
UTC (rev 4723)
@@ -1,11 +0,0 @@
-include $(top_srcdir)/Makefile.all.am
-include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
-
-# Remember to include all the platform-specific files in the distributio=
n.
-EXTRA_DIST =3D \
- $(addsuffix .c,$(addprefix sigframe-,$(VG_PLATFORM_ALL)))
-
-noinst_LIBRARIES =3D libsigframe.a
-
-libsigframe_a_SOURCES =3D \
- sigframe-@VG_PLATFORM@.c
Deleted: branches/ASPACEM/coregrind/m_syswrap/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/coregrind/m_syswrap/Makefile.am 2005-09-22 15:38:39 =
UTC (rev 4722)
+++ branches/ASPACEM/coregrind/m_syswrap/Makefile.am 2005-09-22 21:28:11 =
UTC (rev 4723)
@@ -1,29 +0,0 @@
-include $(top_srcdir)/Makefile.all.am
-include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
-
-# Remember to include all the OS/platform-specific files in the distribu=
tion.
-EXTRA_DIST =3D \
- $(addsuffix .S,$(addprefix syscall-,$(VG_PLATFORM_ALL))) \
- $(addsuffix .c,$(addprefix syswrap-,$(VG_OS_ALL))) \
- $(addsuffix .c,$(addprefix syswrap-,$(VG_PLATFORM_ALL)))
-
-noinst_HEADERS =3D \
- priv_types_n_macros.h \
- priv_syswrap-generic.h \
- priv_syswrap-linux.h \
- priv_syswrap-main.h
-
-noinst_LIBRARIES =3D libsyswrap.a
-
-libsyswrap_a_SOURCES =3D \
- syscall-@VG_PLATFORM@.S \
- syswrap-generic.c \
- syswrap-@VG_OS@.c \
- syswrap-@VG_PLATFORM@.c \
- syswrap-main.c
-
-syscall-@VG_PLATFORM@.S: libvex_guest_offsets.h
-syswrap-main.c: libvex_guest_offsets.h
-
-libvex_guest_offsets.h:
- $(MAKE) -C @VEX_DIR@ pub/libvex_guest_offsets.h
Modified: branches/ASPACEM/tests/filter_stderr_basic
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/tests/filter_stderr_basic 2005-09-22 15:38:39 UTC (r=
ev 4722)
+++ branches/ASPACEM/tests/filter_stderr_basic 2005-09-22 21:28:11 UTC (r=
ev 4723)
@@ -19,8 +19,8 @@
sed "/Estimated CPU clock rate is [0-9]* MHz/d" |
sed "/For more details, rerun with: -v/d" |
=20
-# Anonymise line numbers in vg_replace_malloc.c
-sed "s/vg_replace_malloc.c:[0-9]*/vg_replace_malloc.c:.../" |
+# Anonymise line numbers in vg_replace_malloc.c, remove dirname if prese=
nt
+sed "s/\(m_replacemalloc\/\)\?vg_replace_malloc.c:[0-9]*/vg_replace_mall=
oc.c:.../" |
=20
# Anonymise vg_intercept lines
#sed "s/vg_intercept.c:[0-9]*/vg_intercept.c:.../" |
|