ia64/xen-unstable

changeset 17798:4ecc3ac69819

stubdom: prevent newlib from emiting cli/sti in longjmp
Also fix build dependencies and cleanup.

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Jun 09 09:42:14 2008 +0100 (2008-06-09)
parents 638811f870ba
children 041f67ddcd7b
files stubdom/Makefile
line diff
     1.1 --- a/stubdom/Makefile	Mon Jun 09 09:39:15 2008 +0100
     1.2 +++ b/stubdom/Makefile	Mon Jun 09 09:42:14 2008 +0100
     1.3 @@ -23,9 +23,11 @@ endif
     1.4  
     1.5  ifeq ($(GNU_TARGET_ARCH), i686)
     1.6  TARGET_CFLAGS=
     1.7 +NEWLIB_CFLAGS+=-D_I386MACH_ALLOW_HW_INTERRUPTS
     1.8  endif
     1.9  ifeq ($(GNU_TARGET_ARCH), x86_64)
    1.10  TARGET_CFLAGS=-mno-red-zone
    1.11 +NEWLIB_CFLAGS+=-D_I386MACH_ALLOW_HW_INTERRUPTS
    1.12  endif
    1.13  ifeq ($(GNU_TARGET_ARCH), ia64)
    1.14  TARGET_CFLAGS=-mconstant-gp
    1.15 @@ -71,7 +73,7 @@ gcc-$(GCC_VERSION): gcc-$(GCC_VERSION).t
    1.16  	tar xjf gcc-$(GCC_VERSION).tar.bz2
    1.17  	( cd gcc-$(GCC_VERSION) && patch -p1 < ../gcc.patch )
    1.18  	touch $@
    1.19 -	
    1.20 +
    1.21  GCC_STAMPFILE=$(CROSS_ROOT)/bin/$(GNU_TARGET_ARCH)-xen-elf-gcc-$(GCC_VERSION)
    1.22  .PHONY: cross-gcc
    1.23  cross-gcc: $(GCC_STAMPFILE)
    1.24 @@ -97,7 +99,7 @@ cross-newlib: $(NEWLIB_STAMPFILE)
    1.25  $(NEWLIB_STAMPFILE): newlib-cvs $(GCC_STAMPFILE)
    1.26  	mkdir -p newlib-build
    1.27  	( cd newlib-build && \
    1.28 -	  CC_FOR_TARGET="$(GNU_TARGET_ARCH)-xen-elf-gcc $(TARGET_CFLAGS)" ../newlib-cvs/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long && \
    1.29 +	  CC_FOR_TARGET="$(GNU_TARGET_ARCH)-xen-elf-gcc $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" ../newlib-cvs/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long && \
    1.30  	  $(MAKE) && \
    1.31  	  $(MAKE) install )
    1.32  
    1.33 @@ -199,7 +201,7 @@ ioemu: cross-zlib cross-libpci mk-symlin
    1.34  ######
    1.35  
    1.36  .PHONY: caml
    1.37 -caml: mk-symlinks
    1.38 +caml: cross-newlib mk-symlinks
    1.39  	$(MAKE) -C $@ LWIPDIR=$(CURDIR)/lwip-cvs 
    1.40  
    1.41  ###
    1.42 @@ -207,7 +209,7 @@ caml: mk-symlinks
    1.43  ###
    1.44  
    1.45  .PHONY: c
    1.46 -c: mk-symlinks
    1.47 +c: cross-newlib mk-symlinks
    1.48  	$(MAKE) -C $@ LWIPDIR=$(CURDIR)/lwip-cvs 
    1.49  
    1.50  ########
    1.51 @@ -243,6 +245,9 @@ install: mini-os/ioemu-stubdom.gz
    1.52  .PHONY: clean
    1.53  clean:
    1.54  	-$(MAKE) -C mini-os LWIPDIR=$(CURDIR)/lwip-cvs clean
    1.55 +	-$(MAKE) -C mini-os TARGET=ioemu-stubdom LWIPDIR=$(CURDIR)/lwip-cvs clean
    1.56 +	-$(MAKE) -C mini-os TARGET=c-stubdom LWIPDIR=$(CURDIR)/lwip-cvs clean
    1.57 +	-$(MAKE) -C mini-os TARGET=caml-stubdom LWIPDIR=$(CURDIR)/lwip-cvs clean
    1.58  	$(MAKE) -C caml clean
    1.59  	$(MAKE) -C c clean
    1.60  	rm -fr libxc ioemu mini-os include