Merge in enough changes from the old Vex tree to make stage2 link, at
least.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3061 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index c5e82c6..9dcd803 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -82,7 +82,8 @@
demangle/libdemangle.a \
${VG_PLATFORM}/libplatform.a \
${VG_ARCH}/libarch.a \
- ${VG_OS}/libos.a
+ ${VG_OS}/libos.a \
+ @VEX_DIR@/libvex.a
## Test repeated in both arms of the if-then-else because older versions of
## automake don't seem to like having += within an if-then-else.