diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-03-10 17:13:25 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-03-10 17:13:25 +0000 |
| commit | cac9a79fa84c31e2f84fad81867faf8b866d6ed4 (patch) | |
| tree | 9382fbbf7a226c66112bc20347f9ffd661d68d00 | |
| parent | 518278b8c1a00f63087fa7b3fa686890a5cefafc (diff) | |
| download | xen-cac9a79fa84c31e2f84fad81867faf8b866d6ed4.tar.gz xen-cac9a79fa84c31e2f84fad81867faf8b866d6ed4.tar.bz2 xen-cac9a79fa84c31e2f84fad81867faf8b866d6ed4.zip | |
bitkeeper revision 1.777 (404f4cb5WovysmMe80HYkFhXdVbs9A)
Rules.mk, Makefile:
Xen uses TARGET_ARCH instead of ARCH for clarity and to prevent conflict with other uses of ARCH in the environment.
xend_utils.c:
Rename: tools/xend/xend.c -> tools/xend/xend_utils.c
| -rw-r--r-- | .rootkeys | 2 | ||||
| -rw-r--r-- | tools/xend/xend_utils.c (renamed from tools/xend/xend.c) | 0 | ||||
| -rw-r--r-- | xen/Makefile | 10 | ||||
| -rw-r--r-- | xen/Rules.mk | 10 |
4 files changed, 11 insertions, 11 deletions
@@ -88,7 +88,7 @@ 3fbd4bd6GtGwZGxYUJPOheYIR7bPaA tools/xc/py/XenoUtil.py 3fbd0a40yT6G3M9hMpaz5xTUdl0E4g tools/xc/py/setup.py 40431ac64Hj4ixUnKmlugZKhXPFE_Q tools/xend/Makefile -40431ac8wrUEj-XM7B8smFtx_HA7lQ tools/xend/xend.c +40431ac8wrUEj-XM7B8smFtx_HA7lQ tools/xend/xend_utils.c 403a3edbrr8RE34gkbR40zep98SXbg tools/xentrace/Makefile 403a3edbVpV2E_wq1zeEkJ_n4Uu2eg tools/xentrace/xentrace.c 403a3edb0lzD0Fojc-NYNoXr3SYrnA tools/xentrace/xentrace_cpusplit.py diff --git a/tools/xend/xend.c b/tools/xend/xend_utils.c index ef6e903ddd..ef6e903ddd 100644 --- a/tools/xend/xend.c +++ b/tools/xend/xend_utils.c diff --git a/xen/Makefile b/xen/Makefile index e0203fa699..7c19b75bb3 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -32,7 +32,7 @@ clean: delete-links $(MAKE) -C common clean $(MAKE) -C net clean $(MAKE) -C drivers clean - $(MAKE) -C arch/$(ARCH) clean + $(MAKE) -C arch/$(TARGET_ARCH) clean rm -f *.o $(TARGET)* *~ core $(GENERATED_FILES) $(TARGET): delete-unfresh-files make-links $(GENERATED_FILES) @@ -40,11 +40,11 @@ $(TARGET): delete-unfresh-files make-links $(GENERATED_FILES) $(MAKE) -C common $(MAKE) -C net $(MAKE) -C drivers - $(MAKE) -C arch/$(ARCH) + $(MAKE) -C arch/$(TARGET_ARCH) make-links: delete-links - ln -sf asm-$(ARCH) include/asm - ln -sf arch-$(ARCH) include/hypervisor-ifs/arch + ln -sf asm-$(TARGET_ARCH) include/asm + ln -sf arch-$(TARGET_ARCH) include/hypervisor-ifs/arch delete-links: rm -f include/asm include/hypervisor-ifs/arch @@ -77,7 +77,7 @@ include/xeno/compile.h: SUBDIRS = arch common drivers net TAGS: - etags `find include/asm-$(ARCH) -name '*.h'` + etags `find include/asm-$(TARGET_ARCH) -name '*.h'` find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs etags -a find $(SUBDIRS) -name '*.[ch]' | xargs etags -a MAP: diff --git a/xen/Rules.mk b/xen/Rules.mk index dc9c02993c..c96281116d 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -1,11 +1,11 @@ -ARCH ?= i386 -ARCH := $(ARCH:i%86=i386) +COMPILE_ARCH := $(shell uname -m | sed -e s/i.86/i386/) +TARGET_ARCH ?= $(COMPILE_ARCH) TARGET := $(BASEDIR)/xen HDRS := $(wildcard $(BASEDIR)/include/xeno/*.h) HDRS += $(wildcard $(BASEDIR)/include/scsi/*.h) HDRS += $(wildcard $(BASEDIR)/include/hypervisor-ifs/*.h) -HDRS += $(wildcard $(BASEDIR)/include/asm-$(ARCH)/*.h) +HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h) # compile.h is always regenerated, but other files shouldn't be rebuilt HDRS := $(subst $(BASEDIR)/include/xeno/compile.h,,$(HDRS)) @@ -25,12 +25,12 @@ ALL_OBJS += $(BASEDIR)/drivers/cdrom/driver.o ALL_OBJS += $(BASEDIR)/drivers/ide/driver.o ALL_OBJS += $(BASEDIR)/drivers/scsi/driver.o ALL_OBJS += $(BASEDIR)/drivers/message/fusion/driver.o -ALL_OBJS += $(BASEDIR)/arch/$(ARCH)/arch.o +ALL_OBJS += $(BASEDIR)/arch/$(TARGET_ARCH)/arch.o HOSTCC = gcc HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -include $(BASEDIR)/arch/$(ARCH)/Rules.mk +include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk %.o: %.c $(HDRS) Makefile $(CC) $(CFLAGS) -c $< -o $@ |