[PATCH] Simple makefile changes for x86-64 compiltion of tools

[Jerone Young <jyoung5@us.ibm.com>]

[-- Attachment #1: Type: text/plain, Size: 388 bytes --]

Hi all,
	Here are a few simple changes to the makefiles in the tools dir to help
on compilation on x86-64. This mainly is so that libxutil will compile.
Will also have patches for libxc & python tools soon (figured I would
just send these, and not sit on them any longer).


-- 
Jerone Young
Open Virtualization
IBM Linux Technology Center
jyoung5@us.ibm.com
512-838-1157 (T/L: 678-1157)

[-- Attachment #2: tools_rules_mk.diff --]
[-- Type: text/x-patch, Size: 624 bytes --]

--- xen-unstable.orig/tools/Rules.mk	2005-02-07 10:12:56.184342544 -0600
+++ xen-unstable/tools/Rules.mk	2005-02-07 10:16:30.674735048 -0600
@@ -4,12 +4,14 @@ XEN_XC             = $(XEN_ROOT)/tools/p
 XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
 XEN_LIBXUTIL       = $(XEN_ROOT)/tools/libxutil
 
-ifeq ($(TARGET_ARCH),x86_32)
+XEN_TARGET_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/)
+
+ifeq ($(XEN_TARGET_ARCH),x86_32)
 CFLAGS  += -m32 -march=i686
 LDFLAGS += -m elf_i386
 endif
 
-ifeq ($(TARGET_ARCH),x86_64)
-CFLAGS  += -m64
+ifeq ($(XEN_TARGET_ARCH),x86_64)
+CFLAGS  += -m64 -fpic
 LDFLAGS += -m elf_x86_64
 endif

[-- Attachment #3: tools_xutil_makefile.diff --]
[-- Type: text/x-patch, Size: 498 bytes --]

--- xen-unstable.orig/tools/libxutil/Makefile	2005-02-07 10:12:56.171344520 -0600
+++ xen-unstable/tools/libxutil/Makefile	2005-02-07 10:14:11.565882808 -0600
@@ -65,7 +65,7 @@ libxutil.so.$(MAJOR).$(MINOR): $(PIC_OBJ
 	$(CC) -Wl,-soname -Wl,libxutil.so.$(MAJOR) -shared -o $@ $^
 else
 libxutil.so.$(MAJOR).$(MINOR): $(LIB_OBJS)
-	$(CC) -Wl,-soname -Wl,libxutil.so.$(MAJOR) -shared -o $@ $^
+	$(CC) $(CFLAGS) -Wl,-soname -Wl,libxutil.so.$(MAJOR) -shared -o $@ $^
 endif
 
 libxutil.a: $(LIB_OBJS)