|
From: Nicholas N. <nj...@ca...> - 2004-10-20 18:40:53
|
CVS commit by nethercote:
Build vg_replace_malloc.c into a library, because it makes the Makefiles a bit
neater. Also remove some dodgy CFLAGS+= lines.
I had to change the expected output of pth_once.c, because the change has
altered the order of the (non-deterministic) output.
M +5 -3 addrcheck/Makefile.am 1.53
M +1 -1 corecheck/tests/pth_once.c 1.3
M +0 -10 corecheck/tests/pth_once.stdout.exp 1.3
M +15 -16 coregrind/Makefile.am 1.94
M +5 -3 helgrind/Makefile.am 1.50
M +6 -3 massif/Makefile.am 1.6
M +5 -3 memcheck/Makefile.am 1.53
M +0 -10 memcheck/tests/pth_once.stdout.exp 1.2
--- valgrind/addrcheck/Makefile.am #1.52:1.53
@@ -15,9 +15,11 @@
vgpreload_addrcheck_so_SOURCES =
vgpreload_addrcheck_so_LDADD = \
- $(top_builddir)/coregrind/vg_replace_malloc.o \
../memcheck/mac_replace_strmem.o
vgpreload_addrcheck_so_DEPENDENCIES = \
- $(top_builddir)/coregrind/vg_replace_malloc.o \
+ $(top_builddir)/coregrind/lib_replace_malloc.a \
../memcheck/mac_replace_strmem.o
-vgpreload_addrcheck_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst
+vgpreload_addrcheck_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst \
+ -Wl,--whole-archive \
+ $(top_builddir)/coregrind/lib_replace_malloc.a \
+ -Wl,--no-whole-archive
--- valgrind/corecheck/tests/pth_once.c #1.2:1.3
@@ -76,5 +76,5 @@ main(void)
for (thread_num = 0; thread_num < NUM_THREADS; thread_num++) {
pthread_join(threads[thread_num], NULL);
- printf("main: joined to thread %d\n", thread_num);
+ //printf("main: joined to thread %d\n", thread_num);
}
printf("main: Goodbye\n");
--- valgrind/corecheck/tests/pth_once.stdout.exp #1.2:1.3
@@ -10,13 +10,3 @@
identify_yourself: Hi, I'm thread # 8
identify_yourself: Hi, I'm thread # 9
-main: joined to thread 0
-main: joined to thread 1
-main: joined to thread 2
-main: joined to thread 3
-main: joined to thread 4
-main: joined to thread 5
-main: joined to thread 6
-main: joined to thread 7
-main: joined to thread 8
-main: joined to thread 9
main: Goodbye
--- valgrind/coregrind/Makefile.am #1.93:1.94
@@ -20,4 +20,15 @@
vg_inject.so
+noinst_LIBRARIES = lib_replace_malloc.a
+
+noinst_HEADERS = \
+ core.h \
+ core_asm.h \
+ ume.h \
+ vg_symtab2.h \
+ vg_symtypes.h \
+ vg_toolint.h \
+ vg_unsafe.h
+
EXTRA_DIST = \
vg_libpthread.vs valgrind.vs \
@@ -116,5 +127,5 @@
libpthread_so_DEPENDENCIES = $(srcdir)/vg_libpthread.vs
libpthread_so_LDFLAGS = -Werror -fno-omit-frame-pointer -UVG_LIBDIR \
- -shared -fpic -ldl \
+ -shared -ldl \
-Wl,-version-script $(srcdir)/vg_libpthread.vs \
-Wl,-z,nodelete \
@@ -123,9 +134,5 @@
vg_inject_so_SOURCES = \
vg_intercept.c
-
-# Not really true, but we need to build vg_replace_malloc.o somehow
-vg_inject_so_DEPENDENCIES = \
- vg_replace_malloc.o
-
+vg_inject_so_CFLAGS = $(AM_CFLAGS) -fpic
vg_inject_so_LDFLAGS = \
-shared \
@@ -133,17 +140,9 @@
-Wl,-z,initfirst
-noinst_HEADERS = \
- core.h \
- core_asm.h \
- ume.h \
- vg_symtab2.h \
- vg_symtypes.h \
- vg_toolint.h \
- vg_unsafe.h
+lib_replace_malloc_a_SOURCES = vg_replace_malloc.c
+lib_replace_malloc_a_CFLAGS = $(AM_CFLAGS) -fpic
MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS) $(inplacedir)/libpthread.so.0
-vg_replace_malloc.o vg_intercept.o vg_libpthread.o: CFLAGS += -fno-omit-frame-pointer -g -fpic
-
all-local:
mkdir -p $(inplacedir)
--- valgrind/helgrind/Makefile.am #1.49:1.50
@@ -7,7 +7,9 @@
vgpreload_helgrind_so_SOURCES =
-vgpreload_helgrind_so_LDADD = $(top_builddir)/coregrind/vg_replace_malloc.o
-vgpreload_helgrind_so_DEPENDENCIES = $(top_builddir)/coregrind/vg_replace_malloc.o
-vgpreload_helgrind_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst
+vgpreload_helgrind_so_DEPENDENCIES = $(top_builddir)/coregrind/lib_replace_malloc.a
+vgpreload_helgrind_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst \
+ -Wl,--whole-archive \
+ $(top_builddir)/coregrind/lib_replace_malloc.a \
+ -Wl,--no-whole-archive
hgincludedir = $(includedir)/valgrind
--- valgrind/massif/Makefile.am #1.5:1.6
@@ -9,6 +9,9 @@
vgpreload_massif_so_SOURCES =
-vgpreload_massif_so_LDADD = $(top_builddir)/coregrind/vg_replace_malloc.o
-vgpreload_massif_so_DEPENDENCIES = $(top_builddir)/coregrind/vg_replace_malloc.o
-vgpreload_massif_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst
+vgpreload_massif_so_DEPENDENCIES = $(top_builddir)/coregrind/lib_replace_malloc.a
+vgpreload_massif_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst \
+ -Wl,--whole-archive \
+ $(top_builddir)/coregrind/lib_replace_malloc.a \
+ -Wl,--no-whole-archive
+
--- valgrind/memcheck/Makefile.am #1.52:1.53
@@ -8,7 +8,9 @@
vgpreload_memcheck_so_SOURCES = \
mac_replace_strmem.c
-vgpreload_memcheck_so_LDADD = $(top_builddir)/coregrind/vg_replace_malloc.o
-vgpreload_memcheck_so_DEPENDENCIES = $(top_builddir)/coregrind/vg_replace_malloc.o
-vgpreload_memcheck_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst
+vgpreload_memcheck_so_DEPENDENCIES = $(top_builddir)/coregrind/lib_replace_malloc.a
+vgpreload_memcheck_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst \
+ -Wl,--whole-archive \
+ $(top_builddir)/coregrind/lib_replace_malloc.a \
+ -Wl,--no-whole-archive
vgskin_memcheck_so_SOURCES = \
--- valgrind/memcheck/tests/pth_once.stdout.exp #1.1:1.2
@@ -10,13 +10,3 @@
identify_yourself: Hi, I'm thread # 8
identify_yourself: Hi, I'm thread # 9
-main: joined to thread 0
-main: joined to thread 1
-main: joined to thread 2
-main: joined to thread 3
-main: joined to thread 4
-main: joined to thread 5
-main: joined to thread 6
-main: joined to thread 7
-main: joined to thread 8
-main: joined to thread 9
main: Goodbye
|