STABLE14-openbsd-pthread-20050815

pullup openbsd pthread usage

(cherry picked from commit a09b27d0a0bdb9d967220388f76379ece4c7b5cb)

diff --git a/Makefile.in b/Makefile.in
index fbd3f0f837bdff3e19dfb9dfdaa3591048b22c2e..72a37a3c659c3ded9ae8e6cf14f5528051b8dfcc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -221,7 +221,7 @@ viced: cmd comerr vlserver audit
 
 tviced: cmd comerr viced vlserver libafsrpc libafsauthent
        case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd[23]*) \
+       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[23]*) \
                ${COMPILE_PART1} tviced ${COMPILE_PART2} ;; \
        *_darwin_[1-6][0-9]) \
                echo Not building MT viced for ${SYS_NAME} ;; \
@@ -236,7 +236,7 @@ volser: cmd comerr tviced usd kauth audit
 
 tvolser: project tviced usd libafsrpc libafsauthent volser
        case ${SYS_NAME} in                                             \
-       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*)   \
+       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[fo]bsd*|*nbsd2*)   \
                ${COMPILE_PART1} tvolser  ${COMPILE_PART2} ;;           \
        *_darwin_[1-6][0-9])                                            \
                echo Not building MT volser for ${SYS_NAME} ;;          \
@@ -487,7 +487,7 @@ tests: rxtests ubiktests
 # pthread based user space RX library
 libafsrpc: rx rxkad des
        case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd[23]*) \
+       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[23]*) \
        ${COMPILE_PART1} libafsrpc ${COMPILE_PART2} ;; \
        *_darwin_[1-6][0-9]) \
                echo Not building MT libafsrpc for ${SYS_NAME} ;; \
@@ -499,7 +499,7 @@ libafsrpc: rx rxkad des
 
 libafsauthent: ubik auth kauth libafsrpc
        case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd[23]*) \
+       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[23]*) \
        ${COMPILE_PART1} libafsauthent ${COMPILE_PART2} ;; \
        *_darwin_[1-6][0-9]) \
                echo Not building MT libafsauthent for ${SYS_NAME} ;; \

diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index 482047c62402530b618fc8895df2ebaa8689fa46..e71ed07b6bf8e326424362db0feb8ce08028b0ba 100644 (file)
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -363,7 +363,7 @@ syscall.o: ${SYS}/syscall.s
                ${AS} -P ${CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER ${SYS}/syscall.s; \
                ${AS} -o syscall.o syscall.i; \
                $(RM) -f syscall.ss syscall.i;; \
-        *fbsd* | *nbsd* ) \
+        *bsd* ) \
                touch syscall.o ;; \
         *) \
                /lib/cpp  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \