|
From: <sv...@va...> - 2005-09-29 00:25:11
|
Author: njn
Date: 2005-09-29 01:25:07 +0100 (Thu, 29 Sep 2005)
New Revision: 4815
Log:
Fix up vg_preload_core.so vs. vgpreload_core.so confusion introduced
during the ASPACEM merge.
Modified:
trunk/coregrind/Makefile.am
trunk/coregrind/m_main.c
Modified: trunk/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
--- trunk/coregrind/Makefile.am 2005-09-28 20:05:31 UTC (rev 4814)
+++ trunk/coregrind/Makefile.am 2005-09-29 00:25:07 UTC (rev 4815)
@@ -14,7 +14,7 @@
valgrind
=20
val_PROGRAMS =3D \
- vg_preload_core.so
+ vgpreload_core.so
=20
# Remember to include all the arch-specific files in the distribution.
EXTRA_DIST =3D \
@@ -162,12 +162,12 @@
libvex_guest_offsets.h:
$(MAKE) -C @VEX_DIR@ pub/libvex_guest_offsets.h
=20
-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
-vg_preload_core_so_LDFLAGS =3D \
+vgpreload_core_so_SOURCES =3D vg_preloaded.c
+vgpreload_core_so_CFLAGS =3D $(AM_CFLAGS) -fpic
+vgpreload_core_so_LDADD =3D -ldl
+vgpreload_core_so_LDFLAGS =3D \
-shared \
- -Wl,--soname,vg_preload_core.so \
+ -Wl,--soname,vgpreload_core.so \
-Wl,-z,initfirst
=20
clean-local:
Modified: trunk/coregrind/m_main.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
--- trunk/coregrind/m_main.c 2005-09-28 20:05:31 UTC (rev 4814)
+++ trunk/coregrind/m_main.c 2005-09-29 00:25:07 UTC (rev 4815)
@@ -90,7 +90,7 @@
/* Prepare the client's environment. This is basically a copy of our
environment, except:
=20
- LD_PRELOAD=3D$VALGRIND_LIB/vg_preload_core.so:
+ LD_PRELOAD=3D$VALGRIND_LIB/vgpreload_core.so:
($VALGRIND_LIB/vgpreload_TOOL.so:)?
$LD_PRELOAD
=20
@@ -104,7 +104,7 @@
*/
static HChar** setup_client_env ( HChar** origenv, const HChar* toolname=
)
{
- HChar* preload_core_so =3D "vg_preload_core.so";
+ HChar* preload_core_so =3D "vgpreload_core.so";
HChar* ld_preload =3D "LD_PRELOAD=3D";
HChar* v_launcher =3D VALGRIND_LAUNCHER "=3D";
Int ld_preload_len =3D VG_(strlen)( ld_preload );
|