direct-io.hg
changeset 3317:a2352469313f
bitkeeper revision 1.1159.1.499 (41c98e4dmK1aL0WxfC5e06SAvZye5A)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author | kaf24@scramble.cl.cam.ac.uk |
---|---|
date | Wed Dec 22 15:10:05 2004 +0000 (2004-12-22) |
parents | 32952707e391 5855ed6e8243 |
children | feb29654f4d9 |
files | xen/arch/x86/Rules.mk xen/arch/x86/domain.c |
line diff
1.1 --- a/xen/arch/x86/Rules.mk Wed Dec 22 11:06:48 2004 +0000 1.2 +++ b/xen/arch/x86/Rules.mk Wed Dec 22 15:10:05 2004 +0000 1.3 @@ -32,3 +32,20 @@ CFLAGS += -m64 -mno-red-zone -fpic -fno 1.4 CFLAGS += -fno-asynchronous-unwind-tables 1.5 LDFLAGS := --oformat elf64-x86-64 1.6 endif 1.7 + 1.8 +# Test for at least GCC v3.2.x. 1.9 +gcc-ver = $(shell $(CC) -dumpversion | sed -e 's/^\(.\)\.\(.\)\.\(.\)/\$(1)/') 1.10 +ifeq ($(call gcc-ver,1),1) 1.11 +$(error gcc-1.x.x unsupported - upgrade to at least gcc-3.2.x) 1.12 +endif 1.13 +ifeq ($(call gcc-ver,1),2) 1.14 +$(error gcc-2.x.x unsupported - upgrade to at least gcc-3.2.x) 1.15 +endif 1.16 +ifeq ($(call gcc-ver,1),3) 1.17 +ifeq ($(call gcc-ver,2),0) 1.18 +$(error gcc-3.0.x unsupported - upgrade to at least gcc-3.2.x) 1.19 +endif 1.20 +ifeq ($(call gcc-ver,2),1) 1.21 +$(error gcc-3.1.x unsupported - upgrade to at least gcc-3.2.x) 1.22 +endif 1.23 +endif
2.1 --- a/xen/arch/x86/domain.c Wed Dec 22 11:06:48 2004 +0000 2.2 +++ b/xen/arch/x86/domain.c Wed Dec 22 15:10:05 2004 +0000 2.3 @@ -61,7 +61,7 @@ static void default_idle(void) 2.4 __sti(); 2.5 } 2.6 2.7 -void idle_loop(void) 2.8 +static __attribute_used__ void idle_loop(void) 2.9 { 2.10 int cpu = smp_processor_id(); 2.11 for ( ; ; )