diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-07-07 08:08:40 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-07-07 08:08:40 +0000 |
| commit | 847e60294d1886f390600baba5558c2f1a3727fc (patch) | |
| tree | 06286ce1e04290b1e896dd407ac378fb4f2aa9a2 | |
| parent | e9c9f60ecaf9d0eb95904d22a9d655f2094c63e4 (diff) | |
| download | xen-847e60294d1886f390600baba5558c2f1a3727fc.tar.gz xen-847e60294d1886f390600baba5558c2f1a3727fc.tar.bz2 xen-847e60294d1886f390600baba5558c2f1a3727fc.zip | |
Fix cross-compilation, and gcc4.
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
| -rw-r--r-- | tools/Rules.mk | 4 | ||||
| -rw-r--r-- | tools/firmware/vmxassist/Makefile | 15 | ||||
| -rw-r--r-- | tools/misc/cpuperf/Makefile | 3 | ||||
| -rw-r--r-- | tools/xenstore/Makefile | 10 |
4 files changed, 14 insertions, 18 deletions
diff --git a/tools/Rules.mk b/tools/Rules.mk index 5b79d37ff7..4f5f8f80c3 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -7,12 +7,12 @@ XEN_LIBXC = $(XEN_ROOT)/tools/libxc 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) diff --git a/tools/firmware/vmxassist/Makefile b/tools/firmware/vmxassist/Makefile index a43b7910ad..17ef50b76b 100644 --- a/tools/firmware/vmxassist/Makefile +++ b/tools/firmware/vmxassist/Makefile @@ -29,16 +29,13 @@ XENINC=-I$(XEN_ROOT)/xen/include -I$(XEN_ROOT)/tools/libxc #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 --git a/tools/misc/cpuperf/Makefile b/tools/misc/cpuperf/Makefile index c33e7d9250..71710bb9fe 100644 --- a/tools/misc/cpuperf/Makefile +++ b/tools/misc/cpuperf/Makefile @@ -17,8 +17,7 @@ INSTALL_DIR = $(INSTALL) -d -m0755 XEN_ROOT=../../.. include $(XEN_ROOT)/tools/Rules.mk -CC = gcc -CFLAGS = -Wall -O3 +CFLAGS += -Wall -O3 HDRS = $(wildcard *.h) SRCS = $(wildcard *.c) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 494a7f20d3..517779b701 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -19,11 +19,11 @@ BASECFLAGS+= -I$(XEN_ROOT)/tools/libxc 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 |