ia64/xen-unstable

changeset 128:6e6899e5357c

bitkeeper revision 1.22.2.5 (3e450945yLX8dj3rzOsyoJx2Fo5A8g)

Now builds with -nostdinc to avoid confusion about where include files are coming from
author iap10@labyrinth.cl.cam.ac.uk
date Sat Feb 08 13:42:29 2003 +0000 (2003-02-08)
parents 88c1cf85fc8f
children 314a968df74d
files .rootkeys xen-2.4.16/Rules.mk xen-2.4.16/arch/i386/Rules.mk xen-2.4.16/drivers/pci/Makefile xen-2.4.16/include/asm-i386/param.h xen-2.4.16/include/asm-i386/timex.h xen-2.4.16/include/stdarg.h
line diff
     1.1 --- a/.rootkeys	Fri Feb 07 00:41:06 2003 +0000
     1.2 +++ b/.rootkeys	Sat Feb 08 13:42:29 2003 +0000
     1.3 @@ -147,6 +147,7 @@ 3ddb79c3I98vWcQR8xEo34JMJ4Ahyw xen-2.4.1
     1.4  3ddb79c3n_UbPuxlkNxvvLycClIkxA xen-2.4.16/include/asm-i386/mpspec.h
     1.5  3ddb79c2wa0dA_LGigxOelSGbJ284Q xen-2.4.16/include/asm-i386/msr.h
     1.6  3ddb79c3xjYnrv5t3VqYlR4tNEOl4Q xen-2.4.16/include/asm-i386/page.h
     1.7 +3e450943kzme29HPCtq5HNOVQkddfw xen-2.4.16/include/asm-i386/param.h
     1.8  3ddb79c3ysKUbxZuwKBRK3WXU2TlEg xen-2.4.16/include/asm-i386/pci.h
     1.9  3ddb79c3nm2zdzeO6Mj8g7ex3txgGw xen-2.4.16/include/asm-i386/pgalloc.h
    1.10  3ddb79c2QF5-pZGzuX4QukPCDAl59A xen-2.4.16/include/asm-i386/processor.h
    1.11 @@ -158,6 +159,7 @@ 3ddb79c3jn8ALV_S9W5aeTYUQRKBpg xen-2.4.1
    1.12  3ddb79c3e9DCEoR-WzNxcOQDzLu7BQ xen-2.4.16/include/asm-i386/softirq.h
    1.13  3ddb79c3NiyQE2vQnyGiaBnNjBO1rA xen-2.4.16/include/asm-i386/spinlock.h
    1.14  3ddb79c3ezddh34MdelJpa5tNR00Dw xen-2.4.16/include/asm-i386/system.h
    1.15 +3e450943TfE-iovQIY_tMO_VdGsPhA xen-2.4.16/include/asm-i386/timex.h
    1.16  3ddb79c4HugMq7IYGxcQKFBpKwKhzA xen-2.4.16/include/asm-i386/types.h
    1.17  3ddb79c3M2n1ROZH6xk3HbyN4CPDqg xen-2.4.16/include/asm-i386/uaccess.h
    1.18  3ddb79c3uPGcP_l_2xyGgBSWd5aC-Q xen-2.4.16/include/asm-i386/unaligned.h
    1.19 @@ -168,6 +170,7 @@ 3ddb79c4qbCoOFHrv9sCGshbWzBVlQ xen-2.4.1
    1.20  3ddb79c4R4iVwqIIeychVQYmIH4FUg xen-2.4.16/include/scsi/scsi_ioctl.h
    1.21  3ddb79c4yw_mfd4Uikn3v_IOPRpa1Q xen-2.4.16/include/scsi/scsicam.h
    1.22  3ddb79c4HKPMLvDBP9LxzPi_szVxGA xen-2.4.16/include/scsi/sg.h
    1.23 +3e450943xQztorJxTGW3BPZ4LhRHbw xen-2.4.16/include/stdarg.h
    1.24  3ddb79c0nTsjSpVK4ZVTI9WwN24xtQ xen-2.4.16/include/xeno/blk.h
    1.25  3ddb79c0dVhTHLsv6CPTf4baKix4mA xen-2.4.16/include/xeno/blkdev.h
    1.26  3ddb79c18ePBgitnOs7GiOCFilODVw xen-2.4.16/include/xeno/blkpg.h
     2.1 --- a/xen-2.4.16/Rules.mk	Fri Feb 07 00:41:06 2003 +0000
     2.2 +++ b/xen-2.4.16/Rules.mk	Sat Feb 08 13:42:29 2003 +0000
     2.3 @@ -21,6 +21,9 @@ ALL_OBJS += $(BASEDIR)/drivers/block/dri
     2.4  ALL_OBJS += $(BASEDIR)/drivers/ide/driver.o
     2.5  ALL_OBJS += $(BASEDIR)/arch/$(ARCH)/arch.o
     2.6  
     2.7 +HOSTCC     = gcc
     2.8 +HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer 
     2.9 +
    2.10  include $(BASEDIR)/arch/$(ARCH)/Rules.mk
    2.11  
    2.12  %.o: %.c $(HDRS) Makefile
     3.1 --- a/xen-2.4.16/arch/i386/Rules.mk	Fri Feb 07 00:41:06 2003 +0000
     3.2 +++ b/xen-2.4.16/arch/i386/Rules.mk	Sat Feb 08 13:42:29 2003 +0000
     3.3 @@ -7,7 +7,7 @@ LD := ld
     3.4  MONITOR_BASE := 0xFC500000
     3.5  # Bootloader should load monitor to this real address
     3.6  LOAD_BASE    := 0x00100000
     3.7 -CFLAGS  := -fno-builtin -O3 -Wall -DMONITOR_BASE=$(MONITOR_BASE) 
     3.8 +CFLAGS  := -nostdinc -fno-builtin -O3 -Wall -DMONITOR_BASE=$(MONITOR_BASE) 
     3.9  CFLAGS  += -I$(BASEDIR)/include -D__KERNEL__ -DNDEBUG
    3.10  LDFLAGS := -T xeno.lds -N
    3.11  
     4.1 --- a/xen-2.4.16/drivers/pci/Makefile	Fri Feb 07 00:41:06 2003 +0000
     4.2 +++ b/xen-2.4.16/drivers/pci/Makefile	Sat Feb 08 13:42:29 2003 +0000
     4.3 @@ -40,4 +40,5 @@ devlist.h classlist.h: pci.ids gen-devli
     4.4  	./gen-devlist <pci.ids
     4.5  
     4.6  gen-devlist: gen-devlist.c
     4.7 -	$(CC) $(CFLAGS) -o gen-devlist gen-devlist.c
     4.8 +	$(HOSTCC) $(HOSTCFLAGS) -o gen-devlist gen-devlist.c
     4.9 +
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/xen-2.4.16/include/asm-i386/param.h	Sat Feb 08 13:42:29 2003 +0000
     5.3 @@ -0,0 +1,24 @@
     5.4 +#ifndef _ASMi386_PARAM_H
     5.5 +#define _ASMi386_PARAM_H
     5.6 +
     5.7 +#ifndef HZ
     5.8 +#define HZ 100
     5.9 +#endif
    5.10 +
    5.11 +#define EXEC_PAGESIZE	4096
    5.12 +
    5.13 +#ifndef NGROUPS
    5.14 +#define NGROUPS		32
    5.15 +#endif
    5.16 +
    5.17 +#ifndef NOGROUP
    5.18 +#define NOGROUP		(-1)
    5.19 +#endif
    5.20 +
    5.21 +#define MAXHOSTNAMELEN	64	/* max length of hostname */
    5.22 +
    5.23 +#ifdef __KERNEL__
    5.24 +# define CLOCKS_PER_SEC	100	/* frequency at which times() counts */
    5.25 +#endif
    5.26 +
    5.27 +#endif
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/xen-2.4.16/include/asm-i386/timex.h	Sat Feb 08 13:42:29 2003 +0000
     6.3 @@ -0,0 +1,58 @@
     6.4 +/*
     6.5 + * linux/include/asm-i386/timex.h
     6.6 + *
     6.7 + * i386 architecture timex specifications
     6.8 + */
     6.9 +#ifndef _ASMi386_TIMEX_H
    6.10 +#define _ASMi386_TIMEX_H
    6.11 +
    6.12 +#include <linux/config.h>
    6.13 +#include <asm/msr.h>
    6.14 +
    6.15 +#ifdef CONFIG_MELAN
    6.16 +#  define CLOCK_TICK_RATE 1189200 /* AMD Elan has different frequency! */
    6.17 +#else
    6.18 +#  define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
    6.19 +#endif
    6.20 +
    6.21 +#define CLOCK_TICK_FACTOR	20	/* Factor of both 1000000 and CLOCK_TICK_RATE */
    6.22 +#define FINETUNE ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \
    6.23 +	(1000000/CLOCK_TICK_FACTOR) / (CLOCK_TICK_RATE/CLOCK_TICK_FACTOR)) \
    6.24 +		<< (SHIFT_SCALE-SHIFT_HZ)) / HZ)
    6.25 +
    6.26 +/*
    6.27 + * Standard way to access the cycle counter on i586+ CPUs.
    6.28 + * Currently only used on SMP.
    6.29 + *
    6.30 + * If you really have a SMP machine with i486 chips or older,
    6.31 + * compile for that, and this will just always return zero.
    6.32 + * That's ok, it just means that the nicer scheduling heuristics
    6.33 + * won't work for you.
    6.34 + *
    6.35 + * We only use the low 32 bits, and we'd simply better make sure
    6.36 + * that we reschedule before that wraps. Scheduling at least every
    6.37 + * four billion cycles just basically sounds like a good idea,
    6.38 + * regardless of how fast the machine is. 
    6.39 + */
    6.40 +typedef unsigned long long cycles_t;
    6.41 +
    6.42 +extern cycles_t cacheflush_time;
    6.43 +
    6.44 +static inline cycles_t get_cycles (void)
    6.45 +{
    6.46 +#ifndef CONFIG_X86_TSC
    6.47 +	return 0;
    6.48 +#else
    6.49 +	unsigned long long ret;
    6.50 +
    6.51 +	rdtscll(ret);
    6.52 +	return ret;
    6.53 +#endif
    6.54 +}
    6.55 +
    6.56 +extern unsigned long cpu_khz;
    6.57 +
    6.58 +#define vxtime_lock()		do {} while (0)
    6.59 +#define vxtime_unlock()		do {} while (0)
    6.60 +
    6.61 +#endif
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/xen-2.4.16/include/stdarg.h	Sat Feb 08 13:42:29 2003 +0000
     7.3 @@ -0,0 +1,138 @@
     7.4 +/* Copyright (C) 1989, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
     7.5 +
     7.6 +This file is part of GNU CC.
     7.7 +
     7.8 +GNU CC is free software; you can redistribute it and/or modify
     7.9 +it under the terms of the GNU General Public License as published by
    7.10 +the Free Software Foundation; either version 2, or (at your option)
    7.11 +any later version.
    7.12 +
    7.13 +GNU CC is distributed in the hope that it will be useful,
    7.14 +but WITHOUT ANY WARRANTY; without even the implied warranty of
    7.15 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    7.16 +GNU General Public License for more details.
    7.17 +
    7.18 +You should have received a copy of the GNU General Public License
    7.19 +along with GNU CC; see the file COPYING.  If not, write to
    7.20 +the Free Software Foundation, 59 Temple Place - Suite 330,
    7.21 +Boston, MA 02111-1307, USA.  */
    7.22 +
    7.23 +/* As a special exception, if you include this header file into source
    7.24 +   files compiled by GCC, this header file does not by itself cause
    7.25 +   the resulting executable to be covered by the GNU General Public
    7.26 +   License.  This exception does not however invalidate any other
    7.27 +   reasons why the executable file might be covered by the GNU General
    7.28 +   Public License.  */
    7.29 +
    7.30 +/*
    7.31 + * ISO C Standard:  7.15  Variable arguments  <stdarg.h>
    7.32 + */
    7.33 +
    7.34 +#ifndef _STDARG_H
    7.35 +#ifndef _ANSI_STDARG_H_
    7.36 +#ifndef __need___va_list
    7.37 +#define _STDARG_H
    7.38 +#define _ANSI_STDARG_H_
    7.39 +#endif /* not __need___va_list */
    7.40 +#undef __need___va_list
    7.41 +
    7.42 +/* Define __gnuc_va_list.  */
    7.43 +
    7.44 +#ifndef __GNUC_VA_LIST
    7.45 +#define __GNUC_VA_LIST
    7.46 +typedef __builtin_va_list __gnuc_va_list;
    7.47 +#endif
    7.48 +
    7.49 +/* Define the standard macros for the user,
    7.50 +   if this invocation was from the user program.  */
    7.51 +#ifdef _STDARG_H
    7.52 +
    7.53 +/* Note that the type used in va_arg is supposed to match the
    7.54 +   actual type **after default promotions**.
    7.55 +   Thus, va_arg (..., short) is not valid.  */
    7.56 +
    7.57 +#define va_start(v,l)	__builtin_stdarg_start((v),l)
    7.58 +#define va_end		__builtin_va_end
    7.59 +#define va_arg		__builtin_va_arg
    7.60 +#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L
    7.61 +#define va_copy(d,s)	__builtin_va_copy((d),(s))
    7.62 +#endif
    7.63 +#define __va_copy(d,s)	__builtin_va_copy((d),(s))
    7.64 +
    7.65 +
    7.66 +/* Define va_list, if desired, from __gnuc_va_list. */
    7.67 +/* We deliberately do not define va_list when called from
    7.68 +   stdio.h, because ANSI C says that stdio.h is not supposed to define
    7.69 +   va_list.  stdio.h needs to have access to that data type, 
    7.70 +   but must not use that name.  It should use the name __gnuc_va_list,
    7.71 +   which is safe because it is reserved for the implementation.  */
    7.72 +
    7.73 +#ifdef _HIDDEN_VA_LIST  /* On OSF1, this means varargs.h is "half-loaded".  */
    7.74 +#undef _VA_LIST
    7.75 +#endif
    7.76 +
    7.77 +#ifdef _BSD_VA_LIST
    7.78 +#undef _BSD_VA_LIST
    7.79 +#endif
    7.80 +
    7.81 +#if defined(__svr4__) || (defined(_SCO_DS) && !defined(__VA_LIST))
    7.82 +/* SVR4.2 uses _VA_LIST for an internal alias for va_list,
    7.83 +   so we must avoid testing it and setting it here.
    7.84 +   SVR4 uses _VA_LIST as a flag in stdarg.h, but we should
    7.85 +   have no conflict with that.  */
    7.86 +#ifndef _VA_LIST_
    7.87 +#define _VA_LIST_
    7.88 +#ifdef __i860__
    7.89 +#ifndef _VA_LIST
    7.90 +#define _VA_LIST va_list
    7.91 +#endif
    7.92 +#endif /* __i860__ */
    7.93 +typedef __gnuc_va_list va_list;
    7.94 +#ifdef _SCO_DS
    7.95 +#define __VA_LIST
    7.96 +#endif
    7.97 +#endif /* _VA_LIST_ */
    7.98 +#else /* not __svr4__ || _SCO_DS */
    7.99 +
   7.100 +/* The macro _VA_LIST_ is the same thing used by this file in Ultrix.
   7.101 +   But on BSD NET2 we must not test or define or undef it.
   7.102 +   (Note that the comments in NET 2's ansi.h
   7.103 +   are incorrect for _VA_LIST_--see stdio.h!)  */
   7.104 +#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__) || defined(WINNT)
   7.105 +/* The macro _VA_LIST_DEFINED is used in Windows NT 3.5  */
   7.106 +#ifndef _VA_LIST_DEFINED
   7.107 +/* The macro _VA_LIST is used in SCO Unix 3.2.  */
   7.108 +#ifndef _VA_LIST
   7.109 +/* The macro _VA_LIST_T_H is used in the Bull dpx2  */
   7.110 +#ifndef _VA_LIST_T_H
   7.111 +/* The macro __va_list__ is used by BeOS.  */
   7.112 +#ifndef __va_list__
   7.113 +typedef __gnuc_va_list va_list;
   7.114 +#endif /* not __va_list__ */
   7.115 +#endif /* not _VA_LIST_T_H */
   7.116 +#endif /* not _VA_LIST */
   7.117 +#endif /* not _VA_LIST_DEFINED */
   7.118 +#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__))
   7.119 +#define _VA_LIST_
   7.120 +#endif
   7.121 +#ifndef _VA_LIST
   7.122 +#define _VA_LIST
   7.123 +#endif
   7.124 +#ifndef _VA_LIST_DEFINED
   7.125 +#define _VA_LIST_DEFINED
   7.126 +#endif
   7.127 +#ifndef _VA_LIST_T_H
   7.128 +#define _VA_LIST_T_H
   7.129 +#endif
   7.130 +#ifndef __va_list__
   7.131 +#define __va_list__
   7.132 +#endif
   7.133 +
   7.134 +#endif /* not _VA_LIST_, except on certain systems */
   7.135 +
   7.136 +#endif /* not __svr4__ */
   7.137 +
   7.138 +#endif /* _STDARG_H */
   7.139 +
   7.140 +#endif /* not _ANSI_STDARG_H_ */
   7.141 +#endif /* not _STDARG_H */