[Xen-changelog] Added missing header dependencies.

[BitKeeper B. <ri...@su...>]

ChangeSet 1.1458.1.1, 2004/10/29 09:28:20+01:00, maf...@fl...search

	Added missing header dependencies.
	Added an optimize switch (defaults to "y") to make it easier to
	build "-g -O0 -fno-omit-frame-pointer" versions of xen.



 Rules.mk          |    2 ++
 arch/x86/Rules.mk |   11 +++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)


diff -Nru a/xen/Rules.mk b/xen/Rules.mk
--- a/xen/Rules.mk	2004-10-29 07:00:48 -04:00
+++ b/xen/Rules.mk	2004-10-29 07:00:48 -04:00
@@ -4,6 +4,7 @@
 debugger    ?= n
 perfc       ?= n
 trace       ?= n
+optimize    ?= y
 
 # Currently supported architectures:
 #  {COMPILE,TARGET}_ARCH    := x86
@@ -19,6 +20,7 @@
 HDRS    += $(wildcard $(BASEDIR)/include/scsi/*.h)
 HDRS    += $(wildcard $(BASEDIR)/include/hypervisor-ifs/*.h)
 HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h)
+HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/$(TARGET_SUBARCH)/*.h)
 # compile.h is always regenerated, but other files shouldn't be rebuilt
 HDRS    := $(subst $(BASEDIR)/include/xen/compile.h,,$(HDRS))
 
diff -Nru a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
--- a/xen/arch/x86/Rules.mk	2004-10-29 07:00:48 -04:00
+++ b/xen/arch/x86/Rules.mk	2004-10-29 07:00:48 -04:00
@@ -4,9 +4,16 @@
 CC := gcc
 LD := ld
 
-CFLAGS  := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing -O3
-CFLAGS  += -iwithprefix include -Wall -Werror -fomit-frame-pointer -pipe
+CFLAGS  := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
+CFLAGS  += -iwithprefix include -Wall -Werror -pipe
 CFLAGS  += -I$(BASEDIR)/include -Wno-pointer-arith -Wredundant-decls
+
+ifeq ($(optimize),y)
+CFLAGS  += -O3 -fomit-frame-pointer
+else
+x86_32/usercopy.o: CFLAGS += -O1
+endif
+
 
 # Prevent floating-point variables from creeping into Xen.
 CFLAGS  += -msoft-float