[Xen-changelog] Fix cross-compilation, and gcc4.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 1a7383f849896e60f8be631c96fa2b461f502615
# Parent  43bfa1a81aa030cca6e43ab33125ba72cd92a6dd

Fix cross-compilation, and gcc4.
Signed-off-by: Jerone Young <jyoung5@xxxxxxxxxx>

diff -r 43bfa1a81aa0 -r 1a7383f84989 tools/misc/cpuperf/Makefile
--- a/tools/misc/cpuperf/Makefile       Wed Jul  6 23:16:32 2005
+++ b/tools/misc/cpuperf/Makefile       Thu Jul  7 08:08:40 2005
@@ -17,8 +17,7 @@
 XEN_ROOT=../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CC           = gcc
-CFLAGS       = -Wall -O3 
+CFLAGS      += -Wall -O3 
 
 HDRS         = $(wildcard *.h)
 SRCS         = $(wildcard *.c)
diff -r 43bfa1a81aa0 -r 1a7383f84989 tools/firmware/vmxassist/Makefile
--- a/tools/firmware/vmxassist/Makefile Wed Jul  6 23:16:32 2005
+++ b/tools/firmware/vmxassist/Makefile Thu Jul  7 08:08:40 2005
@@ -29,16 +29,13 @@
 #DEFINES=-DDEBUG -DTEST -DTEXTADDR=${TEXTADDR}
 #XENINC=-I/home/leendert/xen/xeno-unstable.bk/xen/include
 
-LD=ld
-CC=gcc
-CPP=cpp -P
-OBJCOPY=objcopy -p -O binary -R .note -R .comment -R .bss -S --gap-fill=0
-CFLAGS=${DEFINES} -I. $(XENINC) -Wall -fno-builtin -O2 -msoft-float
-
-ifeq ($(XEN_COMPILE_ARCH),x86_64)
+LD       = ld
+CC       = gcc
+CPP      = cpp -P
+OBJCOPY  = objcopy -p -O binary -R .note -R .comment -R .bss -S --gap-fill=0
+CFLAGS   = ${DEFINES} -I. $(XENINC) -Wall -fno-builtin -O2 -msoft-float
 CFLAGS  += -m32 -march=i686
-LDFLAGS += -m elf_i386
-endif
+LDFLAGS  = -m elf_i386
 
 OBJECTS = head.o trap.o vm86.o setup.o util.o
 
diff -r 43bfa1a81aa0 -r 1a7383f84989 tools/xenstore/Makefile
--- a/tools/xenstore/Makefile   Wed Jul  6 23:16:32 2005
+++ b/tools/xenstore/Makefile   Thu Jul  7 08:08:40 2005
@@ -19,11 +19,11 @@
 BASECFLAGS+= -I$(XEN_ROOT)/xen/include/public
 BASECFLAGS+= -I.
 
-CFLAGS += $(BASECFLAGS)
-LDFLAGS=$(PROFILE) -L$(XEN_LIBXC)
-TESTDIR=`pwd`/testsuite/tmp
-TESTFLAGS=-DTESTING
-TESTENV=XENSTORED_ROOTDIR=$(TESTDIR) XENSTORED_RUNDIR=$(TESTDIR)
+CFLAGS  += $(BASECFLAGS)
+LDFLAGS += $(PROFILE) -L$(XEN_LIBXC)
+TESTDIR  = `pwd`/testsuite/tmp
+TESTFLAGS= -DTESTING
+TESTENV  = XENSTORED_ROOTDIR=$(TESTDIR) XENSTORED_RUNDIR=$(TESTDIR)
 
 all: xen xenstored libxenstore.a libxenstore-pic.a
 
diff -r 43bfa1a81aa0 -r 1a7383f84989 tools/Rules.mk
--- a/tools/Rules.mk    Wed Jul  6 23:16:32 2005
+++ b/tools/Rules.mk    Thu Jul  7 08:08:40 2005
@@ -7,12 +7,12 @@
 
 ifeq ($(XEN_TARGET_ARCH),x86_32)
 CFLAGS  += -m32 -march=i686
-LDFLAGS += -m elf_i386
+LDFLAGS += -m32
 endif
 
 ifeq ($(XEN_TARGET_ARCH),x86_64)
 CFLAGS  += -m64
-LDFLAGS += -m elf_x86_64
+LDFLAGS += -m64
 endif
 
 X11_LDPATH = -L/usr/X11R6/$(LIBDIR)

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