ia64/xen-unstable

changeset 3906:8e0ac8ed218b

bitkeeper revision 1.1236.1.7 (421d9a5b-DJu8ku3gvpHa3t6ChqYKQ)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno-unstable-ia64.bk
author kaf24@scramble.cl.cam.ac.uk
date Thu Feb 24 09:11:55 2005 +0000 (2005-02-24)
parents 27a2fdfeba20 466b1803a61f
children a456c4743c0f
files tools/Makefile tools/Rules.mk tools/libxc/Makefile tools/libxutil/Makefile tools/misc/miniterm/Makefile tools/xcs/Makefile xen/Makefile
line diff
     1.1 --- a/tools/Makefile	Thu Feb 24 02:15:50 2005 +0000
     1.2 +++ b/tools/Makefile	Thu Feb 24 09:11:55 2005 +0000
     1.3 @@ -25,6 +25,7 @@ install:
     1.4  	$(MAKE) -C ioemu install
     1.5  
     1.6  clean:
     1.7 +	$(MAKE) -C check clean
     1.8  	$(MAKE) -C libxutil clean
     1.9  	$(MAKE) -C libxc clean
    1.10  	$(MAKE) -C misc clean
     2.1 --- a/tools/Rules.mk	Thu Feb 24 02:15:50 2005 +0000
     2.2 +++ b/tools/Rules.mk	Thu Feb 24 09:11:55 2005 +0000
     2.3 @@ -4,6 +4,9 @@ XEN_XC             = $(XEN_ROOT)/tools/p
     2.4  XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
     2.5  XEN_LIBXUTIL       = $(XEN_ROOT)/tools/libxutil
     2.6  
     2.7 +COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
     2.8 +TARGET_ARCH     ?= $(COMPILE_ARCH)
     2.9 +
    2.10  ifeq ($(TARGET_ARCH),x86_32)
    2.11  CFLAGS  += -m32 -march=i686
    2.12  LDFLAGS += -m elf_i386
    2.13 @@ -13,3 +16,9 @@ ifeq ($(TARGET_ARCH),x86_64)
    2.14  CFLAGS  += -m64
    2.15  LDFLAGS += -m elf_x86_64
    2.16  endif
    2.17 +
    2.18 +%.opic: %.c
    2.19 +	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
    2.20 +
    2.21 +%.o: %.c
    2.22 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
     3.1 --- a/tools/libxc/Makefile	Thu Feb 24 02:15:50 2005 +0000
     3.2 +++ b/tools/libxc/Makefile	Thu Feb 24 09:11:55 2005 +0000
     3.3 @@ -1,11 +1,3 @@
     3.4 -
     3.5 -ifndef BUILD_PIC_LIBS
     3.6 -ifeq ($(wildcard /etc/debian_version),)
     3.7 -BUILD_PIC_LIBS=n
     3.8 -else
     3.9 -BUILD_PIC_LIBS=y
    3.10 -endif
    3.11 -endif
    3.12  
    3.13  INSTALL		= install
    3.14  INSTALL_PROG	= $(INSTALL) -m0755
    3.15 @@ -101,9 +93,6 @@ rpm: all
    3.16  	mv staging/i386/*.rpm .
    3.17  	rm -rf staging
    3.18  
    3.19 -$(PIC_OBJS): %.opic: %.c
    3.20 -	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
    3.21 -
    3.22  libxc.a: $(OBJS)
    3.23  	$(AR) rc $@ $^
    3.24  
    3.25 @@ -112,12 +101,7 @@ libxc.so: libxc.so.$(MAJOR)
    3.26  libxc.so.$(MAJOR): libxc.so.$(MAJOR).$(MINOR)
    3.27  	ln -sf $< $@
    3.28  
    3.29 -ifeq ($(BUILD_PIC_LIBS),y)
    3.30  libxc.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
    3.31  	$(CC) -Wl,-soname -Wl,libxc.so.$(MAJOR) -shared -o $@ $^ -L../libxutil -lxutil -lz
    3.32 -else
    3.33 -libxc.so.$(MAJOR).$(MINOR): $(LIB_OBJS)
    3.34 -	$(CC) -Wl,-soname -Wl,libxc.so.$(MAJOR) -shared -o $@ $^ -L../libxutil -lxutil -lz
    3.35 -endif
    3.36  
    3.37  -include $(DEPS)
     4.1 --- a/tools/libxutil/Makefile	Thu Feb 24 02:15:50 2005 +0000
     4.2 +++ b/tools/libxutil/Makefile	Thu Feb 24 09:11:55 2005 +0000
     4.3 @@ -1,11 +1,3 @@
     4.4 -
     4.5 -ifndef BUILD_PIC_LIBS
     4.6 -ifeq ($(wildcard /etc/debian_version),)
     4.7 -BUILD_PIC_LIBS=n
     4.8 -else
     4.9 -BUILD_PIC_LIBS=y
    4.10 -endif
    4.11 -endif
    4.12  
    4.13  XEN_ROOT = ../..
    4.14  INSTALL		= install
    4.15 @@ -51,22 +43,14 @@ LIB      += libxutil.a
    4.16  all: check-for-zlib
    4.17  	$(MAKE) $(LIB)
    4.18  
    4.19 -$(PIC_OBJS): %.opic: %.c
    4.20 -	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
    4.21 -
    4.22  libxutil.so: libxutil.so.$(MAJOR)
    4.23  	ln -sf $^ $@
    4.24  
    4.25  libxutil.so.$(MAJOR): libxutil.so.$(MAJOR).$(MINOR)
    4.26  	ln -sf $^ $@
    4.27  
    4.28 -ifeq ($(BUILD_PIC_LIBS),y)
    4.29  libxutil.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
    4.30  	$(CC) -Wl,-soname -Wl,libxutil.so.$(MAJOR) -shared -o $@ $^
    4.31 -else
    4.32 -libxutil.so.$(MAJOR).$(MINOR): $(LIB_OBJS)
    4.33 -	$(CC) -Wl,-soname -Wl,libxutil.so.$(MAJOR) -shared -o $@ $^
    4.34 -endif
    4.35  
    4.36  libxutil.a: $(LIB_OBJS)
    4.37  	$(AR) rc $@ $^
     5.1 --- a/tools/misc/miniterm/Makefile	Thu Feb 24 02:15:50 2005 +0000
     5.2 +++ b/tools/misc/miniterm/Makefile	Thu Feb 24 09:11:55 2005 +0000
     5.3 @@ -14,3 +14,6 @@ install: all
     5.4  
     5.5  clean:
     5.6  	$(RM) *.o $(TARGET) *~
     5.7 +
     5.8 +$(TARGET): $(TARGET).c
     5.9 +	$(CC) $(CFLAGS) -o $@ $<
     6.1 --- a/tools/xcs/Makefile	Thu Feb 24 02:15:50 2005 +0000
     6.2 +++ b/tools/xcs/Makefile	Thu Feb 24 09:11:55 2005 +0000
     6.3 @@ -31,7 +31,7 @@ BIN      = xcs
     6.4  all: $(BIN) xcsdump
     6.5  
     6.6  clean:
     6.7 -	$(RM) *.a *.so *.o *.rpm $(BIN) ctrl_dump
     6.8 +	$(RM) *.a *.so *.o *.rpm $(BIN) xcsdump
     6.9  
    6.10  xcsdump: xcsdump.c
    6.11  	$(CC) $(CFLAGS) -o xcsdump xcsdump.c -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) \
     7.1 --- a/xen/Makefile	Thu Feb 24 02:15:50 2005 +0000
     7.2 +++ b/xen/Makefile	Thu Feb 24 09:11:55 2005 +0000
     7.3 @@ -37,12 +37,12 @@ install: $(TARGET).gz
     7.4  	$(INSTALL_DATA) include/public/io/*.h $(DESTDIR)/usr/include/xen/io
     7.5  	$(INSTALL_DATA) include/public/COPYING $(DESTDIR)/usr/include/xen
     7.6  
     7.7 -clean:
     7.8 +clean: delete-unfresh-files
     7.9  	$(MAKE) -C tools clean
    7.10  	$(MAKE) -C common clean
    7.11  	$(MAKE) -C drivers clean
    7.12  	$(MAKE) -C arch/$(TARGET_ARCH) clean
    7.13 -	rm -f include/asm *.o $(TARGET)* *~ core include/xen/compile.h
    7.14 +	rm -f include/asm *.o $(TARGET)* *~ core
    7.15  	rm -f include/asm-*/asm-offsets.h
    7.16  	rm -f tools/figlet/*.o tools/figlet/figlet
    7.17