From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Lively <dlively@virtualiron.com>
Subject: [PATCH] fix x86_64 builds that explicitly specify
	XEN_TARGET_ARCH
Date: Thu, 13 Apr 2006 10:55:15 -0400
Message-ID: <443E6653.5060204@virtualiron.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------040509080809050108090304"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

This is a multi-part message in MIME format.
--------------040509080809050108090304
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Trivial patch to fix x86_64 builds in which XEN_TARGET_ARCH
is specified on the make command line, e.g.:
     make XEN_TARGET_ARCH=x86_64

This busted the vmxassist and hvmloader builds, which must
be done -m32.  Using "override" in the vmxassist/hvmloader
Makefiles fixes the problem by not allowing this to be
overridden from the command line.

Signed-off-by: Dave Lively <dlively@virtualiron.com>


--------------040509080809050108090304
Content-Type: text/x-patch;
 name="fix-explicit-x86_64-build.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="fix-explicit-x86_64-build.patch"

# HG changeset patch
# User lively@dlively2
# Node ID 70fde73c168c7d0c6188882f4f05451ae6136a24
# Parent  2a6dbd9efc9dbea4ce4f5b9bdace87df3f19a55c
Fix x86_64 builds that specify XEN_TARGET_ARCH explicitly
on the make command line.  (We must build hvmloader and
vmxassist for x86_32 even in this case.  Now we don't let the
assignment that does this get overridden by the command-
line arg.)

diff -r 2a6dbd9efc9d -r 70fde73c168c tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile	Tue Apr 11 15:53:00 2006 -0400
+++ b/tools/firmware/hvmloader/Makefile	Thu Apr 13 10:24:54 2006 -0400
@@ -21,7 +21,7 @@
 # External CFLAGS can do more harm than good.
 CFLAGS :=
 
-XEN_TARGET_ARCH = x86_32
+override XEN_TARGET_ARCH = x86_32
 XEN_ROOT = ../../..
 include $(XEN_ROOT)/Config.mk
 
diff -r 2a6dbd9efc9d -r 70fde73c168c tools/firmware/vmxassist/Makefile
--- a/tools/firmware/vmxassist/Makefile	Tue Apr 11 15:53:00 2006 -0400
+++ b/tools/firmware/vmxassist/Makefile	Thu Apr 13 10:24:54 2006 -0400
@@ -21,7 +21,7 @@
 # External CFLAGS can do more harm than good.
 CFLAGS :=
 
-XEN_TARGET_ARCH = x86_32
+override XEN_TARGET_ARCH = x86_32
 XEN_ROOT = ../../..
 include $(XEN_ROOT)/Config.mk
 

--------------040509080809050108090304
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

--------------040509080809050108090304--