From cf8a163c20179d76075653af243305446604bc92 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Love=20H=C3=B6rnquist-=C3=85strand?= Date: Tue, 10 Aug 2004 21:35:08 +0000 Subject: [PATCH] netbsd20-config-20040810 cleanup config files for NetBSD 2.0 --- src/config/param.i386_nbsd20.h | 81 +++----------------------- src/config/param.nbsd20.h | 101 +++++++++++++++++++++++---------- src/config/param.ppc_nbsd20.h | 77 +------------------------ src/lwp/Makefile.in | 2 +- 4 files changed, 82 insertions(+), 179 deletions(-) diff --git a/src/config/param.i386_nbsd20.h b/src/config/param.i386_nbsd20.h index 624858094..c5bf4c976 100644 --- a/src/config/param.i386_nbsd20.h +++ b/src/config/param.i386_nbsd20.h @@ -1,88 +1,21 @@ -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -#ifndef IGNORE_STDS_H -#include -#endif +#ifndef AFS_I386_PARAM_H +#define AFS_I386_PARAM_H #define AFS_X86_XBSD_ENV 1 - #define AFS_X86_ENV 1 +#define AFSLITTLE_ENDIAN 1 #define SYS_NAME "i386_nbsd20" #define SYS_NAME_ID SYS_NAME_ID_i386_nbsd20 -#define AFSLITTLE_ENDIAN 1 - -#endif /* AFS_PARAM_H */ +#ifndef UKERNEL +/* This section for kernel libafs compiles only */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - - -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_NBSD_ENV 1 -#define AFS_NBSD15_ENV 1 -#define AFS_NBSD16_ENV 1 -#define AFS_NBSD20_ENV 1 -#define AFS_NONFSTRANS 1 -#define AFS_KERBEROS_ENV - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 210 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_ENV 1 -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#include - -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -/* Machine / Operating system information */ -#define SYS_NAME "i386_nbsd16" -#define SYS_NAME_ID SYS_NAME_ID_i386_nbsd16 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#endif /* !defined(UKERNEL) */ -#endif /* AFS_PARAM_H */ +#endif /* AFS_I386_PARAM_H */ -#endif /* !defined(UKERNEL) */ diff --git a/src/config/param.nbsd20.h b/src/config/param.nbsd20.h index fed9173d6..3bc7f399a 100644 --- a/src/config/param.nbsd20.h +++ b/src/config/param.nbsd20.h @@ -1,25 +1,47 @@ -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - +/* NetBSD shared section */ #ifndef AFS_PARAM_COMMON_H -#define AFS_PARAM_COMMON_H +#define AFS_PARAM_COMMON_H 1 -#ifndef ASSEMBLER -#include +#define AFS_64BIT_ENV 1 +#define AFS_NAMEI_ENV 1 /* User space interface to file system */ +#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ +#define AFS_64BIT_CLIENT 1 + +#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ +#define AFS_SYSCALL 210 + +#ifndef MOUNT_AFS +#define MOUNT_AFS AFS_MOUNT_AFS #endif #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_64BIT_ENV 1 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_NBSD_ENV 1 #define AFS_NBSD15_ENV 1 #define AFS_NBSD16_ENV 1 #define AFS_NBSD20_ENV 1 #define AFS_NONFSTRANS 1 #define AFS_KERBEROS_ENV 1 + +#define AFS_VFSINCL_ENV 1 + +#define AFS_HAVE_FFS 1 /* Use system's ffs. */ + +#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H) +#if __NetBSD_Version__ >= 200040000 +#define AFS_HAVE_STATVFS 1 /* System supports statvfs */ +#else +#define AFS_HAVE_STATVFS 0 /* System doesn't supports statvfs */ +#endif +#endif + +#ifndef UKERNEL + +#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H) +#include +#endif + #define FTRUNC O_TRUNC #define IUPD 0x0010 @@ -36,24 +58,7 @@ #define AFS_VM_RDWR_ENV 1 #define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 #define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_MOUNT_AFS "afs" -#define AFS_SYSCALL 210 - - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System supports statvfs */ #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ #define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ @@ -96,7 +101,7 @@ #define VN_RELE(vp) vrele(((struct vnode *)(vp))) #define VN_HOLD(vp) VREF(((struct vnode *)(vp))) -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) +#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H) enum vcexcl { NONEXCL, EXCL }; #ifdef KERNEL @@ -108,14 +113,50 @@ enum vcexcl { NONEXCL, EXCL }; #endif #endif /* KERNEL */ -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ +#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */ #endif /* _KERNEL */ -#endif /* AFS_PARAM_COMMON_H */ - #else /* !defined(UKERNEL) */ + /* This section for user space compiles only */ +#define UKERNEL 1 /* user space kernel */ + +#include + +#define AFS_USERSPACE_IP_ADDR 1 +#define RXK_LISTENER_ENV 1 +#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + +#define afsio_iov uio_iov +#define afsio_iovcnt uio_iovcnt +#define afsio_offset uio_offset +#define afsio_seg uio_segflg +#define afsio_fmode uio_fmode +#define afsio_resid uio_resid +#define AFS_UIOSYS UIO_SYSSPACE +#define AFS_UIOUSER UIO_USERSPACE +#define AFS_CLBYTES MCLBYTES +#define AFS_MINCHANGE 2 +#define VATTR_NULL usr_vattr_null + +#define AFS_DIRENT +#ifndef CMSERVERPREF +#define CMSERVERPREF +#endif + +#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H) +#include +#include +#include +#include +#include +#include +#include +#include +#endif #endif /* !defined(UKERNEL) */ + +#endif /* AFS_PARAM_COMMON_H */ diff --git a/src/config/param.ppc_nbsd20.h b/src/config/param.ppc_nbsd20.h index 1d0ea6ac5..012839488 100644 --- a/src/config/param.ppc_nbsd20.h +++ b/src/config/param.ppc_nbsd20.h @@ -1,10 +1,5 @@ -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -#include +#ifndef AFS_PPC_PARAM_H +#define AFS_PPC_PARAM_H #define SYS_NAME "macppc_nbsd20" #define SYS_NAME_ID SYS_NAME_ID_macppc_nbsd20 @@ -12,70 +7,4 @@ #define AFS_PPC_ENV 1 #define AFSBIG_ENDIAN 1 -#endif /* AFS_PARAM_H */ - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - - -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_NBSD_ENV 1 -#define AFS_NBSD15_ENV 1 -#define AFS_NBSD16_ENV 1 -#define AFS_NBSD20_ENV 1 -#define AFS_NONFSTRANS 1 -#define AFS_KERBEROS_ENV - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 210 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#include - -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -/* Machine / Operating system information */ -#define SYS_NAME "i386_nbsd16" -#define SYS_NAME_ID SYS_NAME_ID_i386_nbsd16 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include - -#endif /* AFS_PARAM_H */ - -#endif /* !defined(UKERNEL) */ +#endif /* AFS_PCC_PARAM_H */ diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in index cce0257e6..0f39cc15f 100644 --- a/src/lwp/Makefile.in +++ b/src/lwp/Makefile.in @@ -52,7 +52,7 @@ process.o : process.s process.i386.s process.c $(CC) ${LWP_DBG} ${LWP_OPTMZ} -c ${XCFLAGS} -I${TOP_INCDIR} ${srcdir}/process.s;; \ i386_*bsd*) \ cp ${srcdir}/process.i386.s process.S ; \ - ${CCOBJ} -E -I${srcdir} -I${TOP_INCDIR} process.S >process.ss ; \ + ${CCOBJ} -DIGNORE_STDS_H -E -I${srcdir} -I${TOP_INCDIR} process.S > process.ss ; \ ${AS} process.ss -o process.o ; \ $(RM) -f process.S ;;\ ncrx86_* | sunx86_*) \ -- 2.39.5