From: Eric Lauriault Date: Thu, 18 Oct 2001 00:36:02 +0000 (+0000) Subject: sunx86-support-20011017 X-Git-Tag: openafs-devel-1_3_0~190 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=367c2856e8ec8ddedcb422aad1a367581813a121;p=packages%2Fo%2Fopenafs.git sunx86-support-20011017 base sunx86 support for newer than solaris 2.4 --- diff --git a/Makefile.in b/Makefile.in index e7ff46295..5903a35a6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -137,7 +137,7 @@ comerr: util cmd: comerr @case ${SYS_NAME} in \ - sgi_6* | sun4x_57 | sun4x_58 | hp_ux11* | sparc64_linux* | alpha_linux* ) \ + sgi_6* | sun*_57 | sun*_58 | hp_ux11* | sparc64_linux* | alpha_linux* ) \ ${COMPILE_PART1} cmd ${COMPILE_PART2}64 ;; \ *) \ ${COMPILE_PART1} cmd ${COMPILE_PART2} ;; \ @@ -244,7 +244,7 @@ viced: project vlserver audit tviced: project viced vlserver libafsrpc libafsauthent case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux110) \ + alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux110) \ ${COMPILE_PART1} tviced ${COMPILE_PART2} ;; \ *) \ echo Not building MT viced for ${SYS_NAME} ;; \ @@ -266,7 +266,7 @@ null: project ${TOP_LIBDIR}/libtermlib.a: $(RM) -f ${TOP_LIBDIR}/libtermlib.a case ${SYS_NAME} in \ - rs_aix* | sun4x_5? | sgi_6? | *linux* | ppc_darwin* | *fbsd*) \ + rs_aix* | sun4x_* | sunx86_* | sgi_6? | *linux* | ppc_darwin* | *fbsd*) \ ln -s libnull.a ${TOP_LIBDIR}/libtermlib.a ;; \ *) \ ln -s /usr/lib/libtermlib.a ${TOP_LIBDIR}/libtermlib.a ;; \ @@ -315,7 +315,7 @@ login: project kauth rxkad ${COMPILE_PART1} login ${COMPILE_PART2} ;; \ parisc_linux24) \ echo Skipping pam/login for parisc_linux24 ;; \ - sun4x_* | hp_ux11* | *linux* | *fbsd* ) \ + sun4x_* | sunx86_* | hp_ux11* | *linux* | *fbsd* ) \ ${COMPILE_PART1} pam ${COMPILE_PART2} ;; \ ppc_darwin* | *_obsd* ) \ echo Skipping login for ${SYS_NAME} ;; \ @@ -415,7 +415,7 @@ butc: project bubasics butm budb bucoord cmd tbutc: project bubasics butm budb bucoord cmd butc case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|rs_aix4*|*linux*|hp_ux110) \ + alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix4*|*linux*|hp_ux110) \ ${COMPILE_PART1} tbutc ${COMPILE_PART2} ;; \ *) \ echo Not building MT butc for ${SYS_NAME} ;; \ @@ -438,7 +438,7 @@ tests: rxtests ubiktests # pthread based user space RX library libafsrpc: rx rxkad des case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux110) \ + alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux110) \ ${COMPILE_PART1} libafsrpc ${COMPILE_PART2} ;; \ *) \ echo Not building MT libafsrpc for ${SYS_NAME} ;; \ @@ -446,7 +446,7 @@ libafsrpc: rx rxkad des libafsauthent: ubik auth kauth libafsrpc case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux110) \ + alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux110) \ ${COMPILE_PART1} libafsauthent ${COMPILE_PART2} ;; \ *) \ echo Not building MT libafsrpc for ${SYS_NAME} ;; \ @@ -466,7 +466,7 @@ libadmin_real: libadmin: libafsauthent bozo case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux110) \ + alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux110) \ $(MAKE) libadmin_real ;; \ *) \ echo Not building MT libadmin for ${SYS_NAME} ;; \ @@ -748,7 +748,7 @@ package.files: package ntp: project volser @case ${WITH_OBSOLETE} in \ YES) case ${SYS_NAME} in \ - sun4x_58 | *linux* | *fbsd* | ppc_darwin* ) echo skipping ntp for ${SYS_NAME} ;; \ + sun4x_58 | sunx86_58 | *linux* | *fbsd* | ppc_darwin* ) echo skipping ntp for ${SYS_NAME} ;; \ * ) ${COMPILE_PART1} ntp ${COMPILE_PART2} ;; \ esac ;; \ *) echo skipping deprecated target: ntp ;; \ diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in index 315200d95..3682054bf 100644 --- a/src/afsd/Makefile.in +++ b/src/afsd/Makefile.in @@ -102,11 +102,11 @@ dest: ${DEST}/root.client/usr/vice/etc/afsd ${DEST}/etc/vsys esac;; \ sun4_52 | sun4_53 | sun4c_52 | sun4c_53 | sun4m_52 | sun4m_53 | sun4m_54 | sun4_54 | sun4c_54 | sunx86_54) \ ${INSTALL} -f ${srcdir}/afs.rc.solaris ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\ - sun4x_57 ) \ + sun*_57 ) \ ${INSTALL} -f ${srcdir}/afs.rc.solaris.2.7 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\ - sun4x_58 ) \ + sun*_58 ) \ ${INSTALL} -f ${srcdir}/afs.rc.solaris.2.8 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\ - sun4x_59 ) \ + sun*_59 ) \ ${INSTALL} -f ${srcdir}/afs.rc.solaris.2.9 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\ sun4x_5? ) \ ${INSTALL} -f ${srcdir}/afs.rc.solaris.2_5 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\ diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in index 5f255b037..2e5cf0dc7 100644 --- a/src/butc/Makefile.in +++ b/src/butc/Makefile.in @@ -110,7 +110,7 @@ clean: install: @case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|rs_aix4*|*linux*|hp_ux*) \ + alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix4*|*linux*|hp_ux*) \ echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \ *) \ echo ${INSTALL} butc ${DESTDIR}${sbindir}/butc ; \ @@ -121,7 +121,7 @@ install: include ../config/Makefile.version dest: @case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|rs_aix4*|*linux*|hp_ux*) \ + alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix4*|*linux*|hp_ux*) \ echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \ *) \ echo ${INSTALL} butc ${DEST}/etc/butc ; \ diff --git a/src/config/Makefile.sunx86_58.in b/src/config/Makefile.sunx86_58.in new file mode 100644 index 000000000..945a14282 --- /dev/null +++ b/src/config/Makefile.sunx86_58.in @@ -0,0 +1,52 @@ +# Keep macros within each section in sorted order for clean diff displays. +# +# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. +AFS_OSTYPE = SOLARIS +# +# compilation and link editor flags +XCFLAGS=-dy -Bdynamic +MT_CFLAGS=-mt -DAFS_PTHREAD_ENV ${XCFLAGS} +PAM_CFLAGS = -KPIC +PAMLIBS= -lc -lpam -lsocket -lnsl -lm +SHARE_LDFLAGS = -G -Bsymbolic +LWP_OPTMZ=-g +OPTMZ=-O +DBG=-g + +## Compilation flags for 64 bit Solaris +XCFLAGS64 = ${XCFLAGS} -xarch=v9 + +# +# libraries +XLIBS=@LIB_AFSDB@ -lsocket -lnsl -lintl -ldl +TXLIBS=-lcurses +MTLIBS=-lpthread -lsocket +XLIBELFA=-lelf +XLIBKVM=-lkvm +# +SHLIB_SUFFIX=so +SHLIB_CFLAGS=-KPIC +# +# programs +AR=/usr/ccs/bin/ar +AS=as +CC=/opt/SUNWspro/bin/cc +MT_CC=/opt/SUNWspro/bin/cc +CP=/bin/cp +LEX=lex +LD= /usr/ccs/bin/ld +LORDER = /usr/ccs/bin/lorder +MV=mv +RANLIB=/bin/true +RM=rm +STRIP= /usr/ccs/bin/strip +INSTALL=${TOP_SRCDIR}/pinstall/pinstall +# +# this is for the vol package +FS_CONV_SOL26 = fs_conv_sol26 +install_FS_CONV_SOL26 = $(DESTDIR)${afssrvsbindir}/fs_conv_sol26 +dest_FS_CONV_SOL26 = $(DEST)/root.server/usr/afs/bin/fs_conv_sol26 +# +# This is the XBSA make flag and pathname to XBSA header files (xbsa.h) +XBSA_FLAGS=-Dxbsa +XBSADIR=/opt/tivoli/tsm/client/api/bin/xopen diff --git a/src/config/param.sunx86_58.h b/src/config/param.sunx86_58.h new file mode 100644 index 000000000..fea82ee6f --- /dev/null +++ b/src/config/param.sunx86_58.h @@ -0,0 +1,91 @@ +#ifndef AFS_PARAM_H +#define AFS_PARAM_H + +#define AFS_VFS_ENV 1 +/* Used only in vfsck code; is it needed any more???? */ + +#define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */ +#define AFS_GREEDY43_ENV 1 /* Used only in rx/rx_user.c */ +#define AFS_ENV 1 +#define AFS_SUN_ENV 1 +#define AFS_SUN5_ENV 1 +#define AFS_SUN52_ENV 1 +#define AFS_SUN53_ENV 1 +#define AFS_SUN54_ENV 1 +#define AFS_SUN55_ENV 1 +#define AFS_SUN56_ENV 1 +#define AFS_SUN57_ENV 1 +#define AFS_SUN58_ENV 1 +#define AFS_X86_ENV 1 + +#ifdef AFS_NAMEI_ENV +#define AFS_64BIT_IOPS_ENV 1 /* needed for NAMEI... */ +#else /* AFS_NAMEI_ENV */ +#define AFS_3DISPARES 1 /* Utilize the 3 available disk inode 'spares' */ +#endif /* AFS_NAMEI_ENV */ + +#include + +#define AFS_GLOBAL_SUNLOCK 1 /* For global locking */ +#define RXK_LISTENER_ENV 1 +#define AFS_GCPAGS 1 /* if nonzero, garbage collect PAGs */ + +#define AFS_SYSCALL 65 + +/* File system entry (used if mount.h doesn't define MOUNT_AFS */ +#define AFS_MOUNT_AFS "afs" + +/* Machine / Operating system information */ +#define sys_sunx86_58 1 +#define SYS_NAME "sunx86_58" +#define SYS_NAME_ID SYS_NAME_ID_sunx86_58 +#define AFSLITTLE_ENDIAN 1 +#define AFS_HAVE_FFS 1 /* Use system's ffs. */ +#define AFS_HAVE_VXFS 1 /* Support cache on Veritas vxfs file system */ +#define AFS_HAVE_STATVFS 1 /* System supports statvfs */ +#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ +#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ + +#define NEARINODE_HINT 1 /* hint to ufs module to scatter inodes on disk*/ +#define nearInodeHash(volid, hval) { \ + unsigned char* ts = (unsigned char*)&(volid)+sizeof(volid)-1;\ + for ( (hval)=0; ts >= (unsigned char*)&(volid); ts--){\ + (hval) *= 173; \ + (hval) += *ts; \ + } \ + } + +/* Extra kernel definitions (from kdefs file) */ +#ifdef KERNEL +/* sun definitions here */ +#define AFS_UIOFMODE 1 /* Only in afs/afs_vnodeops.c (afs_ustrategy) */ +#define AFS_SYSVLOCK 1 /* sys v locking supported */ +/*#define AFS_USEBUFFERS 1*/ +#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 osi_GetTime(x) uniqtime(x) + + +#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 +#define memset(A, B, S) bzero(A, S) +#define memcpy(B, A, S) bcopy(A, B, S) +#define memcmp(A, B, S) bcmp(A, B, S) +#endif /* KERNEL */ +#define AFS_DIRENT +#ifndef CMSERVERPREF +#define CMSERVERPREF +#endif +#define ROOTINO UFSROOTINO + +#endif /* AFS_PARAM_H */ diff --git a/src/config/param.sunx86_58_usr.h b/src/config/param.sunx86_58_usr.h new file mode 100644 index 000000000..1d842341d --- /dev/null +++ b/src/config/param.sunx86_58_usr.h @@ -0,0 +1,59 @@ +#ifndef AFS_PARAM_H +#define AFS_PARAM_H + +#define AFS_VFS_ENV 1 +/* Used only in vfsck code; is it needed any more???? */ +#define RXK_LISTENER_ENV 1 +#define AFS_USERSPACE_IP_ADDR 1 +#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + +#define UKERNEL 1 /* user space kernel */ +#define AFS_GREEDY43_ENV 1 /* Used only in rx/rx_user.c */ +#define AFS_ENV 1 +#define AFS_USR_SUN5_ENV 1 +#define AFS_USR_SUN6_ENV 1 +#define AFS_USR_SUN7_ENV 1 +#define AFS_USR_SUN8_ENV 1 + +#include + +/*#define AFS_GLOBAL_SUNLOCK 1 /* For global locking */ + +#define AFS_3DISPARES 1 /* Utilize the 3 available disk inode 'spares' */ +#define AFS_SYSCALL 65 + +/* File system entry (used if mount.h doesn't define MOUNT_AFS */ +#define AFS_MOUNT_AFS 1 + +/* Machine / Operating system information */ +#define sys_sunx86_58 1 +#define SYS_NAME "sunx86_58" +#define SYS_NAME_ID SYS_NAME_ID_sunx86_58 +#define AFSLITTLE_ENDIAN 1 +#define AFS_HAVE_FFS 1 /* Use system's ffs. */ +#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ + +/* Extra kernel definitions (from kdefs file) */ +#ifdef KERNEL +#define AFS_UIOFMODE 1 /* Only in afs/afs_vnodeops.c (afs_ustrategy) */ +#define AFS_SYSVLOCK 1 /* sys v locking supported */ +/*#define AFS_USEBUFFERS 1*/ +#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 +#endif /* KERNEL */ +#define AFS_DIRENT +#ifndef CMSERVERPREF +#define CMSERVERPREF +#endif +#define ROOTINO UFSROOTINO + +#endif /* AFS_PARAM_H */ diff --git a/src/ftpd43+/Makefile.in b/src/ftpd43+/Makefile.in index e55d512d1..e13a58143 100644 --- a/src/ftpd43+/Makefile.in +++ b/src/ftpd43+/Makefile.in @@ -62,7 +62,7 @@ all: ${MAN} ftpd: ${OBJS} ${LIBS} case ${SYS_NAME} in \ - sun4c_53 | sun4m_53 | sun4_53 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_54) \ + sun4c_53 | sun4m_53 | sun4_53 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_*) \ ${CC} -o $@ ${OBJS} ${LIBS} ${XLIBS} -lsocket -lnsl -lauth -ldl ;; \ rs_aix*) \ ${CC} -o $@ ${OBJS} ${LIBS} ${XLIBS} -ls ;; \ diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in index efd9a67eb..ddc84fa75 100644 --- a/src/libafsrpc/Makefile.in +++ b/src/libafsrpc/Makefile.in @@ -335,7 +335,7 @@ base64.o: ${UTIL}/base64.c syscall.o: ${SYS}/syscall.s case "$(SYS_NAME)" in \ - sun4x_5*) \ + sun4x_5*|sunx86_5*) \ /usr/ccs/lib/cpp ${SFLAGS} ${SYS}/syscall.s syscall.ss; \ as -o syscall.o syscall.ss; \ $(RM) syscall.ss;; \ diff --git a/src/login/Makefile.in b/src/login/Makefile.in index 70404aaaf..96b1c5344 100644 --- a/src/login/Makefile.in +++ b/src/login/Makefile.in @@ -74,13 +74,13 @@ all: login login.krb login: ${OBJS} ${LIBS} case ${SYS_NAME} in \ - sun4x_5? ) ${CC} -g -o $@ ${CFLAGS} ${OBJS} -lc ${LIBS} ${XLIBS} -lcmd;;\ + sun4x_5?|sunx86_5? ) ${CC} -g -o $@ ${CFLAGS} ${OBJS} -lc ${LIBS} ${XLIBS} -lcmd;;\ *) ${CC} -g -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} ;;\ esac login.krb: ${KOBJS} ${KLIBS} case ${SYS_NAME} in \ - sun4x_5? ) ${CC} -g -o $@ ${CFLAGS} ${KOBJS} -lc ${KLIBS} ${XLIBS} -lcmd;;\ + sun4x_5?|sunx86_5? ) ${CC} -g -o $@ ${CFLAGS} ${KOBJS} -lc ${KLIBS} ${XLIBS} -lcmd;;\ *) ${CC} -g -o $@ ${CFLAGS} ${KOBJS} ${KLIBS} ${XLIBS} ;;\ esac diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in index d589aaa95..fabe40583 100644 --- a/src/lwp/Makefile.in +++ b/src/lwp/Makefile.in @@ -58,7 +58,7 @@ process.o : process.s process.c @case "$(SYS_NAME)" in \ pmax_he1) \ $(CC) -c -I${TOP_INCDIR} ${srcdir}/process.s;; \ - sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_54) \ + sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_5?) \ /usr/ccs/lib/cpp -P -I${TOP_INCDIR} ${srcdir}/process.s process.ss; \ ${AS} process.ss -o process.o; \ $(RM) process.ss ;; \ diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index 5fe8609d1..a474f2226 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -67,7 +67,7 @@ tests: pagsh pagsh.krb fixit iinc idec icreate iopen istat rmtsysd syscall.o: syscall.s case "$(SYS_NAME)" in \ - sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_54) \ + sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_5?) \ /usr/ccs/lib/cpp ${SFLAGS} ${srcdir}/syscall.s syscall.ss; \ as -o syscall.o syscall.ss; \ $(RM) syscall.ss;; \ diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in index 98b6b39fa..c1b2195a7 100644 --- a/src/venus/Makefile.in +++ b/src/venus/Makefile.in @@ -109,7 +109,7 @@ ${DEST}/etc/kdump: kdump for f in kdump.IP??; \ do ${INSTALL} -s $$f ${DEST}/etc/$$f || exit $$? ; \ done ;; \ - sun4x_5[78] ) \ + sun4x_5[78]|sunx86_5[78] ) \ ${INSTALLex} -f kdump.sh.solaris7 $@; \ ${INSTALL} -s -f $? ${DEST}/etc/kdump32;; \ *linux* ) \ @@ -125,7 +125,7 @@ ${DEST}/etc/kdump: kdump ${DEST}/etc/kdump64: kdump64 -set -x; \ case ${SYS_NAME} in \ - sun4x_5[78] | hp_ux11* ) \ + sun4x_5[78] | hp_ux11* |sunx86_5[78] ) \ ${INSTALL} -s $? $@ ;;\ * ) \ echo skipping kdump64 for ${SYS_NAME} ;; \ @@ -223,16 +223,16 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c kdump64.o : kdump.c ${INCLS} AFS_component_version_number.c -set -x; \ case ${SYS_NAME} in \ - sun4x_5[78] | hp_ux11* ) \ + sun4x_5[78] | hp_ux11* |sunx86_5[78] ) \ ${CC} -g -I${TOP_INCDIR}/afs -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS64} -o kdump64.o -c ${srcdir}/kdump.c ;; \ esac kdump: kdump.o -set -x; \ case ${SYS_NAME} in \ - sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_54 | sun4c_54 | sun4m_54 | sunx86_54) \ + sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_54 | sun4c_54 | sun4m_54 | sunx86_5? ) \ ${CC} -g -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a /usr/lib/libkvm.a -lelf ${XLIBS} ;; \ - sun4x_5? ) \ + sun4x_5? |sunx86_5? ) \ ${CC} -g -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \ sgi_6? ) \ for f in ../libafs/STATIC.IP*/CPU_KDEFS; \ @@ -266,7 +266,7 @@ kdump: kdump.o kdump64 : kdump64.o -set -x; \ case ${SYS_NAME} in \ - sun4x_5[78] | hp_ux11* ) \ + sun4x_5[78] | hp_ux11* |sunx86_5[78] ) \ ${CC} -g ${XCFLAGS64} -o kdump64 kdump64.o ${TOP_LIBDIR}/libcmd64.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \ esac @@ -324,7 +324,7 @@ ${DESTDIR}${sbindir}/kdump: kdump for f in kdump.IP??; \ do ${INSTALL} -s $$f ${DESTDIR}${sbindir}/$$f || exit $$? ; \ done ;; \ - sun4x_5[78] ) \ + sun4x_5[78] |sunx86_5[78] ) \ ${INSTALLex} -f kdump.sh.solaris7 $@; \ ${INSTALL} -s -f $? ${DESTDIR}${sbindir}/kdump32;; \ *linux* ) \ @@ -339,7 +339,7 @@ ${DESTDIR}${sbindir}/kdump: kdump ${DESTDIR}${sbindir}/kdump64: kdump64 -set -x; \ case ${SYS_NAME} in \ - sun4x_5[78] | hp_ux11* ) \ + sun4x_5[78] | hp_ux11* |sunx86_5[78] ) \ ${INSTALL} -s $? $@ ;;\ * ) \ echo skipping kdump64 for ${SYS_NAME} ;; \ diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in index 5d9e22151..1f54f29c2 100644 --- a/src/viced/Makefile.in +++ b/src/viced/Makefile.in @@ -110,7 +110,7 @@ cbd: cbd.o ${DEST}/root.server/usr/afs/bin/fileserver: fileserver @case ${SYS_NAME} in \ - alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*) \ + alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \ echo "Don't install fileserver for ${SYS_NAME}" ;; \ *) \ echo ${INSTALL} -ns $? $@ ; \ @@ -128,7 +128,7 @@ clean: include ../config/Makefile.version ${DESTDIR}${afssrvlibexecdir}/fileserver: fileserver @case ${SYS_NAME} in \ - alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*) \ + alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \ echo "Don't install fileserver for ${SYS_NAME}" ;; \ *) \ echo ${INSTALL} -ns $? $@ ; \