ia64/xen-unstable

changeset 3778:dd0558f4a5e9

bitkeeper revision 1.1173 (420ba26dU4VauWP5oFVWCo3QsMg0Jw)

Make everything compile again.

Signed-off-by: sos22@cl.cam.ac.uk.
author sos22@douglas.cl.cam.ac.uk
date Thu Feb 10 18:05:33 2005 +0000 (2005-02-10)
parents c37c674174f7
children 0cd8803a1553
files xen/Rules.mk xen/arch/x86/Makefile
line diff
     1.1 --- a/xen/Rules.mk	Thu Feb 10 17:25:26 2005 +0000
     1.2 +++ b/xen/Rules.mk	Thu Feb 10 18:05:33 2005 +0000
     1.3 @@ -1,7 +1,6 @@
     1.4  
     1.5  verbose     ?= n
     1.6  debug       ?= n
     1.7 -debugger    ?= n
     1.8  perfc       ?= n
     1.9  trace       ?= n
    1.10  optimize    ?= y
    1.11 @@ -57,9 +56,6 @@ endif
    1.12  
    1.13  ifeq ($(crash_debug),y)
    1.14  CFLAGS += -g -DCRASH_DEBUG
    1.15 -ifeq ($(debugger),y)
    1.16 -error Crash debugger conflicts with PDB
    1.17 -endif
    1.18  endif
    1.19  
    1.20  ifeq ($(perfc),y)
     2.1 --- a/xen/arch/x86/Makefile	Thu Feb 10 17:25:26 2005 +0000
     2.2 +++ b/xen/arch/x86/Makefile	Thu Feb 10 18:05:33 2005 +0000
     2.3 @@ -12,7 +12,8 @@ OBJS := $(patsubst vmx%.o,,$(OBJS))
     2.4  endif
     2.5  
     2.6  ifneq ($(crash_debug),y)
     2.7 -OBJS := $(subst cdb%.o,,$(OBJS))
     2.8 +OBJS := $(patsubst cdb%.o,,$(OBJS))
     2.9 +OBJS := $(patsubst $(TARGET_SUBARCH)/cdb%.o,,$(OBJS))
    2.10  endif
    2.11  
    2.12  default: $(TARGET)