Add nbsd60 param files and autoconf logic

Reviewed-on: http://gerrit.openafs.org/4512
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 9fd238ea056b6883dd1caf6e8e724ad3ddabeb3a)

Conflicts:

	src/cf/osconf.m4

Change-Id: Ibac29f9b80624800db7c2829153fb9b2aeb44d6c
Reviewed-on: http://gerrit.openafs.org/5422
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
This commit is contained in:
Jonathan A. Kollasch 2011-04-21 08:24:15 +00:00 committed by Derrick Brashear
parent 557c553a6d
commit e909c5158b
5 changed files with 217 additions and 1 deletions

View File

@ -723,6 +723,7 @@ case $AFS_SYSNAME in
*_nbsd30) AFS_PARAM_COMMON=param.nbsd30.h ;;
*_nbsd40) AFS_PARAM_COMMON=param.nbsd40.h ;;
*_nbsd50) AFS_PARAM_COMMON=param.nbsd50.h ;;
*_nbsd60) AFS_PARAM_COMMON=param.nbsd60.h ;;
*_obsd31) AFS_PARAM_COMMON=param.obsd31.h ;;
*_obsd32) AFS_PARAM_COMMON=param.obsd32.h ;;
*_obsd33) AFS_PARAM_COMMON=param.obsd33.h ;;

View File

@ -204,7 +204,7 @@ case $AFS_SYSNAME in
XCFLAGS="-O2 -pipe -fPIC"
;;
*nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*)
*nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*)
MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
MT_LIBS="-pthread"
PAM_OPTMZ=-O2

View File

@ -0,0 +1,22 @@
#ifndef AFS_AMD64_PARAM_H
#define AFS_AMD64_PARAM_H
#define AFS_X86_XBSD_ENV 1
#define AFS_X86_ENV 1
#define AFSLITTLE_ENDIAN 1
#define SYS_NAME "amd64_nbsd60"
#define SYS_NAME_ID SYS_NAME_ID_amd64_nbsd60
#define AFS_64BITPOINTER_ENV 1
#define AFS_64BITUSERPOINTER_ENV 1
#ifndef UKERNEL
/* This section for kernel libafs compiles only */
#else /* !defined(UKERNEL) */
/* This section for user space compiles only */
#endif /* !defined(UKERNEL) */
#endif /* AFS_AMD64_PARAM_H */

View File

@ -0,0 +1,20 @@
#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_nbsd60"
#define SYS_NAME_ID SYS_NAME_ID_i386_nbsd60
#ifndef UKERNEL
/* This section for kernel libafs compiles only */
#else /* !defined(UKERNEL) */
/* This section for user space compiles only */
#endif /* !defined(UKERNEL) */
#endif /* AFS_I386_PARAM_H */

173
src/config/param.nbsd60.h Normal file
View File

@ -0,0 +1,173 @@
/* NetBSD shared section */
#ifndef AFS_PARAM_COMMON_H
#define AFS_PARAM_COMMON_H 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
#ifdef AFS_KALLOC
#undef AFS_KALLOC
#endif
#define AFS_KALLOC(s) (osi_nbsd_Alloc((s), 1 /* cansleep */))
#ifdef AFS_KFREE
#undef AFS_KFREE
#endif
#define AFS_KFREE(p, s) (osi_nbsd_Free((p), (s)))
#if 0
/* including this file before sysincludes.h is canonical, but
* NBSD40's mount.h defines MOUNT_AFS */
#ifndef MOUNT_AFS
#define MOUNT_AFS AFS_MOUNT_AFS
#endif
#endif /* 0 */
#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */
#define AFS_NBSD_ENV 1
#define AFS_NBSD15_ENV 1
#define AFS_NBSD16_ENV 1
#define AFS_NBSD20_ENV 1
#define AFS_NBSD30_ENV 1
#define AFS_NBSD40_ENV 1
#define AFS_NBSD50_ENV 1
#undef AFS_NONFSTRANS
#define AFS_NONFSTRANS 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)
#define AFS_HAVE_STATVFS 1 /* System supports statvfs */
#endif
#ifndef UKERNEL
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H)
#include <sys/param.h>
#endif
#define FTRUNC O_TRUNC
#define IUPD 0x0010
#define IACC 0x0020
#define ICHG 0x0040
#define IMOD 0x0080
#define RXK_LISTENER_ENV 1
#include <afs/afs_sysnames.h>
#define AFS_VM_RDWR_ENV 1
#define AFS_VFS_ENV 1
#define AFS_GREEDY43_ENV 1
#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */
#define AFS_GLOBAL_SUNLOCK 1
/* Extra kernel definitions (from kdefs file) */
#ifdef _KERNEL_DEPRECATED
#define AFS_VFS34 1 /* What is VFS34??? */
#define AFS_SHORTGID 1 /* are group id's short? */
#define afsio_iov uio_iov
#define afsio_iovcnt uio_iovcnt
#define afsio_offset uio_offset
#define afsio_seg uio_segflg
#define afsio_resid uio_resid
#define AFS_UIOSYS UIO_SYSSPACE
#define AFS_UIOUSER UIO_USERSPACE
#define AFS_CLBYTES CLBYTES
#define osi_GetTime(x) microtime(x)
#define AFS_KALLOC(x) kalloc(x)
#define AFS_KFREE(x,y) kfree(x,y)
#define v_count v_usecount
#define v_vfsp v_mount
#define vfs_bsize mnt_stat.f_bsize
#define vfs_fsid mnt_stat.f_fsid
#define va_nodeid va_fileid
#define vfs_vnodecovered mnt_vnodecovered
#define direct dirent
#ifndef MUTEX_DEFAULT
#define MUTEX_DEFAULT 0
#endif /* MUTEX_DEFAULT */
#ifndef SSYS
#define SSYS 0x00002
#endif /* SSYS */
#define p_rcred p_ucred
#define VN_RELE(vp) vrele(((struct vnode *)(vp)))
#define VN_HOLD(vp) VREF(((struct vnode *)(vp)))
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H)
enum vcexcl { NONEXCL, EXCL };
#ifdef KERNEL
#ifndef MIN
#define MIN(A,B) ((A) < (B) ? (A) : (B))
#endif
#ifndef MAX
#define MAX(A,B) ((A) > (B) ? (A) : (B))
#endif
#endif /* KERNEL */
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */
#endif /* _KERNEL_DEPRECATED */
#else /* !defined(UKERNEL) */
/* This section for user space compiles only */
#define UKERNEL 1 /* user space kernel */
#include <afs/afs_sysnames.h>
#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) && !defined()
#include <limits.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/mount.h>
#include <sys/fcntl.h>
#include <netinet/in.h>
#include <sys/uio.h>
#include <sys/socket.h>
#endif
#endif /* !defined(UKERNEL) */
#endif /* AFS_PARAM_COMMON_H */