diff --git a/.gitignore b/.gitignore index cfafcedab6..0432c00838 100644 --- a/.gitignore +++ b/.gitignore @@ -63,7 +63,6 @@ config.log # Destination build directories /alpha_nbsd* -/alpha_dux* /amd64_linux* /amd64_fsbd* /amd64_nbsd* diff --git a/INSTALL b/INSTALL index 920e23e615..e6c5fabbd6 100644 --- a/INSTALL +++ b/INSTALL @@ -30,7 +30,6 @@ A Configuring A directory will be automatically created for binaries to be written into with this name when you build. - alpha_dux40, alpha_dux50, alpha_dux51 (client does not work) alpha_linux26 alpha_nbsd15, alpha_nbsd16 amd64_fbsd_80, amd64_fbsd_81, amd64_fbsd_82, amd64_fbsd_83, diff --git a/Makefile.in b/Makefile.in index 0fbb118c58..f0cdb2f314 100644 --- a/Makefile.in +++ b/Makefile.in @@ -236,7 +236,7 @@ ubik: cmd comerr auth ubik_depinstall sys tubik: ubik libafsrpc libafsauthent +case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*|*_darwin_*) \ + sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*|*_darwin_*) \ ${COMPILE_PART1} tubik ${COMPILE_PART2} ;; \ *) \ echo Not building MT ubik for ${SYS_NAME} ;; \ @@ -249,7 +249,7 @@ ptserver: cmd comerr ubik cmd comerr auth audit ptserver_depinstall tptserver: cmd comerr ptserver tubik libafsrpc libafsauthent +case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*|*_darwin_*) \ + sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*|*_darwin_*) \ ${COMPILE_PART1} tptserver ${COMPILE_PART2} ;; \ *) \ echo Not building MT ptserver for ${SYS_NAME} ;; \ @@ -270,7 +270,7 @@ vol: cmd comerr dir afs $(DIR_roken) tsalvaged: vol libafsrpc libafsauthent cmd util +case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[fn]bsd*|*_darwin_*) \ + sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[fn]bsd*|*_darwin_*) \ ${COMPILE_PART1} tsalvaged ${COMPILE_PART2} ;; \ *_darwin_*) \ ${COMPILE_PART1} tsalvaged ${COMPILE_PART2} ;; \ @@ -285,7 +285,7 @@ vlserver: cmd comerr vol audit vlserver_depinstall tvlserver: cmd comerr vol audit tubik libafsrpc libafsauthent \ tvlserver_depinstall +case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*|*_darwin_*) \ + sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*|*_darwin_*) \ ${COMPILE_PART1} tvlserver ${COMPILE_PART2} ;; \ *) \ echo Not building MT tvlserver for ${SYS_NAME} ;; \ @@ -297,7 +297,7 @@ viced: cmd comerr vlserver tvlserver libafsrpc libafsauthent audit dviced: cmd comerr viced vlserver tvlserver libafsrpc libafsauthent +case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*|*_darwin_*) \ + sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*|*_darwin_*) \ ${COMPILE_PART1} dviced ${COMPILE_PART2} ;; \ *) \ echo Not building DAFS viced for ${SYS_NAME} ;; \ @@ -308,7 +308,7 @@ volser: cmd comerr usd kauth vlserver audit tvolser: project viced usd libafsrpc libafsauthent volser +@case ${SYS_NAME} in \ - *_darwin_*|alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \ + *_darwin_*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \ ${COMPILE_PART1} tvolser ${COMPILE_PART2} ;; \ *) \ echo Not building MT volser for ${SYS_NAME} ;; \ @@ -316,7 +316,7 @@ tvolser: project viced usd libafsrpc libafsauthent volser dvolser: project viced usd libafsrpc libafsauthent volser +@case ${SYS_NAME} in \ - *_darwin_*|alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \ + *_darwin_*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \ ${COMPILE_PART1} dvolser ${COMPILE_PART2} ;; \ *) \ echo Not building DAFS volser for ${SYS_NAME} ;; \ @@ -531,7 +531,7 @@ butc: cmd comerr bubasics butm budb bucoord cmd rxgen rx tbutc: cmd comerr bubasics butm budb bucoord cmd butc libadmin +case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*_darwin_*) \ + sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*_darwin_*) \ ${COMPILE_PART1} tbutc ${COMPILE_PART2} ;; \ *) \ echo Not building MT butc for ${SYS_NAME} ;; \ @@ -542,7 +542,7 @@ budb: cmd comerr bubasics uss tbudb: budb tubik +case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*|*_darwin_*) \ + sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*|*_darwin_*) \ ${COMPILE_PART1} tbudb ${COMPILE_PART2} ;; \ *) \ echo Not building MT budb for ${SYS_NAME} ;; \ @@ -567,7 +567,7 @@ tests: rxtests ubiktests rpctestlib viced # pthread based user space RX library libafsrpc: comerr fsint hcrypto lwp rx rxkad rxstat sys util +case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \ + sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \ ${COMPILE_PART1} libafsrpc ${COMPILE_PART2} ;; \ *_darwin_[1-6][0-9]) \ echo Not building MT libafsrpc for ${SYS_NAME} ;; \ @@ -579,7 +579,7 @@ libafsrpc: comerr fsint hcrypto lwp rx rxkad rxstat sys util libafsauthent: audit auth kauth ubik util sys ptserver volser vlserver libafsrpc +case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \ + sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \ ${COMPILE_PART1} libafsauthent ${COMPILE_PART2} ;; \ *_darwin_[1-6][0-9]) \ echo Not building MT libafsauthent for ${SYS_NAME} ;; \ @@ -606,7 +606,7 @@ libadmin_real: libadmin: libafsauthent bozo bubasics +case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \ + sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \ $(MAKE) libadmin_real ;; \ *_darwin_[1-6][0-9]) \ echo Not building MT libadmin for ${SYS_NAME} ;; \ @@ -618,7 +618,7 @@ libadmin: libafsauthent bozo bubasics libjafs: libadmin +case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux110) \ + sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux110) \ ${COMPILE_PART1} JAVA/libjafs ${COMPILE_PART2} ;; \ *) \ echo Not building MT libjafs for ${SYS_NAME} ;; \ diff --git a/src/afs/AIX/osi_file.c b/src/afs/AIX/osi_file.c index 4bd33711e1..9ac164ac3a 100644 --- a/src/afs/AIX/osi_file.c +++ b/src/afs/AIX/osi_file.c @@ -37,7 +37,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode) osi_Panic("UFSOpen called for non-UFS cache\n"); } if (!afs_osicred_initialized) { - /* valid for alpha_osf, SunOS, Ultrix */ + /* valid for SunOS, Ultrix */ memset(&afs_osi_cred, 0, sizeof(afs_ucred_t)); crhold(&afs_osi_cred); /* don't let it evaporate, since it is static */ afs_osicred_initialized = 1; diff --git a/src/afs/DARWIN/osi_file.c b/src/afs/DARWIN/osi_file.c index 19bfdf9b75..56de7155e0 100644 --- a/src/afs/DARWIN/osi_file.c +++ b/src/afs/DARWIN/osi_file.c @@ -151,7 +151,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode) osi_Panic("UFSOpen called for non-UFS cache\n"); } if (!afs_osicred_initialized) { - /* valid for alpha_osf, SunOS, Ultrix */ + /* valid for SunOS, Ultrix */ memset(&afs_osi_cred, 0, sizeof(afs_ucred_t)); afs_osi_cred.cr_ref++; #ifndef AFS_DARWIN110_ENV diff --git a/src/afs/HPUX/osi_file.c b/src/afs/HPUX/osi_file.c index a562fd46d0..df9991e973 100644 --- a/src/afs/HPUX/osi_file.c +++ b/src/afs/HPUX/osi_file.c @@ -37,7 +37,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode) osi_Panic("UFSOpen called for non-UFS cache\n"); } if (!afs_osicred_initialized) { - /* valid for alpha_osf, SunOS, Ultrix */ + /* valid for SunOS, Ultrix */ memset(&afs_osi_cred, 0, sizeof(afs_ucred_t)); crhold(&afs_osi_cred); /* don't let it evaporate, since it is static */ afs_osicred_initialized = 1; diff --git a/src/afs/IRIX/osi_file.c b/src/afs/IRIX/osi_file.c index 92a366cc88..9f99c0046b 100644 --- a/src/afs/IRIX/osi_file.c +++ b/src/afs/IRIX/osi_file.c @@ -50,7 +50,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode) osi_Panic("UFSOpen called for non-UFS cache\n"); } if (!afs_osicred_initialized) { - /* valid for alpha_osf, SunOS, Ultrix */ + /* valid for SunOS, Ultrix */ memset(&afs_osi_cred, 0, sizeof(afs_ucred_t)); crhold(&afs_osi_cred); /* don't let it evaporate, since it is static */ afs_osicred_initialized = 1; diff --git a/src/afs/LINUX/osi_file.c b/src/afs/LINUX/osi_file.c index fd68b16b38..21bfd84079 100644 --- a/src/afs/LINUX/osi_file.c +++ b/src/afs/LINUX/osi_file.c @@ -93,7 +93,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode) osi_Panic("UFSOpen called for non-UFS cache\n"); } if (!afs_osicred_initialized) { - /* valid for alpha_osf, SunOS, Ultrix */ + /* valid for SunOS, Ultrix */ memset(&afs_osi_cred, 0, sizeof(afs_ucred_t)); crhold(&afs_osi_cred); /* don't let it evaporate, since it is static */ afs_osicred_initialized = 1; diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in index 4e7319c749..ec46658b2a 100644 --- a/src/afsd/Makefile.in +++ b/src/afsd/Makefile.in @@ -114,9 +114,6 @@ dest: afsd vsys @ENABLE_FUSE_CLIENT@ sun*_511 ) \ ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload ; \ ${INSTALL_SCRIPT} ${srcdir}/afs.rc.solaris.2.11 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\ - alpha_osf* ) \ - ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/dkload ; \ - ${INSTALL_SCRIPT} ${srcdir}/afs.rc.alpha ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\ hp_ux1122 ) \ ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/dkload ; \ ${INSTALL_SCRIPT} ${srcdir}/afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;\ @@ -125,9 +122,6 @@ dest: afsd vsys @ENABLE_FUSE_CLIENT@ ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/dkload ; \ ${INSTALL_SCRIPT} ${srcdir}/afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;\ ${INSTALL_DATA} ${srcdir}/afs.hpux102.driver ${DEST}/root.client/usr/vice/etc/afs.driver ;;\ - alpha_dux* ) \ - ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/dkload ; \ - ${INSTALL_SCRIPT} ${srcdir}/afs.rc.alpha_dux40 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\ hp?00_ux10? ) \ ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/dkload ; \ ${INSTALL_SCRIPT} ${srcdir}/afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\ diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in index 5d942222e7..fbdc49f14d 100644 --- a/src/butc/Makefile.in +++ b/src/butc/Makefile.in @@ -97,7 +97,7 @@ clean: install: butc read_tape ${INSTALL} -d ${DESTDIR}${sbindir} @case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux*) \ + sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux*) \ echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \ *_darwin_[1-6][0-9]) \ echo ${INSTALL_PROGRAM} butc ${DESTDIR}${sbindir}/butc ; \ @@ -113,7 +113,7 @@ install: butc read_tape dest: butc read_tape ${INSTALL} -d ${DEST}/etc @case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux*) \ + sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux*) \ echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \ *_darwin_[1-6][0-9]) \ echo ${INSTALL_PROGRAM} butc ${DEST}/etc/butc ; \ diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4 index 8e3ce2763b..f3bb822d4e 100644 --- a/src/cf/osconf.m4 +++ b/src/cf/osconf.m4 @@ -45,27 +45,6 @@ AS_IF([test "x$GENCAT" = "xfalse"], [AC_MSG_ERROR([cannot find required command dnl TODO - need to disable STRIP if we are doing debugging in any user space code case $AFS_SYSNAME in - alpha_dux40) - CC="cc" - CSTATIC="-non_shared" - DBG="-g3" - MT_CFLAGS='-D_REENTRANT=1 -pthread' - MT_LIBS="-pthread -lpthread -lmach -lexc -lc" - XCFLAGS="-D_NO_PROTO -DOSF" - SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\"" - ;; - - alpha_dux50 | alpha_dux51) - CC="cc" - DBG="-g3" - CSTATIC="-non_shared" - LWP_OPTMZ="-O2" - MT_CFLAGS='-D_REENTRANT=1 -pthread' - MT_LIBS="-pthread -lpthread -lmach -lexc -lc" - XCFLAGS="-D_NO_PROTO -DOSF" - SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\"" - ;; - alpha_linux_22 | alpha_linux_24 | alpha_linux_26) CCOBJ="\$(CC) -fPIC" MT_CFLAGS='-pthread -D_REENTRANT' diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in index ce1fb11481..46561f1171 100644 --- a/src/lwp/Makefile.in +++ b/src/lwp/Makefile.in @@ -155,9 +155,6 @@ process.o : process.default.s process.i386.s process.amd64.s process.c lwp.o $(RM) process.s ;; \ hp* | *_linux* | *_umlinux* | sgi_64 | sgi_65 ) \ $(AFS_CCRULE_NOQ) -c ${srcdir}/process.c;; \ - alpha_osf1 | alpha_osf20 | alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \ - ${AS} -v -P -DOSF -I${TOP_INCDIR} -DASSEMBLER ${srcdir}/process.default.s; \ - ${AS} -v process.i -o process.o;; \ ia64_hpux11* | hp_ux11* ) \ $(AFS_CCRULE_NOQ) -c ${srcdir}/process.c;; \ i386_*) \ diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in index 78645b7d6e..280107f77d 100644 --- a/src/venus/Makefile.in +++ b/src/venus/Makefile.in @@ -172,8 +172,6 @@ kdump: kdump.o $(MAKE) kdump-alpha_linux-@LINUX_VERSION@ ;; \ *linux* ) \ $(MAKE) kdump-linux-@LINUX_VERSION@ ;; \ - alpha_osf1 | alpha_osf20 | alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux??) \ - ${CC} -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS} -ll -lmld;; \ ncrx86_* ) ${CC} -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a -lelf ${XLIBS} ;; \ *bsd*) touch kdump ;; \ * ) ${CC} -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS} ;; \ @@ -197,8 +195,6 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c $(MAKE) kdump-alpha_linux-${LINUX_VERSION}.o ;; \ *linux* ) \ $(MAKE) kdump-linux-${LINUX_VERSION}.o ;; \ - alpha_osf1 | alpha_osf20 | alpha_osf30 | alpha_osf32 | alpha_osf32c| alpha_dux?? ) \ - ${CC} ${AFS_CFLAGS} -I/usr/sys/include -I/usr/sys/BINARY -I/usr/sys/AFS -DDEBUGGER -c ${srcdir}/kdump.c ;;\ sgi_6? ) \ for f in ../libafs/STATIC.IP*/CPU_KDEFS; \ do IP=`expr "$$f" : '../libafs/STATIC.\(IP..\)'`; \ diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in index 7e9cc78af6..62b1e0bffb 100644 --- a/src/volser/Makefile.in +++ b/src/volser/Makefile.in @@ -198,7 +198,7 @@ install: restorevol voldump volser.h volint.h vos volserver libvolser.a ${INSTALL_PROGRAM} vos ${DESTDIR}${afssrvsbindir}/vos ${INSTALL_DATA} libvolser.a ${DESTDIR}${libdir}/afs/libvolser.a @case ${SYS_NAME} in \ - alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \ + *linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \ echo "Don't install volserver for ${SYS_NAME}" ;; \ *_darwin_[1-6][0-9]) \ echo ${INSTALL} volserver \ @@ -228,7 +228,7 @@ dest: restorevol voldump volser.h volint.h vos volserver libvolser.a ${INSTALL_PROGRAM} vos ${DEST}/root.server/usr/afs/bin/vos ${INSTALL_DATA} libvolser.a ${DEST}/lib/afs/libvolser.a @case ${SYS_NAME} in \ - alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \ + *linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \ echo "Don't install volserver for ${SYS_NAME}" ;; \ *_darwin_[1-6][0-9]) \ echo ${INSTALL} volserver \