Fix up vg_preload_core.so vs. vgpreload_core.so confusion introduced

during the ASPACEM merge.

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

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index bae2988f1de25dae232d0eb62ddf31ac853ae2af..5d69a945dcf2016914f726f05655050963ec1f71 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -14,7 +14,7 @@ bin_PROGRAMS = \
        valgrind
 
 val_PROGRAMS = \
-       vg_preload_core.so
+       vgpreload_core.so
 
 # Remember to include all the arch-specific files in the distribution.
 EXTRA_DIST = \
@@ -162,12 +162,12 @@ 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 = vg_preloaded.c
-vg_preload_core_so_CFLAGS = $(AM_CFLAGS) -fpic
-vg_preload_core_so_LDADD = -ldl
-vg_preload_core_so_LDFLAGS = \
+vgpreload_core_so_SOURCES = vg_preloaded.c
+vgpreload_core_so_CFLAGS = $(AM_CFLAGS) -fpic
+vgpreload_core_so_LDADD = -ldl
+vgpreload_core_so_LDFLAGS = \
        -shared \
-       -Wl,--soname,vg_preload_core.so \
+       -Wl,--soname,vgpreload_core.so \
        -Wl,-z,initfirst
 
 clean-local:

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index bd3b11d5262f439410fd589283edd859f8aeed09..8ba61143b1aa4ec8a7361a3dea26e479891f3612 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -90,7 +90,7 @@ static void print_all_stats ( void )
 /* Prepare the client's environment.  This is basically a copy of our
    environment, except:
 
-     LD_PRELOAD=$VALGRIND_LIB/vg_preload_core.so:
+     LD_PRELOAD=$VALGRIND_LIB/vgpreload_core.so:
                 ($VALGRIND_LIB/vgpreload_TOOL.so:)?
                 $LD_PRELOAD
 
@@ -104,7 +104,7 @@ static void print_all_stats ( void )
 */
 static HChar** setup_client_env ( HChar** origenv, const HChar* toolname)
 {
-   HChar* preload_core_so = "vg_preload_core.so";
+   HChar* preload_core_so = "vgpreload_core.so";
    HChar* ld_preload      = "LD_PRELOAD=";
    HChar* v_launcher      = VALGRIND_LAUNCHER "=";
    Int    ld_preload_len  = VG_(strlen)( ld_preload );