debuggers.hg

changeset 4557:20c0d8bc45ff

bitkeeper revision 1.1277.1.4 (425d4619QQPyUhs4FSWUJMPPTkuiVg)

mkbuildtree, Rules.mk, Makefile:
minor makefile cleanups
author djm@sportsman.spdomain
date Wed Apr 13 16:17:29 2005 +0000 (2005-04-13)
parents a8466d0e2992
children 1f457fed92df
files xen/arch/ia64/Makefile xen/arch/ia64/Rules.mk xen/arch/ia64/tools/mkbuildtree
line diff
     1.1 --- a/xen/arch/ia64/Makefile	Mon Apr 11 21:29:42 2005 +0000
     1.2 +++ b/xen/arch/ia64/Makefile	Wed Apr 13 16:17:29 2005 +0000
     1.3 @@ -18,19 +18,11 @@ OBJS := $(subst $(TARGET_ARCH)/asm-offse
     1.4  # remove following line if not privifying in memory
     1.5  # OBJS += privify.o
     1.6  
     1.7 -# What happens here? We link monitor object files together, starting
     1.8 -# at MONITOR_BASE (a very high address). But bootloader cannot put
     1.9 -# things there, so we initially load at LOAD_BASE. A hacky little
    1.10 -# tool called `elf-reloc' is used to modify segment offsets from
    1.11 -# MONITOR_BASE-relative to LOAD_BASE-relative.
    1.12 -# (NB. Linux gets round this by turning its image into raw binary, then 
    1.13 -# wrapping that with a low-memory bootstrapper.)
    1.14  default: $(OBJS) head.o ia64lib.o xen.lds.s
    1.15  	$(LD) -r -o arch.o $(OBJS) ia64lib.o
    1.16  	$(LD) $(LDFLAGS) -T $(BASEDIR)/arch/$(TARGET_ARCH)/xen.lds.s -N \
    1.17  		-Map map.out head.o $(ALL_OBJS) -o $(TARGET)-syms
    1.18  	$(OBJCOPY) -R .note -R .comment -S $(TARGET)-syms $(TARGET)
    1.19 -#	$(BASEDIR)/tools/elf-reloc $(MONITOR_BASE) $(LOAD_BASE) $(TARGET)
    1.20  
    1.21  asm-offsets.s: asm-offsets.c
    1.22  	$(CC) $(CFLAGS) -S -o $@ $<
    1.23 @@ -45,7 +37,7 @@ ia64lib.o:
    1.24  
    1.25  clean:
    1.26  	rm -f *.o *~ core  xen.lds.s $(BASEDIR)/include/asm-ia64/.offsets.h.stamp
    1.27 -	$(MAKE) -C lib clean
    1.28 +	rm -f lib/*.o
    1.29  
    1.30  # setup.o contains bits of compile.h so it must be blown away
    1.31  delete-unfresh-files:
     2.1 --- a/xen/arch/ia64/Rules.mk	Mon Apr 11 21:29:42 2005 +0000
     2.2 +++ b/xen/arch/ia64/Rules.mk	Wed Apr 13 16:17:29 2005 +0000
     2.3 @@ -1,33 +1,20 @@
     2.4  ########################################
     2.5 -# x86-specific definitions
     2.6 +# ia64-specific definitions
     2.7  
     2.8 -ifeq ($(COMPILE_ARCH),$(TARGET_ARCH))
     2.9 -OBJCOPY = objcopy
    2.10 -endif
    2.11  ifneq ($(COMPILE_ARCH),$(TARGET_ARCH))
    2.12 -CC = /usr/local/sp_env/v2.2.5/i686/bin/ia64-unknown-linux-gcc
    2.13 -LD = /usr/local/sp_env/v2.2.5/i686/bin/ia64-unknown-linux-ld
    2.14 -OBJCOPY = /usr/local/sp_env/v2.2/i686/bin/ia64-unknown-linux-objcopy
    2.15 +CROSS_COMPILE ?= /usr/local/sp_env/v2.2.5/i686/bin/ia64-unknown-linux-
    2.16  endif
    2.17 -HOSTCC := gcc
    2.18 -#LD := ld
    2.19 -# Linker should relocate monitor to this address
    2.20 -MONITOR_BASE := 0xFC500000
    2.21 -# Bootloader should load monitor to this real address
    2.22 -LOAD_BASE    := 0x00100000
    2.23  AFLAGS  += -D__ASSEMBLY__
    2.24  CPPFLAGS  += -I$(BASEDIR)/include -I$(BASEDIR)/include/asm-ia64
    2.25  CFLAGS  := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
    2.26  #CFLAGS  += -O3		# -O3 over-inlines making debugging tough!
    2.27  CFLAGS  += -O2		# but no optimization causes compile errors!
    2.28 -CFLAGS  += -iwithprefix include -Wall -DMONITOR_BASE=$(MONITOR_BASE)
    2.29 +#CFLAGS  += -iwithprefix include -Wall -DMONITOR_BASE=$(MONITOR_BASE)
    2.30 +CFLAGS  += -iwithprefix include -Wall
    2.31  CFLAGS  += -fomit-frame-pointer -I$(BASEDIR)/include -D__KERNEL__
    2.32  CFLAGS  += -I$(BASEDIR)/include/asm-ia64
    2.33  CFLAGS  += -Wno-pointer-arith -Wredundant-decls
    2.34  CFLAGS  += -DIA64 -DXEN -DLINUX_2_6
    2.35  CFLAGS	+= -ffixed-r13 -mfixed-range=f12-f15,f32-f127
    2.36  CFLAGS	+= -w -g
    2.37 -#TARGET_CPU := i686
    2.38 -#CFLAGS += -march=$(TARGET_CPU)
    2.39 -#LDARCHFLAGS := --oformat elf32-i386 
    2.40  LDFLAGS := -g
     3.1 --- a/xen/arch/ia64/tools/mkbuildtree	Mon Apr 11 21:29:42 2005 +0000
     3.2 +++ b/xen/arch/ia64/tools/mkbuildtree	Wed Apr 13 16:17:29 2005 +0000
     3.3 @@ -34,7 +34,6 @@ null ()
     3.4  # ensure linux directory is set up
     3.5  if [ ! -d $LINUX ]; then
     3.6  	echo "ERROR: $LINUX directory doesn't exist"
     3.7 -	echo "(don't forget to apply the -ia64 patch to it too)"
     3.8  	exit
     3.9  fi
    3.10