SOLARIS: provide cache manager stats via kstat

[openafs.git] / src / libafs / MakefileProto.SOLARIS.in

diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in
index c9f936f..1e6a2aa 100644 (file)
--- a/src/libafs/MakefileProto.SOLARIS.in
+++ b/src/libafs/MakefileProto.SOLARIS.in
@@ -23,10 +23,12 @@ AFS_OS_OBJS = \
        osi_ioctl.o \
 <all>
        osi_file.o \
+       osi_kstat.o \
        osi_sleep.o \
        osi_vcache.o \
        osi_vm.o \
-       osi_vnodeops.o
+       osi_vnodeops.o \
+       rand-fortuna-kernel.o
 
 AFS_OS_NFSOBJS = \
        osi_vfsops_nfs.o
@@ -38,20 +40,25 @@ AFS_OS_NONFSOBJS = \
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
 #These are redundant
 #LD = /usr/ccs/bin/ld
-#LORDER = /usr/ccs/bin/lorder
 #CC = /opt/SUNWspro/bin/cc
 KDEFS= -D_KERNEL -DSYSV -dn ${ARCH_DEFS}
+<sunx86_510 sunx86_511>
+DBUG= -Wu,-save_args
 
 <sun4x_58 sun4x_59 sun4x_510 sun4x_511>
 KDEFS_32 = -xarch=v8
 KDEFS_64 = -xarch=v9 
 
-<sunx86_58 sunx86_59 sunx86_510 sunx86_511>
+<sunx86_58 sunx86_59 sunx86_510>
 KDEFS_32 = 
 KDEFS_64 = -xarch=amd64 -xmodel=kernel
 
+<sunx86_511>
+KDEFS_32 =
+KDEFS_64 = -m64 -xmodel=kernel
+
 <all>
-CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KDEFS) @SOLARIS_CC_KOPTS@ ${DBUG}
 
 <sun4x_58 sunx86_58 sun4x_59 sunx86_59>
 LDFLAGS=-r -dy -N drv/ip -N drv/udp -N strmod/rpcmod
@@ -60,7 +67,7 @@ LDFLAGS=-r -dy -N drv/ip -N drv/udp -N strmod/rpcmod
 LDFLAGS=-r -dy -N drv/ip -N drv/udp -N strmod/rpcmod -N fs/ufs
 
 # Name of directory to hold object files and libraries.
-<all -sun4x_510 sun4x_511 sunx86_511>
+<all -sun4x_510 -sun4x_511 -sunx86_511>
 KOBJ = MODLOAD32 MODLOAD64
 <sun4x_510 sun4x_511 sunx86_511>
 KOBJ = MODLOAD64
@@ -97,7 +104,7 @@ setup:
 ## This is the target for a Solaris 7. Here we build both the 32 bit and
 ## the 64 bit libafs in MODLOAD32 and MODLOAD64 directories respectively
 
-${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
+${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: setup
        for t in ${KOBJ} ; do \
                echo Building directory: $$t ; \
                case $$t in \
@@ -110,9 +117,7 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
                esac ; \
                export ARCH_DEFS ; \
                export BITS ; \
-               cd $$t  ; \
-               $(MAKE) $@_libafs || exit $$? ; \
-               cd ../ ;\
+               ( cd $$t && $(MAKE) $@_libafs ) || exit $$? ; \
        done
 
 solaris_compdirs_libafs: depsrcs libafs
@@ -144,11 +149,13 @@ dest_libafs: $(LIBAFS) $(LIBAFSNONFS)
        ${INSTALL} -m 644 $(LIBAFS) $(DEST_LIBAFS)
        ${INSTALL} -m 644 $(LIBAFSNONFS) $(DEST_LIBAFSNONFS)
 
+# See $TOP_SRCDIR/config/cc-wrapper for an explanation/usage of
+# OPENAFS_CC_WRAPPER_DEBUG_FLAG
+
 ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
        $(RM) -f $@
-       $(LD) $(LDFLAGS) -o $@ $(AFSAOBJS) ${AFSNFSOBJS}
+       OPENAFS_CC_WRAPPER_DEBUG_FLAG="$(KERN_DBG)" $(LD_WRAPPER) $(LD) $(LDFLAGS) -o $@ $(AFSAOBJS) ${AFSNFSOBJS}
 
 ${LIBAFSNONFS}:  $(AFSAOBJS) $(AFSNONFSOBJS)
        $(RM) -f $@
-       $(LD) $(LDFLAGS) -o $@ $(AFSAOBJS) ${AFSNONFSOBJS}
-
+       OPENAFS_CC_WRAPPER_DEBUG_FLAG="$(KERN_DBG)" $(LD_WRAPPER) $(LD) $(LDFLAGS) -o $@ $(AFSAOBJS) ${AFSNONFSOBJS}