ChangeSet 1.1277.1.4, 2005/04/13 10:17:29-06:00, djm@sportsman.spdomain
mkbuildtree, Rules.mk, Makefile:
minor makefile cleanups
Makefile | 10 +---------
Rules.mk | 21 ++++-----------------
tools/mkbuildtree | 1 -
3 files changed, 5 insertions(+), 27 deletions(-)
diff -Nru a/xen/arch/ia64/Makefile b/xen/arch/ia64/Makefile
--- a/xen/arch/ia64/Makefile 2005-04-20 05:03:21 -04:00
+++ b/xen/arch/ia64/Makefile 2005-04-20 05:03:21 -04:00
@@ -18,19 +18,11 @@
# remove following line if not privifying in memory
# OBJS += privify.o
-# What happens here? We link monitor object files together, starting
-# at MONITOR_BASE (a very high address). But bootloader cannot put
-# things there, so we initially load at LOAD_BASE. A hacky little
-# tool called `elf-reloc' is used to modify segment offsets from
-# MONITOR_BASE-relative to LOAD_BASE-relative.
-# (NB. Linux gets round this by turning its image into raw binary, then
-# wrapping that with a low-memory bootstrapper.)
default: $(OBJS) head.o ia64lib.o xen.lds.s
$(LD) -r -o arch.o $(OBJS) ia64lib.o
$(LD) $(LDFLAGS) -T $(BASEDIR)/arch/$(TARGET_ARCH)/xen.lds.s -N \
-Map map.out head.o $(ALL_OBJS) -o $(TARGET)-syms
$(OBJCOPY) -R .note -R .comment -S $(TARGET)-syms $(TARGET)
-# $(BASEDIR)/tools/elf-reloc $(MONITOR_BASE) $(LOAD_BASE) $(TARGET)
asm-offsets.s: asm-offsets.c
$(CC) $(CFLAGS) -S -o $@ $<
@@ -45,7 +37,7 @@
clean:
rm -f *.o *~ core xen.lds.s $(BASEDIR)/include/asm-ia64/.offsets.h.stamp
- $(MAKE) -C lib clean
+ rm -f lib/*.o
# setup.o contains bits of compile.h so it must be blown away
delete-unfresh-files:
diff -Nru a/xen/arch/ia64/Rules.mk b/xen/arch/ia64/Rules.mk
--- a/xen/arch/ia64/Rules.mk 2005-04-20 05:03:21 -04:00
+++ b/xen/arch/ia64/Rules.mk 2005-04-20 05:03:21 -04:00
@@ -1,33 +1,20 @@
########################################
-# x86-specific definitions
+# ia64-specific definitions
-ifeq ($(COMPILE_ARCH),$(TARGET_ARCH))
-OBJCOPY = objcopy
-endif
ifneq ($(COMPILE_ARCH),$(TARGET_ARCH))
-CC = /usr/local/sp_env/v2.2.5/i686/bin/ia64-unknown-linux-gcc
-LD = /usr/local/sp_env/v2.2.5/i686/bin/ia64-unknown-linux-ld
-OBJCOPY = /usr/local/sp_env/v2.2/i686/bin/ia64-unknown-linux-objcopy
+CROSS_COMPILE ?= /usr/local/sp_env/v2.2.5/i686/bin/ia64-unknown-linux-
endif
-HOSTCC := gcc
-#LD := ld
-# Linker should relocate monitor to this address
-MONITOR_BASE := 0xFC500000
-# Bootloader should load monitor to this real address
-LOAD_BASE := 0x00100000
AFLAGS += -D__ASSEMBLY__
CPPFLAGS += -I$(BASEDIR)/include -I$(BASEDIR)/include/asm-ia64
CFLAGS := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
#CFLAGS += -O3 # -O3 over-inlines making debugging tough!
CFLAGS += -O2 # but no optimization causes compile errors!
-CFLAGS += -iwithprefix include -Wall -DMONITOR_BASE=$(MONITOR_BASE)
+#CFLAGS += -iwithprefix include -Wall -DMONITOR_BASE=$(MONITOR_BASE)
+CFLAGS += -iwithprefix include -Wall
CFLAGS += -fomit-frame-pointer -I$(BASEDIR)/include -D__KERNEL__
CFLAGS += -I$(BASEDIR)/include/asm-ia64
CFLAGS += -Wno-pointer-arith -Wredundant-decls
CFLAGS += -DIA64 -DXEN -DLINUX_2_6
CFLAGS += -ffixed-r13 -mfixed-range=f12-f15,f32-f127
CFLAGS += -w -g
-#TARGET_CPU := i686
-#CFLAGS += -march=$(TARGET_CPU)
-#LDARCHFLAGS := --oformat elf32-i386
LDFLAGS := -g
diff -Nru a/xen/arch/ia64/tools/mkbuildtree b/xen/arch/ia64/tools/mkbuildtree
--- a/xen/arch/ia64/tools/mkbuildtree 2005-04-20 05:03:21 -04:00
+++ b/xen/arch/ia64/tools/mkbuildtree 2005-04-20 05:03:21 -04:00
@@ -34,7 +34,6 @@
# ensure linux directory is set up
if [ ! -d $LINUX ]; then
echo "ERROR: $LINUX directory doesn't exist"
- echo "(don't forget to apply the -ia64 patch to it too)"
exit
fi
_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog
mkbuildtree, Rules.mk, Makefile:
minor makefile cleanups
Makefile | 10 +---------
Rules.mk | 21 ++++-----------------
tools/mkbuildtree | 1 -
3 files changed, 5 insertions(+), 27 deletions(-)
diff -Nru a/xen/arch/ia64/Makefile b/xen/arch/ia64/Makefile
--- a/xen/arch/ia64/Makefile 2005-04-20 05:03:21 -04:00
+++ b/xen/arch/ia64/Makefile 2005-04-20 05:03:21 -04:00
@@ -18,19 +18,11 @@
# remove following line if not privifying in memory
# OBJS += privify.o
-# What happens here? We link monitor object files together, starting
-# at MONITOR_BASE (a very high address). But bootloader cannot put
-# things there, so we initially load at LOAD_BASE. A hacky little
-# tool called `elf-reloc' is used to modify segment offsets from
-# MONITOR_BASE-relative to LOAD_BASE-relative.
-# (NB. Linux gets round this by turning its image into raw binary, then
-# wrapping that with a low-memory bootstrapper.)
default: $(OBJS) head.o ia64lib.o xen.lds.s
$(LD) -r -o arch.o $(OBJS) ia64lib.o
$(LD) $(LDFLAGS) -T $(BASEDIR)/arch/$(TARGET_ARCH)/xen.lds.s -N \
-Map map.out head.o $(ALL_OBJS) -o $(TARGET)-syms
$(OBJCOPY) -R .note -R .comment -S $(TARGET)-syms $(TARGET)
-# $(BASEDIR)/tools/elf-reloc $(MONITOR_BASE) $(LOAD_BASE) $(TARGET)
asm-offsets.s: asm-offsets.c
$(CC) $(CFLAGS) -S -o $@ $<
@@ -45,7 +37,7 @@
clean:
rm -f *.o *~ core xen.lds.s $(BASEDIR)/include/asm-ia64/.offsets.h.stamp
- $(MAKE) -C lib clean
+ rm -f lib/*.o
# setup.o contains bits of compile.h so it must be blown away
delete-unfresh-files:
diff -Nru a/xen/arch/ia64/Rules.mk b/xen/arch/ia64/Rules.mk
--- a/xen/arch/ia64/Rules.mk 2005-04-20 05:03:21 -04:00
+++ b/xen/arch/ia64/Rules.mk 2005-04-20 05:03:21 -04:00
@@ -1,33 +1,20 @@
########################################
-# x86-specific definitions
+# ia64-specific definitions
-ifeq ($(COMPILE_ARCH),$(TARGET_ARCH))
-OBJCOPY = objcopy
-endif
ifneq ($(COMPILE_ARCH),$(TARGET_ARCH))
-CC = /usr/local/sp_env/v2.2.5/i686/bin/ia64-unknown-linux-gcc
-LD = /usr/local/sp_env/v2.2.5/i686/bin/ia64-unknown-linux-ld
-OBJCOPY = /usr/local/sp_env/v2.2/i686/bin/ia64-unknown-linux-objcopy
+CROSS_COMPILE ?= /usr/local/sp_env/v2.2.5/i686/bin/ia64-unknown-linux-
endif
-HOSTCC := gcc
-#LD := ld
-# Linker should relocate monitor to this address
-MONITOR_BASE := 0xFC500000
-# Bootloader should load monitor to this real address
-LOAD_BASE := 0x00100000
AFLAGS += -D__ASSEMBLY__
CPPFLAGS += -I$(BASEDIR)/include -I$(BASEDIR)/include/asm-ia64
CFLAGS := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
#CFLAGS += -O3 # -O3 over-inlines making debugging tough!
CFLAGS += -O2 # but no optimization causes compile errors!
-CFLAGS += -iwithprefix include -Wall -DMONITOR_BASE=$(MONITOR_BASE)
+#CFLAGS += -iwithprefix include -Wall -DMONITOR_BASE=$(MONITOR_BASE)
+CFLAGS += -iwithprefix include -Wall
CFLAGS += -fomit-frame-pointer -I$(BASEDIR)/include -D__KERNEL__
CFLAGS += -I$(BASEDIR)/include/asm-ia64
CFLAGS += -Wno-pointer-arith -Wredundant-decls
CFLAGS += -DIA64 -DXEN -DLINUX_2_6
CFLAGS += -ffixed-r13 -mfixed-range=f12-f15,f32-f127
CFLAGS += -w -g
-#TARGET_CPU := i686
-#CFLAGS += -march=$(TARGET_CPU)
-#LDARCHFLAGS := --oformat elf32-i386
LDFLAGS := -g
diff -Nru a/xen/arch/ia64/tools/mkbuildtree b/xen/arch/ia64/tools/mkbuildtree
--- a/xen/arch/ia64/tools/mkbuildtree 2005-04-20 05:03:21 -04:00
+++ b/xen/arch/ia64/tools/mkbuildtree 2005-04-20 05:03:21 -04:00
@@ -34,7 +34,6 @@
# ensure linux directory is set up
if [ ! -d $LINUX ]; then
echo "ERROR: $LINUX directory doesn't exist"
- echo "(don't forget to apply the -ia64 patch to it too)"
exit
fi
_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog