ia64/xen-unstable

changeset 1038:dd6955d72ff5

bitkeeper revision 1.677 (4007aff6ocbHN2qLBEXdaX4_p5fayQ)

sched.h, entry.S, Rules.mk:
Fix compile options to work with older gccs.
.del-stdarg.h~1490d2f37a0ea278:
Delete: xen/include/stdarg.h
author kaf24@scramble.cl.cam.ac.uk
date Fri Jan 16 09:33:42 2004 +0000 (2004-01-16)
parents cb364c545252
children c268496b6a2f
files .rootkeys xen/arch/i386/Rules.mk xen/arch/i386/entry.S xen/include/stdarg.h xen/include/xeno/sched.h
line diff
     1.1 --- a/.rootkeys	Fri Jan 16 00:01:44 2004 +0000
     1.2 +++ b/.rootkeys	Fri Jan 16 09:33:42 2004 +0000
     1.3 @@ -404,7 +404,6 @@ 3ddb79c4qbCoOFHrv9sCGshbWzBVlQ xen/inclu
     1.4  3ddb79c4R4iVwqIIeychVQYmIH4FUg xen/include/scsi/scsi_ioctl.h
     1.5  3ddb79c4yw_mfd4Uikn3v_IOPRpa1Q xen/include/scsi/scsicam.h
     1.6  3ddb79c4HKPMLvDBP9LxzPi_szVxGA xen/include/scsi/sg.h
     1.7 -3e450943xQztorJxTGW3BPZ4LhRHbw xen/include/stdarg.h
     1.8  3e397e66m2tO3s-J8Jnr7Ws_tGoPTg xen/include/xeno/ac_timer.h
     1.9  3ddb79c0nTsjSpVK4ZVTI9WwN24xtQ xen/include/xeno/blk.h
    1.10  3ddb79c0dVhTHLsv6CPTf4baKix4mA xen/include/xeno/blkdev.h
     2.1 --- a/xen/arch/i386/Rules.mk	Fri Jan 16 00:01:44 2004 +0000
     2.2 +++ b/xen/arch/i386/Rules.mk	Fri Jan 16 09:33:42 2004 +0000
     2.3 @@ -7,7 +7,8 @@ LD := ld
     2.4  MONITOR_BASE := 0xFC500000
     2.5  # Bootloader should load monitor to this real address
     2.6  LOAD_BASE    := 0x00100000
     2.7 -CFLAGS  := -nostdinc -fno-builtin -O3 -Wall -DMONITOR_BASE=$(MONITOR_BASE) 
     2.8 +CFLAGS  := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing 
     2.9 +CFLAGS  += -iwithprefix include -O3 -Wall -DMONITOR_BASE=$(MONITOR_BASE)
    2.10  CFLAGS  += -fomit-frame-pointer -I$(BASEDIR)/include -D__KERNEL__ -DNDEBUG
    2.11  #CFLAGS  += -fomit-frame-pointer -I$(BASEDIR)/include -D__KERNEL__
    2.12  LDFLAGS := -T xeno.lds -N
     3.1 --- a/xen/arch/i386/entry.S	Fri Jan 16 00:01:44 2004 +0000
     3.2 +++ b/xen/arch/i386/entry.S	Fri Jan 16 09:33:42 2004 +0000
     3.3 @@ -641,11 +641,11 @@ ENTRY(nmi)
     3.4          jne   nmi_io_err
     3.5          movl  %eax,%ebx
     3.6          
     3.7 -        # Okay, it's almost a normal NMI tick. We can only process it if:
     3.8 -        #  1. We're the outermost Xen activation (in which case we have
     3.9 +        # Okay, its almost a normal NMI tick. We can only process it if:
    3.10 +        #  1. We are the outermost Xen activation (in which case we have
    3.11          #     the selectors safely saved on our stack)
    3.12          #  2. DS-GS all contain sane Xen values.
    3.13 -        # In all other cases we bail without touching DS-GS, as we've
    3.14 +        # In all other cases we bail without touching DS-GS, as we have
    3.15          # interrupted an enclosing Xen activation in tricky prologue or
    3.16          # epilogue code.
    3.17          movb  CS(%esp),%al
     4.1 --- a/xen/include/stdarg.h	Fri Jan 16 00:01:44 2004 +0000
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,138 +0,0 @@
     4.4 -/* Copyright (C) 1989, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
     4.5 -
     4.6 -This file is part of GNU CC.
     4.7 -
     4.8 -GNU CC is free software; you can redistribute it and/or modify
     4.9 -it under the terms of the GNU General Public License as published by
    4.10 -the Free Software Foundation; either version 2, or (at your option)
    4.11 -any later version.
    4.12 -
    4.13 -GNU CC is distributed in the hope that it will be useful,
    4.14 -but WITHOUT ANY WARRANTY; without even the implied warranty of
    4.15 -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    4.16 -GNU General Public License for more details.
    4.17 -
    4.18 -You should have received a copy of the GNU General Public License
    4.19 -along with GNU CC; see the file COPYING.  If not, write to
    4.20 -the Free Software Foundation, 59 Temple Place - Suite 330,
    4.21 -Boston, MA 02111-1307, USA.  */
    4.22 -
    4.23 -/* As a special exception, if you include this header file into source
    4.24 -   files compiled by GCC, this header file does not by itself cause
    4.25 -   the resulting executable to be covered by the GNU General Public
    4.26 -   License.  This exception does not however invalidate any other
    4.27 -   reasons why the executable file might be covered by the GNU General
    4.28 -   Public License.  */
    4.29 -
    4.30 -/*
    4.31 - * ISO C Standard:  7.15  Variable arguments  <stdarg.h>
    4.32 - */
    4.33 -
    4.34 -#ifndef _STDARG_H
    4.35 -#ifndef _ANSI_STDARG_H_
    4.36 -#ifndef __need___va_list
    4.37 -#define _STDARG_H
    4.38 -#define _ANSI_STDARG_H_
    4.39 -#endif /* not __need___va_list */
    4.40 -#undef __need___va_list
    4.41 -
    4.42 -/* Define __gnuc_va_list.  */
    4.43 -
    4.44 -#ifndef __GNUC_VA_LIST
    4.45 -#define __GNUC_VA_LIST
    4.46 -typedef __builtin_va_list __gnuc_va_list;
    4.47 -#endif
    4.48 -
    4.49 -/* Define the standard macros for the user,
    4.50 -   if this invocation was from the user program.  */
    4.51 -#ifdef _STDARG_H
    4.52 -
    4.53 -/* Note that the type used in va_arg is supposed to match the
    4.54 -   actual type **after default promotions**.
    4.55 -   Thus, va_arg (..., short) is not valid.  */
    4.56 -
    4.57 -#define va_start(v,l)	__builtin_stdarg_start((v),l)
    4.58 -#define va_end		__builtin_va_end
    4.59 -#define va_arg		__builtin_va_arg
    4.60 -#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L
    4.61 -#define va_copy(d,s)	__builtin_va_copy((d),(s))
    4.62 -#endif
    4.63 -#define __va_copy(d,s)	__builtin_va_copy((d),(s))
    4.64 -
    4.65 -
    4.66 -/* Define va_list, if desired, from __gnuc_va_list. */
    4.67 -/* We deliberately do not define va_list when called from
    4.68 -   stdio.h, because ANSI C says that stdio.h is not supposed to define
    4.69 -   va_list.  stdio.h needs to have access to that data type, 
    4.70 -   but must not use that name.  It should use the name __gnuc_va_list,
    4.71 -   which is safe because it is reserved for the implementation.  */
    4.72 -
    4.73 -#ifdef _HIDDEN_VA_LIST  /* On OSF1, this means varargs.h is "half-loaded".  */
    4.74 -#undef _VA_LIST
    4.75 -#endif
    4.76 -
    4.77 -#ifdef _BSD_VA_LIST
    4.78 -#undef _BSD_VA_LIST
    4.79 -#endif
    4.80 -
    4.81 -#if defined(__svr4__) || (defined(_SCO_DS) && !defined(__VA_LIST))
    4.82 -/* SVR4.2 uses _VA_LIST for an internal alias for va_list,
    4.83 -   so we must avoid testing it and setting it here.
    4.84 -   SVR4 uses _VA_LIST as a flag in stdarg.h, but we should
    4.85 -   have no conflict with that.  */
    4.86 -#ifndef _VA_LIST_
    4.87 -#define _VA_LIST_
    4.88 -#ifdef __i860__
    4.89 -#ifndef _VA_LIST
    4.90 -#define _VA_LIST va_list
    4.91 -#endif
    4.92 -#endif /* __i860__ */
    4.93 -typedef __gnuc_va_list va_list;
    4.94 -#ifdef _SCO_DS
    4.95 -#define __VA_LIST
    4.96 -#endif
    4.97 -#endif /* _VA_LIST_ */
    4.98 -#else /* not __svr4__ || _SCO_DS */
    4.99 -
   4.100 -/* The macro _VA_LIST_ is the same thing used by this file in Ultrix.
   4.101 -   But on BSD NET2 we must not test or define or undef it.
   4.102 -   (Note that the comments in NET 2's ansi.h
   4.103 -   are incorrect for _VA_LIST_--see stdio.h!)  */
   4.104 -#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__) || defined(WINNT)
   4.105 -/* The macro _VA_LIST_DEFINED is used in Windows NT 3.5  */
   4.106 -#ifndef _VA_LIST_DEFINED
   4.107 -/* The macro _VA_LIST is used in SCO Unix 3.2.  */
   4.108 -#ifndef _VA_LIST
   4.109 -/* The macro _VA_LIST_T_H is used in the Bull dpx2  */
   4.110 -#ifndef _VA_LIST_T_H
   4.111 -/* The macro __va_list__ is used by BeOS.  */
   4.112 -#ifndef __va_list__
   4.113 -typedef __gnuc_va_list va_list;
   4.114 -#endif /* not __va_list__ */
   4.115 -#endif /* not _VA_LIST_T_H */
   4.116 -#endif /* not _VA_LIST */
   4.117 -#endif /* not _VA_LIST_DEFINED */
   4.118 -#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__))
   4.119 -#define _VA_LIST_
   4.120 -#endif
   4.121 -#ifndef _VA_LIST
   4.122 -#define _VA_LIST
   4.123 -#endif
   4.124 -#ifndef _VA_LIST_DEFINED
   4.125 -#define _VA_LIST_DEFINED
   4.126 -#endif
   4.127 -#ifndef _VA_LIST_T_H
   4.128 -#define _VA_LIST_T_H
   4.129 -#endif
   4.130 -#ifndef __va_list__
   4.131 -#define __va_list__
   4.132 -#endif
   4.133 -
   4.134 -#endif /* not _VA_LIST_, except on certain systems */
   4.135 -
   4.136 -#endif /* not __svr4__ */
   4.137 -
   4.138 -#endif /* _STDARG_H */
   4.139 -
   4.140 -#endif /* not _ANSI_STDARG_H_ */
   4.141 -#endif /* not _STDARG_H */
     5.1 --- a/xen/include/xeno/sched.h	Fri Jan 16 00:01:44 2004 +0000
     5.2 +++ b/xen/include/xeno/sched.h	Fri Jan 16 09:33:42 2004 +0000
     5.3 @@ -286,7 +286,7 @@ void continue_nonidle_task(void);
     5.4  /* This hash table is protected by the tasklist_lock. */
     5.5  #define TASK_HASH_SIZE 256
     5.6  #define TASK_HASH(_id) ((_id)&(TASK_HASH_SIZE-1))
     5.7 -struct task_struct *task_hash[TASK_HASH_SIZE];
     5.8 +extern struct task_struct *task_hash[TASK_HASH_SIZE];
     5.9  
    5.10  #define REMOVE_LINKS(p) do { \
    5.11          (p)->next_task->prev_task = (p)->prev_task; \