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.

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

diff --git a/addrcheck/Makefile.am b/addrcheck/Makefile.am
index dba0a481ec30e54b93a10ab65cc1efa12e37ad1f..9f04de2f94d3018fd56d5b544660aa538e53ad1e 100644 (file)
--- a/addrcheck/Makefile.am
+++ b/addrcheck/Makefile.am
@@ -14,10 +14,12 @@ vgskin_addrcheck_so_LDADD = \
 
 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
 

diff --git a/corecheck/tests/pth_once.c b/corecheck/tests/pth_once.c
index 75f6a1f31629404d114025cb593ca5f06f4cc3e3..6b6f61914f5956e91a9667df7668747dd9a86577 100644 (file)
--- a/corecheck/tests/pth_once.c
+++ b/corecheck/tests/pth_once.c
@@ -75,7 +75,7 @@ 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");
         return 0;

diff --git a/corecheck/tests/pth_once.stdout.exp b/corecheck/tests/pth_once.stdout.exp
index 97e25d16c0e8a4594c98caa2b2b5e9ff5a2895eb..6929b6fb72676021868fbb46cee2d4c88d1b105b 100644 (file)
--- a/corecheck/tests/pth_once.stdout.exp
+++ b/corecheck/tests/pth_once.stdout.exp
@@ -9,14 +9,4 @@ identify_yourself: Hi, I'm thread # 6
 identify_yourself: Hi, I'm thread # 7
 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

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 28ea915430338dccfa56c8f1833a6bc45f6faefd..f18c8c715d70efb22b1e717da95b114611650af4 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -19,6 +19,17 @@ val_PROGRAMS = \
        libpthread.so \
        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 \
        gen_toolint.pl toolfuncs.def \
@@ -115,36 +126,24 @@ libpthread_so_SOURCES = \
        ${VG_PLATFORM}/syscall.S
 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 \
        -Wl,--soname=libpthread.so.0
 
 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 \
        -Wl,--soname,vg_inject.so \
        -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)
        for i in $(val_PROGRAMS); do \

diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am
index 68aa37fd8f2485d803ad99d0c15138f6dfa821a3..96c379e7ed62ef9ddcebf7a13724bd39bf7336b4 100644 (file)
--- a/helgrind/Makefile.am
+++ b/helgrind/Makefile.am
@@ -6,9 +6,11 @@ vgskin_helgrind_so_SOURCES = hg_main.c
 vgskin_helgrind_so_LDFLAGS = -shared
 
 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
 

diff --git a/massif/Makefile.am b/massif/Makefile.am
index 620c4f1d8732aa3ddd8710d4a4fbf5818e5a989e..3dcf96f78ff03184045dd185289106bd9537e8b2 100644 (file)
--- a/massif/Makefile.am
+++ b/massif/Makefile.am
@@ -8,7 +8,10 @@ vgskin_massif_so_SOURCES = ms_main.c
 vgskin_massif_so_LDFLAGS = -shared
 
 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
+
 

diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am
index 86b6d7d5da0ab117e132343d901c4748867ee96f..36d2b2092721bfdda3907f04bc0843aea1a0e5ef 100644 (file)
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -7,9 +7,11 @@ val_PROGRAMS = vgskin_memcheck.so vgpreload_memcheck.so
 
 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 = \
        mac_leakcheck.c \

diff --git a/memcheck/tests/pth_once.stdout.exp b/memcheck/tests/pth_once.stdout.exp
index 97e25d16c0e8a4594c98caa2b2b5e9ff5a2895eb..6929b6fb72676021868fbb46cee2d4c88d1b105b 100644 (file)
--- a/memcheck/tests/pth_once.stdout.exp
+++ b/memcheck/tests/pth_once.stdout.exp
@@ -9,14 +9,4 @@ identify_yourself: Hi, I'm thread # 6
 identify_yourself: Hi, I'm thread # 7
 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