ia64/xen-unstable

changeset 5694:1a7383f84989

Fix cross-compilation, and gcc4.
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
author kaf24@firebug.cl.cam.ac.uk
date Thu Jul 07 08:08:40 2005 +0000 (2005-07-07)
parents 43bfa1a81aa0
children 0694fda4dbd5 707fcf42a5ae 95f14bb8d220
files tools/Rules.mk tools/firmware/vmxassist/Makefile tools/misc/cpuperf/Makefile tools/xenstore/Makefile
line diff
     1.1 --- a/tools/Rules.mk	Wed Jul 06 23:16:32 2005 +0000
     1.2 +++ b/tools/Rules.mk	Thu Jul 07 08:08:40 2005 +0000
     1.3 @@ -7,12 +7,12 @@ XEN_LIBXC          = $(XEN_ROOT)/tools/l
     1.4  
     1.5  ifeq ($(XEN_TARGET_ARCH),x86_32)
     1.6  CFLAGS  += -m32 -march=i686
     1.7 -LDFLAGS += -m elf_i386
     1.8 +LDFLAGS += -m32
     1.9  endif
    1.10  
    1.11  ifeq ($(XEN_TARGET_ARCH),x86_64)
    1.12  CFLAGS  += -m64
    1.13 -LDFLAGS += -m elf_x86_64
    1.14 +LDFLAGS += -m64
    1.15  endif
    1.16  
    1.17  X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
     2.1 --- a/tools/firmware/vmxassist/Makefile	Wed Jul 06 23:16:32 2005 +0000
     2.2 +++ b/tools/firmware/vmxassist/Makefile	Thu Jul 07 08:08:40 2005 +0000
     2.3 @@ -29,16 +29,13 @@ XENINC=-I$(XEN_ROOT)/xen/include -I$(XEN
     2.4  #DEFINES=-DDEBUG -DTEST -DTEXTADDR=${TEXTADDR}
     2.5  #XENINC=-I/home/leendert/xen/xeno-unstable.bk/xen/include
     2.6  
     2.7 -LD=ld
     2.8 -CC=gcc
     2.9 -CPP=cpp -P
    2.10 -OBJCOPY=objcopy -p -O binary -R .note -R .comment -R .bss -S --gap-fill=0
    2.11 -CFLAGS=${DEFINES} -I. $(XENINC) -Wall -fno-builtin -O2 -msoft-float
    2.12 -
    2.13 -ifeq ($(XEN_COMPILE_ARCH),x86_64)
    2.14 +LD       = ld
    2.15 +CC       = gcc
    2.16 +CPP      = cpp -P
    2.17 +OBJCOPY  = objcopy -p -O binary -R .note -R .comment -R .bss -S --gap-fill=0
    2.18 +CFLAGS   = ${DEFINES} -I. $(XENINC) -Wall -fno-builtin -O2 -msoft-float
    2.19  CFLAGS  += -m32 -march=i686
    2.20 -LDFLAGS += -m elf_i386
    2.21 -endif
    2.22 +LDFLAGS  = -m elf_i386
    2.23  
    2.24  OBJECTS = head.o trap.o vm86.o setup.o util.o
    2.25  
     3.1 --- a/tools/misc/cpuperf/Makefile	Wed Jul 06 23:16:32 2005 +0000
     3.2 +++ b/tools/misc/cpuperf/Makefile	Thu Jul 07 08:08:40 2005 +0000
     3.3 @@ -17,8 +17,7 @@ INSTALL_DIR	= $(INSTALL) -d -m0755
     3.4  XEN_ROOT=../../..
     3.5  include $(XEN_ROOT)/tools/Rules.mk
     3.6  
     3.7 -CC           = gcc
     3.8 -CFLAGS       = -Wall -O3 
     3.9 +CFLAGS      += -Wall -O3 
    3.10  
    3.11  HDRS         = $(wildcard *.h)
    3.12  SRCS         = $(wildcard *.c)
     4.1 --- a/tools/xenstore/Makefile	Wed Jul 06 23:16:32 2005 +0000
     4.2 +++ b/tools/xenstore/Makefile	Thu Jul 07 08:08:40 2005 +0000
     4.3 @@ -19,11 +19,11 @@ BASECFLAGS+= -I$(XEN_ROOT)/tools/libxc
     4.4  BASECFLAGS+= -I$(XEN_ROOT)/xen/include/public
     4.5  BASECFLAGS+= -I.
     4.6  
     4.7 -CFLAGS += $(BASECFLAGS)
     4.8 -LDFLAGS=$(PROFILE) -L$(XEN_LIBXC)
     4.9 -TESTDIR=`pwd`/testsuite/tmp
    4.10 -TESTFLAGS=-DTESTING
    4.11 -TESTENV=XENSTORED_ROOTDIR=$(TESTDIR) XENSTORED_RUNDIR=$(TESTDIR)
    4.12 +CFLAGS  += $(BASECFLAGS)
    4.13 +LDFLAGS += $(PROFILE) -L$(XEN_LIBXC)
    4.14 +TESTDIR  = `pwd`/testsuite/tmp
    4.15 +TESTFLAGS= -DTESTING
    4.16 +TESTENV  = XENSTORED_ROOTDIR=$(TESTDIR) XENSTORED_RUNDIR=$(TESTDIR)
    4.17  
    4.18  all: xen xenstored libxenstore.a libxenstore-pic.a
    4.19