From 3c9cad9e38bbe798fb4586c10e7c15b06e88cfa2 Mon Sep 17 00:00:00 2001
From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Date: Wed, 1 Apr 2015 20:06:26 +0000
Subject: [PATCH] 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
---
 Makefile.vex.am | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/Makefile.vex.am b/Makefile.vex.am
index 9efaec1840..9b9b9b53eb 100644
--- a/Makefile.vex.am
+++ b/Makefile.vex.am
@@ -99,12 +99,18 @@ pub/libvex_guest_offsets.h: auxprogs/genoffsets.c \
 	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 @@ LIBVEX_SOURCES_COMMON = \
 	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 @@ libvex_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CFLAGS   = \
         $(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
+
-- 
2.47.3