From: Jonathan A. Kollasch Date: Thu, 19 Sep 2013 00:37:32 +0000 (-0500) Subject: Add config glue for amd64_nbsd70 and i386_nbsd70 sysnames X-Git-Tag: openafs-stable-1_8_0pre1~1004 X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=f785b7f662bb9f9026a32039aca92ac5cb13030a Add config glue for amd64_nbsd70 and i386_nbsd70 sysnames Change-Id: I2d0b6848f96aab8d68a41fb6d5892284fca987ad Reviewed-on: http://gerrit.openafs.org/10257 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/acinclude.m4 b/acinclude.m4 index 99bb234..7ebb50b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -755,6 +755,7 @@ case $AFS_SYSNAME in *_nbsd40) AFS_PARAM_COMMON=param.nbsd40.h ;; *_nbsd50) AFS_PARAM_COMMON=param.nbsd50.h ;; *_nbsd60) AFS_PARAM_COMMON=param.nbsd60.h ;; + *_nbsd70) AFS_PARAM_COMMON=param.nbsd70.h ;; *_obsd31) AFS_PARAM_COMMON=param.obsd31.h ;; *_obsd32) AFS_PARAM_COMMON=param.obsd32.h ;; *_obsd33) AFS_PARAM_COMMON=param.obsd33.h ;; diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4 index c40b4da..22b99f8 100644 --- a/src/cf/osconf.m4 +++ b/src/cf/osconf.m4 @@ -182,7 +182,7 @@ case $AFS_SYSNAME in XCFLAGS="-O2 -pipe -fPIC" ;; - *nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*) + *nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*|*nbsd7*) MT_CFLAGS='-pthread -D_REENTRANT' PAM_OPTMZ=-O2 PAM_CFLAGS="-pipe -fPIC" diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h index 72edfee..b80e96b 100644 --- a/src/config/afs_sysnames.h +++ b/src/config/afs_sysnames.h @@ -257,6 +257,8 @@ #define SYS_NAME_ID_macppc_nbsd50 2541 #define SYS_NAME_ID_amd64_nbsd60 2542 #define SYS_NAME_ID_i386_nbsd60 2543 +#define SYS_NAME_ID_amd64_nbsd70 2544 +#define SYS_NAME_ID_i386_nbsd70 2545 #define SYS_NAME_ID_i386_obsd31 2600 #define SYS_NAME_ID_i386_obsd32 2601 diff --git a/src/config/param.amd64_nbsd70.h b/src/config/param.amd64_nbsd70.h new file mode 100644 index 0000000..58e78eb --- /dev/null +++ b/src/config/param.amd64_nbsd70.h @@ -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_nbsd70" +#define SYS_NAME_ID SYS_NAME_ID_amd64_nbsd70 + +#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 */ diff --git a/src/config/param.i386_nbsd70.h b/src/config/param.i386_nbsd70.h new file mode 100644 index 0000000..cfe3f0b --- /dev/null +++ b/src/config/param.i386_nbsd70.h @@ -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_nbsd70" +#define SYS_NAME_ID SYS_NAME_ID_i386_nbsd70 + +#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 */ diff --git a/src/config/param.nbsd70.h b/src/config/param.nbsd70.h new file mode 100644 index 0000000..61b716b --- /dev/null +++ b/src/config/param.nbsd70.h @@ -0,0 +1,171 @@ +/* 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 + +#define AFS_KALLOC(n) kmem_alloc(n, KM_SLEEP) +#define AFS_KALLOC_NOSLEEP(n) kmem_alloc(n, KM_NOSLEEP) +#define AFS_KFREE kmem_free +#define VATTR_NULL vattr_null + +#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 +#define AFS_NBSD60_ENV 1 +#define AFS_NBSD70_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 +#endif + +#define FTRUNC O_TRUNC + +#define IUPD 0x0010 +#define IACC 0x0020 +#define ICHG 0x0040 +#define IMOD 0x0080 + +#define RXK_LISTENER_ENV 1 + +#include + +#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 + +#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 +#include +#include +#include +#include +#include +#include +#include +#endif + +#endif /* !defined(UKERNEL) */ + +#define ROOTINO UFS_ROOTINO + +#endif /* AFS_PARAM_COMMON_H */