Commit the VEX makefile changes needed to have the libvexmultiarch
build and installed by default
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15061 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.vex.am b/Makefile.vex.am
index 9efaec1..9b9b9b5 100644
--- a/Makefile.vex.am
+++ b/Makefile.vex.am
@@ -99,12 +99,18 @@
rm -f auxprogs/genoffsets.s
#----------------------------------------------------------------------------
-# libvex-<platform>.a
+# libvex-<platform>-<os>.a : containing all VEX objects, including
+# a main_main.o compiled in single arch (guest==host).
+# libvexmultiarch-<platform>-<os>.a, only containing multiarch_main_main.o,
+# which is main_main.c compiled so that any guest/host combination
+# can be done at runtime.
#----------------------------------------------------------------------------
-pkglib_LIBRARIES = libvex-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a
+pkglib_LIBRARIES = libvex-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a \
+ libvexmultiarch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a
if VGCONF_HAVE_PLATFORM_SEC
-pkglib_LIBRARIES += libvex-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a
+pkglib_LIBRARIES += libvex-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a \
+ libvexmultiarch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a
endif
LIBVEX_SOURCES_COMMON = \
@@ -153,6 +159,8 @@
priv/host_mips_defs.c \
priv/host_mips_isel.c
+LIBVEXMULTIARCH_SOURCES = priv/multiarch_main_main.c
+
LIBVEX_CFLAGS = \
-Wbad-function-cast \
-fstrict-aliasing
@@ -170,3 +178,18 @@
$(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(LIBVEX_CFLAGS)
endif
+libvexmultiarch_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+ $(LIBVEXMULTIARCH_SOURCES)
+libvexmultiarch_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CPPFLAGS = \
+ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -Ipriv
+libvexmultiarch_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CFLAGS = \
+ $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(LIBVEX_CFLAGS)
+if VGCONF_HAVE_PLATFORM_SEC
+libvexmultiarch_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_SOURCES = \
+ $(LIBVEXMULTIARCH_SOURCES)
+libvexmultiarch_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CPPFLAGS = \
+ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) -Ipriv
+libvexmultiarch_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CFLAGS = \
+ $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(LIBVEX_CFLAGS)
+endif
+