From ece18f64261cf51179c3f8c720bab659b999171f Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Sat, 20 May 2023 01:20:15 -0500 Subject: [PATCH] Kill Irix pre-6.5 Commit d1923139e6 (irix kill efs and start pruning pre-65) removed most pre-6.5 Irix code, but there are still numerous references laying around. Get rid of them. Change-Id: I5e8b092374c616ccec84d195021a8bee78a4cea2 Reviewed-on: https://gerrit.openafs.org/15455 Reviewed-by: Ben Huntsman Reviewed-by: Cheyenne Wills Tested-by: BuildBot Reviewed-by: Michael Meffie --- INSTALL | 2 +- src/afsd/Makefile.in | 9 - src/afsd/afs_rtsymtab.pl.sgi_53 | 332 ------------------------------- src/afsd/afs_rtsymtab.pl.sgi_61 | 329 ------------------------------ src/cf/osconf.m4 | 36 ---- src/libafs/MakefileProto.IRIX.in | 218 -------------------- src/lwp/Makefile.in | 10 +- src/sys/Makefile.in | 8 +- 8 files changed, 3 insertions(+), 941 deletions(-) delete mode 100644 src/afsd/afs_rtsymtab.pl.sgi_53 delete mode 100644 src/afsd/afs_rtsymtab.pl.sgi_61 diff --git a/INSTALL b/INSTALL index a308672145..a5d07bf758 100644 --- a/INSTALL +++ b/INSTALL @@ -62,7 +62,7 @@ A Configuring rs_aix72, rs_aix73 s390_linux26 s390x_linux26 - sgi_62, sgi_63, sgi_64, sgi_65 (file server not tested) + sgi_65 (file server not tested) sparc64_linux26 sun4x_58, sun4x_59, sun4x_510, sun4x_511 (logging UFS not supported for mixed-use partitions containing diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in index ec46658b2a..84e4b6418c 100644 --- a/src/afsd/Makefile.in +++ b/src/afsd/Makefile.in @@ -96,15 +96,6 @@ dest: afsd vsys @ENABLE_FUSE_CLIENT@ ${INSTALL} -d ${DEST}/root.server/etc/init.d ; \ ${INSTALL_SCRIPT} ${srcdir}/afs.rc.sgi_ipnos ${DEST}/root.client/usr/vice/etc/sgiload/afs.rc ;\ ${INSTALL_SCRIPT} ${srcdir}/afs.rc.sgi_ipnos ${DEST}/root.server/etc/init.d/afs.rc ;;\ - sgi_* ) \ - ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/sgiload ; \ - ${INSTALL} -d ${DEST}/root.server/etc/init.d ; \ - ${INSTALL_SCRIPT} ${srcdir}/afs.rc.sgi ${DEST}/root.client/usr/vice/etc/sgiload/afs.rc ;\ - ${INSTALL_SCRIPT} ${srcdir}/afs.rc.sgi ${DEST}/root.server/etc/init.d/afs.rc ;\ - case ${SYS_NAME} in \ - sgi_53 | sgi_61 ) \ - ${INSTALL_SCRIPT} ${srcdir}/afs_rtsymtab.pl.${SYS_NAME} ${DEST}/root.client/usr/vice/etc/sgiload/afs_rtsymtab.pl ;;\ - esac;; \ sun*_58 ) \ ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload ; \ ${INSTALL_SCRIPT} ${srcdir}/afs.rc.solaris.2.8 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\ diff --git a/src/afsd/afs_rtsymtab.pl.sgi_53 b/src/afsd/afs_rtsymtab.pl.sgi_53 deleted file mode 100644 index 30fe40c4fe..0000000000 --- a/src/afsd/afs_rtsymtab.pl.sgi_53 +++ /dev/null @@ -1,332 +0,0 @@ -#!/bin/perl -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -# afs_rtsymtab.pl (For IRIX 5.3 only) -# This script modifies /var/sysgen/master.d/rtsymtab file so that -# AFS kernel extentions can be dynamically loaded using /sbin/ml. -# The original version of rtsymtab is saved as -# /var/sysgen/master.d/rtsymtab.orig. This script must be run only -# once on each SGI IRIX 5.3 machine that is to be an AFS 3.4 client. -# -# Usage: afs_rtsymtab.pl -run [-force] [-help] -# - - - -@scriptnameparts = split('/', $0); -$scriptname = pop @scriptnameparts; - -$FILE = "/var/sysgen/master.d/rtsymtab"; -$LOG = "/tmp/$scriptname.log"; - -# -# This script must be run by the superuser -# -die ("\n$scriptname: Sorry, this script must be run by root.\n\n") - if ($< != 0); - -$USAGE="\nUsage: $scriptname -run [-force] [-help] - - This script modifies $FILE in IRIX 5.3 so that - AFS 3.4 kernel extentions may be dynamically loaded using - /sbin/ml. A copy of $FILE is saved - as $FILE.orig before it is changed. - You will need to run this script only once after you install - AFS 3.4 on your clients. - - This script will exit if it determines that - $FILE has already been modifed for AFS. - If this is incorrect, run this script again with the - -force flag.\n\n"; - -# -# Parse command line -# -$run = $force = 0; -for $_ (@ARGV) { - if (/-run/) { - $run = 1; - } elsif (/-force/) { - $force = 1; - } else { - die $USAGE - } -} -die $USAGE if (! $run); - -# -# The following extern definitions are required by AFS and -# must be added to $FILE -# These headers are part of the mimimal OS configuration. They should always -# be present on the system. -# -$ExternHeaders = -"#include -#include -#include -#include -#include -#include "; - -$ExternDefns = -"extern time(), remapf(), exit(), iget(), iput(), efs_ialloc(), - iunlock(), estgroups(), setgroups(), setgroupsp(), afs_vfsopsp(), - afs_vnodeopsp(), afsidestroyp(), afsdptoipp(), afsiptodpp(), - hostintable(), idbg_prafsnodep(), idbg_afsvfslistp(), idbg_addfunc(), - qprintf(), checkauth(), __ll_rem(), exported_lock(), rfsdisptab_v3(), - vattr_to_wcc_data(), vattr_to_wcc_attr(), vattr_to_fattr3(), - puterrno3(), makefh3(), xdr_string(), xdr_u_long(), xdr_char(), - xdr_long(), xdr_short(), xdr_bytes(), xdr_opaque(), xdr_u_short(), - xdr_u_int(), xdr_int(), xdr_array(), vsync(), - assfail(), doass(), in_cksum(), convoff(), debug(), copyinstr(), - stime(), sysent(), syscallsw() ;"; -# -# For each member of @NewSymtabEntries, an entry of the following type must be -# added (if one does not exist) to the rtsymtab[] array. -# -# {(long) &time, "time"}, /* DDI/DKI */ -# -@NewSymtabEntries = ( -"time", -"vmonitor", -"pmonitor", -"rmonitor", -"amonitor", -"spunlock_psema", -"spunlockspl_psema", -"vn_rele", -"vn_hold", -"vn_rdwr", -"vn_initlist", -"ptossvp", -"cleanlocks", -"crget", -"crdup", -"crhold", -"crfree", -"remapf", -"lookupname", -"exit", -"sys_cred", -"vfs_devsearch", -"iget", -"iput", -"efs_ialloc", -"falloc", -"iunlock", -"fready", -"vrelvm", -"settime", -"wtodc", -"socreate", -"soreserve", -"sobind", -"soclose", -"xdr_string", -"xdr_u_long", -"xdr_char", -"xdr_long", -"xdr_short", -"xdr_bytes", -"xdr_opaque", -"xdr_u_short", -"xdr_u_int", -"xdr_int", -"xdr_array", -"inetdomain", -"udpcksum", -"ifcksum", -"ip_stripoptions", -"in_cksum", -"stime", -"sysent", -"syscallsw", -"estgroups", -"setgroups", -"setgroupsp", -"afs_vfsopsp", -"afs_vnodeopsp", -"afsidestroyp", -"afsdptoipp", -"afsiptodpp", -"idbg_prafsnodep", -"idbg_afsvfslistp", -"idbg_addfunc", -"initmonitor", -"pflushinvalvp", -"pflushvp", -"pdflush", -"ngroups_max", -"pinvalfree", -"fs_setfl", -"fs_cmp", -"fs_nosys", -"fs_poll", -"fs_pathconf", -"fs_frlock", -"convoff", -"__ll_rem", -"chunkread", -"getchunk", -"debug", -"bp_mapin", -"bawrite", -"bwrite", -"fs_map_subr", -"cpsema", -"qprintf", -"copyinstr", -"checkauth", -"imon_event", -"imon_enabled", -"exported_lock", -"rfsdisptab_v3", -"getvfs", -"mrunlock", -"vattr_to_wcc_data", -"vattr_to_wcc_attr", -"vattr_to_fattr3", -"hostintable", -"puterrno3", -"makefh3", -"vsync" -); - -# -# Check that /var/sysgen/master.d/rtsymtab exists and does not contain -# AFS symbols -# - -die ("\n\tError: Cannot find $FILE\n" . - "\tCheck your Operating System installation documentation.\n") - if (! -f $FILE); -if (! $force && ! system("/bin/grep afs_vnodeops $FILE > /dev/null")) { - die ("\n\tError: It looks like $FILE has already been - modified for dynamically loading AFS. If this is incorrect, run - this script again with the -force flag\n\n"); -} - -# -# Read all the symbols in the rtsymtab[] table from $FILE -# and mark them in an associative array indexed by the symbol name. -# - -open(SYMTAB, "<$FILE") || die("\nError: failed to open $FILE: $!\n"); -$found = 0; -while () { # Skip ahead to rtsymtab definition - last if /rtsymtab\[\]/; -} -while () { # Extract the name of each symbol - if (/{.*,.*"(.*)"}/) { - $OldSymtabEntries{$1} = 1; - $found++; - } -} -# -# Make sure that the above loop worked! -# -die("Error: Could not locate the rtsymtab\[\] table in $FILE\n\n") - if (! $found); - -close(SYMTAB); - - -# -# Check if any of the new symbols that we need to add exist in the rtsymtab -# table. Keep track of all symbols that we delete from NewSymtabEntries. -# - -$offset=0; -for $var (@NewSymtabEntries) { - if ($OldSymtabEntries{$var}) { - $del = splice(@NewSymtabEntries,$offset,1); - push(@DelSymtabEntries, $del); - #print "debug: $var exists\n"; - } - $offset++; -} - -# -# Create the new rtsymtab file. -# Place the new extern definitions just before the rtsymtab[] table -# definition. Append new entries to the rtsymtab table to the end -# of the file. -# - -open(NEWSYMTAB, ">$FILE.new") || die("Error: Could not open $File.new: $!\n"); -open(OLDSYMTAB, "<$FILE") || die("Error: Could not open $FILE: $!\n"); - -print "Creating $FILE.new\n"; - -while () { - if (/rtsymtab\[\] = {/) { - print NEWSYMTAB "\n /*\n * The following extern definitions"; - print NEWSYMTAB " are required by AFS\n */\n"; - print NEWSYMTAB "$ExternHeaders\n\n"; - print NEWSYMTAB "$ExternDefns\n\n"; - print NEWSYMTAB "#define DEBUG 1 /* Required by AFS */\n\n"; - print NEWSYMTAB $_; - } else { - print NEWSYMTAB $_; - } -} - -# -# Append the new rtsymtab[] entries to the end of the file -# - -print NEWSYMTAB "\t/*\n\t * The following symbols are required by AFS\n"; -print NEWSYMTAB "\t */\n\n"; - -foreach $var (@NewSymtabEntries) { - printf(NEWSYMTAB "\t {(long) &%s,%15s},\t\t%s\n", - $var, "\"$var\"", "/* DDI/DDK */"); -} - -close(NEWSYMTAB); -close(OLDSYMTAB); - -# -# Replace $FILE with $FILE.new -# -#print "NOT renaming files!\n"; - -die ("Error: Could not move $FILE to $FILE.orig: $!\n") - if (! rename($FILE, "$FILE.orig")); -print "Moved $FILE to $FILE.orig\n"; -die ("Error: Could not move $FILE.new to $FILE: $!\n") - if (! rename("$FILE.new", $FILE)); -print "Moved $FILE.new to $FILE\n"; - - -# -# List rtsymtab[] entries that were not added to the new file. -# - -if ($#DelSymtabEntries >= 0) { - - open(LOGFILE,">$LOG") || die("Error: Could not open $LOG: $!"); - - print LOGFILE "\n\n\tThe following entries were already defined - in the rtsymtab\[\] table in $FILE. - View $FILE and verify the correctness of these entries. - Make sure that these entries are correctly defined for this - machine. \n\n"; - - for $var (@DelSymtabEntries) { - printf(LOGFILE "\t {(long) &%s,%15s},\t\t%s\n", - $var, "\"$var\"", "/* DDI/DDK */"); - } - print LOGFILE "\n\tNOTE: This message has been saved in $LOG\n"; - close(LOGFILE); - system("/bin/cat $LOG"); -} - -print "\n$scriptname Done. $FILE has been modified to allow -AFS 3.4 kernel extentions to be dynamically loaded using /sbin/ml.\n\n"; - diff --git a/src/afsd/afs_rtsymtab.pl.sgi_61 b/src/afsd/afs_rtsymtab.pl.sgi_61 deleted file mode 100644 index 86d1437135..0000000000 --- a/src/afsd/afs_rtsymtab.pl.sgi_61 +++ /dev/null @@ -1,329 +0,0 @@ -#!/bin/perl -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -# afs_rtsymtab.pl (For IRIX 6.1 only) -# This script modifies /var/sysgen/master.d/rtsymtab file so that -# AFS kernel extentions can be dynamically loaded using /sbin/ml. -# The original version of rtsymtab is saved as -# /var/sysgen/master.d/rtsymtab.orig. This script must be run only -# once on each SGI IRIX 5.3 machine that is to be an AFS 3.4 client. -# -# Usage: afs_rtsymtab.pl -run [-force] [-help] -# - - - -@scriptnameparts = split('/', $0); -$scriptname = pop @scriptnameparts; - -$FILE = "/var/sysgen/master.d/rtsymtab"; -$LOG = "/tmp/$scriptname.log"; - -# -# This script must be run by the superuser -# -die ("\n$scriptname: Sorry, this script must be run by root.\n\n") - if ($< != 0); - -$USAGE="\nUsage: $scriptname -run [-force] [-help] - - This script modifies $FILE in IRIX 6.1 so that - AFS 3.4 kernel extentions may be dynamically loaded using - /sbin/ml. A copy of $FILE is saved - as $FILE.orig before it is changed. - You will need to run this script only once after you install - AFS 3.4 on your clients. - - This script will exit if it determines that - $FILE has already been modifed for AFS. - If this is incorrect, run this script again with the - -force flag.\n\n"; - -# -# Parse command line -# -$run = $force = 0; -for $_ (@ARGV) { - if (/-run/) { - $run = 1; - } elsif (/-force/) { - $force = 1; - } else { - die $USAGE - } -} -die $USAGE if (! $run); - -# -# The following extern definitions are required by AFS and -# must be added to $FILE -# These headers are part of the mimimal OS configuration. They should always -# be present on the system. -# -$ExternHeaders = -"#include -#include -#include -#include -#include -#include "; - -$ExternDefns = -"extern time(), remapf(), exit(), iget(), iput(), efs_ialloc(), - iunlock(), estgroups(), setgroups(), setgroupsp(), afs_vfsopsp(), - afs_vnodeopsp(), afsidestroyp(), afsdptoipp(), afsiptodpp(), - hostintable(), idbg_prafsnodep(), idbg_afsvfslistp(), - checkauth(), __ll_rem(), exported_lock(), rfsdisptab_v3(), - vattr_to_wcc_data(), vattr_to_wcc_attr(), vattr_to_fattr3(), - puterrno3(), makefh3(), xdr_string(), xdr_u_long(), xdr_char(), - xdr_long(), xdr_short(), xdr_bytes(), xdr_opaque(), xdr_u_short(), - xdr_u_int(), xdr_int(), xdr_array(), vsync(), - assfail(), in_cksum(), convoff(), debug(), - stime(), sysent(), syscallsw(), wtodc(), in_ifaddr();"; - -# -# For each member of @NewSymtabEntries, an entry of the following type must be -# added (if one does not exist) to the rtsymtab[] array. -# -# {(long) &time, "time"}, /* DDI/DKI */ -# -@NewSymtabEntries = ( -"assfail", -"time", -"vmonitor", -"doass", -"pmonitor", -"rmonitor", -"amonitor", -"vn_rele", -"vn_hold", -"vn_rdwr", -"vn_initlist", -"ptossvp", -"cleanlocks", -"crget", -"crdup", -"crhold", -"crfree", -"lookupname", -"sys_cred", -"vfs_devsearch", -"iget", -"iput", -"efs_ialloc", -"falloc", -"iunlock", -"fready", -"vrelvm", -"settime", -"wtodc", -"socreate", -"soreserve", -"sobind", -"soclose", -"xdr_string", -"xdr_u_long", -"xdr_char", -"xdr_long", -"xdr_short", -"xdr_bytes", -"xdr_opaque", -"xdr_u_short", -"xdr_u_int", -"xdr_int", -"xdr_array", -"inetdomain", -"udpcksum", -"ifcksum", -"ip_stripoptions", -"in_cksum", -"stime", -"sysent", -"syscallsw", -"estgroups", -"setgroups", -"setgroupsp", -"afs_vfsopsp", -"afs_vnodeopsp", -"afsidestroyp", -"afsdptoipp", -"afsiptodpp", -"idbg_prafsnodep", -"idbg_afsvfslistp", -"initmonitor", -"pflushinvalvp", -"pflushvp", -"pdflush", -"ngroups_max", -"pinvalfree", -"fs_setfl", -"fs_cmp", -"fs_nosys", -"fs_poll", -"fs_pathconf", -"fs_frlock", -"convoff", -"chunkread", -"getchunk", -"bp_mapin", -"bawrite", -"bwrite", -"fs_map_subr", -"checkauth", -"imon_event", -"imon_enabled", -"exported_lock", -"rfsdisptab_v3", -"getvfs", -"vattr_to_wcc_data", -"vattr_to_wcc_attr", -"vattr_to_fattr3", -"hostintable", -"puterrno3", -"makefh3", -"vsync", -"in_ifaddr", -"irix5_microtime" -); - -# -# Check that /var/sysgen/master.d/rtsymtab exists and does not contain -# AFS symbols -# - -die ("\n\tError: Cannot find $FILE\n" . - "\tCheck your Operating System installation documentation.\n") - if (! -f $FILE); -if (! $force && ! system("/bin/grep afs_vnodeops $FILE > /dev/null")) { - die ("\n\tError: It looks like $FILE has already been - modified for dynamically loading AFS. If this is incorrect, run - this script again with the -force flag\n\n"); -} - -# -# Read all the symbols in the rtsymtab[] table from $FILE -# and mark them in an associative array indexed by the symbol name. -# - -open(SYMTAB, "<$FILE") || die("\nError: failed to open $FILE: $!\n"); -$found = 0; -while () { # Skip ahead to rtsymtab definition - last if /rtsymtab\[\]/; -} -while () { # Extract the name of each symbol - if (/{.*,.*"(.*)"}/) { - $OldSymtabEntries{$1} = 1; - $found++; - } -} -# -# Make sure that the above loop worked! -# -die("Error: Could not locate the rtsymtab\[\] table in $FILE\n\n") - if (! $found); - -close(SYMTAB); - - -# -# Check if any of the new symbols that we need to add exist in the rtsymtab -# table. Keep track of all symbols that we delete from NewSymtabEntries. -# - -$offset=0; -# This section of code does not work. If a variable is already in the list -# the following variable is not tested. We don't need this anyway, since -# it's ok for an item to be in the list more than once. -#for $var (@NewSymtabEntries) { -# print "@@@: var: $var\n"; -# if ($OldSymtabEntries{$var}) { -# $del = splice(@NewSymtabEntries,$offset,1); -# push(@DelSymtabEntries, $del); -# print "debug: $var exists\n"; -# } -# $offset++; -#} - -# -# Create the new rtsymtab file. -# Place the new extern definitions just before the rtsymtab[] table -# definition. Append new entries to the rtsymtab table to the end -# of the file. -# - -open(NEWSYMTAB, ">$FILE.new") || die("Error: Could not open $File.new: $!\n"); -open(OLDSYMTAB, "<$FILE") || die("Error: Could not open $FILE: $!\n"); - -print "Creating $FILE.new\n"; - -while () { - if (/rtsymtab\[\] = {/) { - print NEWSYMTAB "\n /*\n * The following extern definitions"; - print NEWSYMTAB " are required by AFS\n */\n"; - print NEWSYMTAB "$ExternHeaders\n\n"; - print NEWSYMTAB "$ExternDefns\n\n"; - print NEWSYMTAB $_; - } else { - print NEWSYMTAB $_; - } -} - -# -# Append the new rtsymtab[] entries to the end of the file -# - -print NEWSYMTAB "\t/*\n\t * The following symbols are required by AFS\n"; -print NEWSYMTAB "\t */\n\n"; - -foreach $var (@NewSymtabEntries) { - printf(NEWSYMTAB "\t {(long) &%s,%15s},\t\t%s\n", - $var, "\"$var\"", "/* DDI/DDK */"); -} - -close(NEWSYMTAB); -close(OLDSYMTAB); - -# -# Replace $FILE with $FILE.new -# -#print "NOT renaming files!\n"; - -die ("Error: Could not move $FILE to $FILE.orig: $!\n") - if (! rename($FILE, "$FILE.orig")); -print "Moved $FILE to $FILE.orig\n"; -die ("Error: Could not move $FILE.new to $FILE: $!\n") - if (! rename("$FILE.new", $FILE)); -print "Moved $FILE.new to $FILE\n"; - - -# -# List rtsymtab[] entries that were not added to the new file. -# - -if ($#DelSymtabEntries >= 0) { - - open(LOGFILE,">$LOG") || die("Error: Could not open $LOG: $!"); - - print LOGFILE "\n\n\tThe following entries were already defined - in the rtsymtab\[\] table in $FILE. - View $FILE and verify the correctness of these entries. - Make sure that these entries are correctly defined for this - machine. \n\n"; - - for $var (@DelSymtabEntries) { - printf(LOGFILE "\t {(long) &%s,%15s},\t\t%s\n", - $var, "\"$var\"", "/* DDI/DDK */"); - } - print LOGFILE "\n\tNOTE: This message has been saved in $LOG\n"; - close(LOGFILE); - system("/bin/cat $LOG"); -} - -print "\n$scriptname Done. $FILE has been modified to allow -AFS 3.4 kernel extentions to be dynamically loaded using /sbin/ml.\n\n"; - diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4 index e260aff5d3..35dc99b844 100644 --- a/src/cf/osconf.m4 +++ b/src/cf/osconf.m4 @@ -415,42 +415,6 @@ case $AFS_SYSNAME in SHLIB_LINKER="${CC} -shared" ;; - sgi_62) - CC="cc" - AFSD_LIBS="/usr/lib/libdwarf.a /usr/lib/libelf.a" - FSINCLUDES="-I/usr/include/sys/fs" - MT_CFLAGS='-D_SGI_MP_SOURCE' - XCFLAGS64="-64 -mips3" - XCFLAGS="-o32" - XLDFLAGS64="-64" - XLDFLAGS="-o32" - SHLIB_LINKER="${CC} -shared" - ;; - - sgi_63) - CC="cc" - AFSD_LIBS="/usr/lib/libdwarf.a /usr/lib/libelf.a" - FSINCLUDES="-I/usr/include/sys/fs" - MT_CFLAGS='-D_SGI_MP_SOURCE' - XCFLAGS64="-D_BSD_COMPAT -64 -mips3" - XCFLAGS="-D_OLD_TERMIOS -D_BSD_COMPAT -o32" - XLDFLAGS64="-64" - XLDFLAGS="-o32" - SHLIB_LINKER="${CC} -shared" - ;; - - sgi_64) - CC="cc" - AFSD_LIBS="/usr/lib32/libdwarf.a /usr/lib32/libelf.a" - FSINCLUDES="-I/usr/include/sys/fs" - MT_CFLAGS='-D_SGI_MP_SOURCE' - XCFLAGS64="-D_BSD_COMPAT -64 -mips3" - XCFLAGS="-D_OLD_TERMIOS -D_BSD_COMPAT -n32 -woff 1009,1014,1110,1116,1164,1169,1171,1174,1177,1183,1185,1204,1233,1515,1516,1548,1169,1174,1177,1196,1498,1506,1552,3201 -Wl,-woff,84,-woff,15" - XLDFLAGS64="-64" - XLDFLAGS="-n32" - SHLIB_LINKER="${CC} -shared" - ;; - sgi_65) AFSD_LIBS="/usr/lib32/libdwarf.a /usr/lib32/libelf.a" CC="/usr/bin/cc" diff --git a/src/libafs/MakefileProto.IRIX.in b/src/libafs/MakefileProto.IRIX.in index c21c0dae27..6cb6c0756d 100644 --- a/src/libafs/MakefileProto.IRIX.in +++ b/src/libafs/MakefileProto.IRIX.in @@ -41,118 +41,6 @@ DBUG=-g2 WSUPPRESS= -woff 1174,1196,1201,1209,1496,3201,3968 - -MPS=MP SP - -MPS=SP - -MPS=MP - - -# Turning off warnings regarding constant conditionals and not prototyped. -KDEFS=-D_K64U64 -D_KERNEL -DSTATIC=static -D_PAGESZ=16384 -D_MIPS3_ADDRSPACE \ - -DTFP -non_shared -elf -xansi -64 -mips4 -TENV:kernel \ - -TENV:misalignment=1 -OPT:space \ - -D${CPUBOARD} -D${MPSP} -D${CPUARCH} -DAFS_SGIMP_ENV ${NODYNOPT} \ - -jalr ${WSUPPRESS} - -# Turning off warnings regarding constant conditionals and not prototyped. -KDEFS_64BIT= -64 -D_K64U64 -D_PAGESZ=16384 -TENV:kernel -OPT:space \ - -TENV:misalignment=1 -R4000_LDFLAGS = -mips3 -64 -R4000_KDEFS = -mips3 -DR4000_DADDIU_WAR -DFAST_LOCORE_TFAULT -DUSE_LGPAGES \ - -DR4000 -DEVEREST -DBADVA_WAR -DMP_R4000_BADVA_WAR \ - -DECC_RECOVER -DCLOCK_CTIME_IS_ABSOLUTE -D_SHAREII -D_HIBERNATORII \ - -DPIOMEMOPS -DULI ${KDEFS_64BIT} -R8000_KDEFS = -mips4 -DTFP -DR8000 ${KDEFS_64BIT} -R8000_LDFLAGS = -mips4 -64 -KDEFS= -I/usr/include -I/usr/include/sys -D_KERNEL -DSTATIC=static \ - -D_MIPS3_ADDRSPACE -non_shared -elf -xansi \ - ${CPU_KDEFS} \ - -D${CPUBOARD} -D${MPSP} -DAFS_SGIMP_ENV ${NODYNOPT} \ - -jalr ${WSUPPRESS} -R10000_KDEFS = -mips4 -DR10000 -DEXPRESS -DIP28 -DI2_64 -DFAST_LOCORE_FAULT \ - -DSCACHE_SET_ASSOC=2 -D_NO_UNCACHED_MEM_WAR -DMIPS4_ISA \ - -DR10000_SPECULATION_WAR \ - -OPT:quad_align_branch_targets=FALSE \ - -OPT:quad_align_with_memops=FALSE -OPT:unroll_times=0 \ - -DDEFAULTSEMAMETER=1 ${KDEFS_64BIT} -R10000_LDFLAGS = -mips4 -64 -R4000_32_LDFLAGS = -mips2 -o32 -R4000_32_KDEFS = -mips2 -o32 -elf -DEXPRESS -D_K32U64 -xansi\ - -D_PAGESZ=4096 -D_KERNEL \ - -DSTATIC=static -DBADVA_WAR -DJUMP_WAR -DPROBE_WAR -D_MEM_PARITY_WAR \ - -D_TLB_LOOP_LIMIT -DTLBMOD_BADVADDR_WAR -D_VCE_AVOIDANCE \ - -D_R4600_CACHEOP_WAR -D_R4600_2_0_CACHEOP_WAR -D_IRIX5_MIPS3 \ - -D_IRIX5_MIPS4 -D_R5000_BADVADDR_WAR -D_R5000_JUMP_WAR -DMIPS4_ISA \ - -DR4000 -DR4000PC -DR4600 -DR4600SC -DTRITON -DTRITON_INDYSC \ - -Wc,-pic0 -fullwarn -non_shared -nostdinc -Wf,-XNp12000 \ - -woff 1685,515,608,658,799,803,835,852,1048,1233,1499,1501 \ - -DDEFAULTSEMAMETER=1 - -# Turning off warnings regarding constant conditionals and not prototyped. -# NOTE: Only for R5000 at the moment. -KDEFS= -I/usr/include -I/usr/include/sys -D_KERNEL -DSTATIC=static \ - -non_shared -elf -xansi \ - ${CPU_KDEFS} \ - -D${CPUBOARD} -D${MPSP} -DAFS_SGIMP_ENV ${NODYNOPT} \ - -jalr ${WSUPPRESS} -R5000_LDFLAGS = -mips2 -o32 -R5000_KDEFS = -DCRIME -DIP32 -DCRM -D_K32U64 -xansi -D_PAGESZ=4096 \ - -D_KERNEL -DSTATIC=static -DPROBE_WAR -D_VCE_AVOIDANCE -DTILE_DATA \ - -D_VCE_AVOIDANCE_DEBUG -D_R4600_CACHEOP_WAR -D_TLB_LOOP_LIMIT \ - -D_R4600_2_0_CACHEOP_WAR -DP0_WAR -D_IRIX5_MIPS4 -D_IRIX5_MIPS3 \ - -D_R5000_BADVADDR_WAR -DMIPS4_ISA -DSW_FAST_CACHE_SYNCH -DSWASH \ - -D_R5000_CVT_WAR=1 -D_MTEXT_VFS -DR4000 -DR4000PC -DR4600 \ - -DR4600SC -DTRITON -g -elf -mips2 -fullwarn -non_shared -nostdinc \ - -mips2 -o32 -woff 1685,515,608,658,799,803,852,1048,1233,1499,1501 \ - -Wf,-XNp12000 -DDEFAULTSEMAMETER=1 -R10000_LDFLAGS = -mips2 -o32 -R10000_KDEFS = -DCRIME -DIP32 -DCRM -D_K32U64 -xansi -D_K32U64 -D_PAGESZ=4096 \ - -D_KERNEL -DSTATIC=static -D_VCE_AVOIDANCE -DTILE_DATA \ - -DTLBMOD_BADVADDR_WAR -D_VCE_AVOIDANCE_DEBUG -D_TLB_LOOP_LIMIT \ - -DP0_WAR -D_IRIX5_MIPS4 -D_IRIX5_MIPS3 -D_R5000_BADVADDR_WAR \ - -DMIPS4_ISA -DSW_FAST_CACHE_SYNCH -DSWASH -DSCACHE_SET_ASSOC=2 \ - -D_R5000_CVT_WAR=1 -D_MTEXT_VFS -DR10000_SPECULATION_WAR \ - -DMH_R10000_SPECULATION_WAR -DSP -DIP32 -DR4000 -DR4000PC -DR4600 \ - -DR4600SC -DTRITON -DR10000 -D_NO_R4000 -g -elf -mips2 -fullwarn \ - -non_shared -nostdinc -mips2 -o32 \ - -woff 1685,515,608,658,799,803,852,1048,1233,1499,1501 \ - -Wf,-XNp12000 -DDEFAULTSEMAMETER=1 - -KDEFS= -I/usr/include -I/usr/include/sys -D_KERNEL -DSTATIC=static \ - -non_shared -elf -xansi \ - ${CPU_KDEFS} \ - -D${CPUBOARD} -D${MPSP} -DAFS_SGIMP_ENV ${NODYNOPT} \ - -jalr ${WSUPPRESS} -R10000_LDFLAGS = -mips4 -64 -R10000_KDEFS = -DKONA -DIP27 -DIP27 -DDISCONTIG_PHYSMEM -DNUMA_BASE -DNUMA_PM \ - -DNUMA_TBORROW -DNUMA_MIGR_CONTROL -DNUMA_REPLICATION \ - -DNUMA_REPL_CONTROL -DNUMA_SCHED -DLARGE_CPU_COUNT -DHUB2_NACK_WAR \ - -DBRIDGE_ERROR_INTR_WAR -DMAPPED_KERNEL -DBHV_SYNCH -DHUB_ERR_STS_WAR \ - -DHUB_MIGR_WAR -DNCR16C550 -DTL16PIR552 -DSN0_INTR_BROKEN -DFRU \ - -DFORCE_ERRORS -DSN0_USE_BTE -DBTE_BZERO_WAR -DREV1_BRIDGE_SUPPORTED \ - -DHUB_II_IFDR_WAR -xansi -DDISCONTIG_PHYSMEM -DNUMA_BASE -DNUMA_PM \ - -DNUMA_TBORROW -DNUMA_MIGR_CONTROL -DNUMA_REPLICATION \ - -DNUMA_REPL_CONTROL -DNUMA_SCHED -DLARGE_CPU_COUNT -DHUB2_NACK_WAR \ - -DBRIDGE_ERROR_INTR_WAR -DMAPPED_KERNEL -DBHV_SYNCH \ - -DHUB_ERR_STS_WAR -DHUB_MIGR_WAR -DNCR16C550 -DTL16PIR552 \ - -DSN0_INTR_BROKEN -DFRU -DFORCE_ERRORS -DSN0_USE_BTE -DBTE_BZERO_WAR \ - -DREV1_BRIDGE_SUPPORTED -DHUB_II_IFDR_WAR -D_PAGESZ=16384 -D_KERNEL \ - -DSTATIC=static -D_MIPS3_ADDRSPACE -DSN0 -DMIPS4_ISA \ - -DCLOCK_CTIME_IS_ABSOLUTE -DFAST_LOCORE_TFAULT -DULI -DCKPT \ - -DIDLESTACK_FASTINT -DR10K_LLSC_WAR -DPTE_64BIT -DRMAPS \ - -DPAGE_MIGRATION -DSW_FAST_CACHE_SYNCH -DINTR_KTHREADS \ - -DMRSP_AS_MR -D_MP_NETLOCKS -DMP_STREAMS=1 -DIP27 -DR10000 \ - -g -TENV:kernel -TENV:misalignment=1 -OPT:space \ - -OPT:quad_align_branch_targets=FALSE \ - -OPT:quad_align_with_memops=FALSE \ - -OPT:unroll_times=0 -OPT:Olimit=5000 -TARG:processor=r10000 \ - -FE:pointer_readonly -use_readonly_const -fullwarn \ - -non_shared -mips4 -64 \ - -woff 1685,515,608,658,799,803,852,1048,1233,1499,1501 \ - -DDEFAULTSEMAMETER=1 - # For Irix 6.5 we are building based on cpu board number rather than CPU number # While -G 8 is recommended for space, we know that the table overflows when # both AFS and DFS are compiled into the kernel. For Irix 6.5, define MP @@ -230,7 +118,6 @@ LDFLAGS_64 = -64 -IPA LDFLAGS_32 = -n32 -IPA - DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT OPTF=${OPT} OPTF2=${OPT2} @@ -246,15 +133,7 @@ DESTDIRS = irix_destdirs include Makefile.common # Make all the directories, even if only building one. - -PROCESSORS=R4000 R4000_32 R8000 R10000 - -PROCESSORS = R5000 R1000 - -PROCESSORS = R10000 - PROCESSORS = IP19 IP20 IP21 IP22_4K IP22_5K IP25 IP26 IP27 IP28 IP30 IP32_5K IP32_10K @IRIX_BUILD_IP35@ - KOBJ = STATIC MODLOAD @@ -265,27 +144,6 @@ setup: -ln -fs /usr/include/net /usr/include/netinet . -ln -fs /usr/include/rpc /usr/include/sys . -ln -fs /usr/include/sys/fs . - - BUILDPROCS="${PROCESSORS}" ; \ - BUILDMPS="${MPS}" ; \ - if [ "${CPUARCH}" != "" ] ; then \ - BUILDPROCS=${CPUARCH}; \ - BUILDMPS=${MPSP}; \ - fi ; \ - for p in $${BUILDPROCS} ; do \ - for n in $${BUILDMPS} ; do \ - for t in ${KOBJ} ; do \ - dir=$$t.$$n.$$p ; \ - echo Making directory: $$dir; \ - mkdir -p $$dir; \ - $(RM) -f $$dir/Makefile.common $$dir/Makefile $$dir/config; \ - ln -fs ../Makefile.common $$dir/Makefile.common; \ - ln -fs ../Makefile $$dir/Makefile; \ - ln -fs ../config $$dir/config; \ - done; \ - done; \ - done - BUILDPROCS="${PROCESSORS}" ; \ if [ "${IPNO}" != "" ] ; then \ BUILDPROCS="${IPNO}"; \ @@ -301,62 +159,10 @@ setup: ln -fs ../config $$dir/config; \ done; \ done - echo Setup complete. # Compile static and modload versions of the clients. - -${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: - BUILDPROCS="${PROCESSORS}" ; \ - if [ "${CPUARCH}" != "" ] ; then \ - BUILDPROCS=${CPUARCH}; \ - BUILDMPS=${MPSP}; \ - fi ; \ - for p in $${BUILDPROCS} ; do \ - for n in $${BUILDMPS} ; do \ - for t in ${KOBJ} ; do \ - dir=$$t.$$n.$$p ; \ - echo Building directory: $$dir; \ - case $$p in \ - R4000) \ - CPUBOARD=IP19; \ - CPU_KDEFS="${R4000_KDEFS}"; \ - LDFLAGS="${R4000_LDFLAGS}";; \ - R4000_32) \ - CPUBOARD=IP22; \ - CPU_KDEFS="${R4000_32_KDEFS}"; \ - LDFLAGS="${R4000_32_LDFLAGS}";; \ - R5000) \ - CPUBOARD=IP32_5K; \ - CPU_KDEFS="${R5000_KDEFS}"; \ - LDFLAGS="${R5000_LDFLAGS}";; \ - R8000) \ - CPUBOARD=IP26; \ - CPU_KDEFS="${R8000_KDEFS}"; \ - LDFLAGS="${R8000_LDFLAGS}";; \ - R10000) \ - - CPUBOARD=IP28; \ - - CPUBOARD=IP32_10K; \ - - CPUBOARD=IP27; \ - - CPU_KDEFS="${R10000_KDEFS}"; \ - LDFLAGS="${R10000_LDFLAGS}";; \ - *) echo "Unknown CPUARCH <$$p>" ; exit 1 ;; \ - esac ;\ - export CPUBOARD ;\ - export CPU_KDEFS ;\ - export LDFLAGS; \ - cd $$dir ; \ - $(MAKE) CPUARCH=$$p MPSP=$$n $@_$$t.libafs || exit $$?;\ - cd ../ ; \ - done; \ - done; \ - done - ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: BUILDPROCS="${PROCESSORS}" ; \ if [ "${IPNO}" != "" ] ; then \ @@ -408,7 +214,6 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: cd ../ ; \ done; \ done - irix_compdirs_STATIC.libafs: depsrcs STATIC.libafs irix_compdirs_MODLOAD.libafs: depsrcs MODLOAD.libafs @@ -429,22 +234,12 @@ LIBAFSNONFSA = libafs.nonfs.a STATIC.libafs: ${LIBAFSNONFSA} install_STATIC.libafs: ${LIBAFSNONFSA} - - ${CP} ${LIBAFSNONFSA} \ - ${DESTDIR}${afskerneldir}/libafs.${MPSP}.${CPUARCH}.nonfs.a - ${CP} ${LIBAFSNONFSA} \ ${DESTDIR}${afskerneldir}/libafs.${IPNO}.nonfs.a - dest_STATIC.libafs: ${LIBAFSNONFSA} - - ${CP} ${LIBAFSNONFSA} \ - ${DEST}/root.client/bin/libafs.${MPSP}.${CPUARCH}.nonfs.a - ${CP} ${LIBAFSNONFSA} \ ${DEST}/root.client/bin/libafs.${IPNO}.nonfs.a - ${LIBAFSNONFSA}: $(AFSAOBJS) $(AFSNONFSOBJS) $(AR) cru $@ $? @@ -456,22 +251,12 @@ LIBAFSNONFSO = libafs.nonfs.o MODLOAD.libafs: ${LIBAFSNONFSO} install_MODLOAD.libafs: ${LIBAFSNONFSO} - - ${CP} ${LIBAFSNONFSO} \ - ${DESTDIR}${afskerneldir}/libafs.${MPSP}.${CPUARCH}.nonfs.o - ${CP} ${LIBAFSNONFSO} \ ${DESTDIR}${afskerneldir}/libafs.${IPNO}.nonfs.o - dest_MODLOAD.libafs: ${LIBAFSNONFSO} - - ${CP} ${LIBAFSNONFSO} \ - ${DEST}/root.client/usr/vice/etc/sgiload/libafs.${MPSP}.${CPUARCH}.nonfs.o - ${CP} ${LIBAFSNONFSO} \ ${DEST}/root.client/usr/vice/etc/sgiload/libafs.${IPNO}.nonfs.o - ${LIBAFSNONFSO}: $(AFSAOBJS) $(AFSNONFSOBJS) $(LD) ${LDFLAGS} -elf -r -d -G 0 -o ${LIBAFSNONFSO} \ @@ -491,13 +276,10 @@ dest_COPYFILES: # Create symlinks to clients we don't need to build. install_LINKFILES: - echo "Now we support also IP22_4K, IP22_5K, IP32_5K, IP32_10K cpu boards." - # Create symlinks to clients we don't need to build. dest_LINKFILES: - ln -fs libafs.IP20.a ${DEST}/root.client/bin/libafs.IP22.a ln -fs libafs.IP20.a ${DEST}/root.client/bin/libafs.IP32.a ln -fs libafs.IP20.nonfs.a ${DEST}/root.client/bin/libafs.IP22.nonfs.a diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in index 7a5419602c..3b7d3e3943 100644 --- a/src/lwp/Makefile.in +++ b/src/lwp/Makefile.in @@ -67,14 +67,6 @@ process.o : process.default.s process.i386.s process.amd64.s process.c lwp.o $(PATH_CPP) -P -I${TOP_INCDIR} ${srcdir}/process.default.s > process.s; \ ${AS} process.s -o process.o; \ $(RM) process.s ;; \ - sgi_5* ) \ - cp ${srcdir}/process.default.s process.s ; \ - $(CCOBJ) ${LWP_DBG} ${LWP_OPTMZ} -c -I${TOP_INCDIR} -KPIC -G0 process.s; \ - $(RM) -f process.s ;;\ - sgi_61 | sgi_62 | sgi_63 ) \ - cp ${srcdir}/process.default.s process.s ; \ - $(CCOBJ) ${LWP_DBG} ${LWP_OPTMZ} -c ${XCFLAGS} ${ARCHFLAGS} -I${TOP_INCDIR} -KPIC -G0 process.s; \ - $(RM) -f process.s ;;\ *_darwin* ) \ $(RM) -f process.o ; \ CURRENTBUILDARCH="${ARCHFLAGS}"; \ @@ -163,7 +155,7 @@ process.o : process.default.s process.i386.s process.amd64.s process.c lwp.o $(PATH_CPP) -DASSEMBLER -P -I${TOP_INCDIR} ${srcdir}/process.default.s > process.s; \ ${AS} -o process.o process.s; \ $(RM) process.s ;; \ - hp* | *_linux* | *_umlinux* | sgi_64 | sgi_65 ) \ + hp* | *_linux* | *_umlinux* | sgi_65 ) \ $(AFS_CCRULE_NOQ) -c ${srcdir}/process.c;; \ ia64_hpux11* | hp_ux11* ) \ $(AFS_CCRULE_NOQ) -c ${srcdir}/process.c;; \ diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index dfcfd6a7ac..4f63026ba3 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -204,12 +204,6 @@ fixit: fixit.c AFS_component_version_number.c $(CC) -o fixit $(AFS_CFLAGS) ${srcdir}/fixit.c ${LIBS} -xfsinode: xfsinode.c AFS_component_version_number.c - @set -x; case "${SYS_NAME}" in \ - sgi_62 | sgi_64 ) \ - $(CC) -o xfsinode $(AFS_CFLAGS) ${srcdir}/xfsinode.c ${LIBS} - esac - afs.exp: ${srcdir}/afs4.exp ${srcdir}/afs5.exp @set -x; case ${SYS_NAME} in \ rs_aix[567]* ) \ @@ -267,7 +261,7 @@ include ../config/Makefile.version clean: $(LT_CLEAN) - $(RM) -f *.o libsys.a xfsinode iinc idec icreate iopen istat core \ + $(RM) -f *.o libsys.a iinc idec icreate iopen istat core \ rmtsysc rmtsyss *.o rmtsys.ss.c rmtsys.cs.c rmtsys.xdr.c rmtsys.h \ rmtsysd AFS_component_version_number.c syscall.c \ afs.exp afsl.exp libafssetpag.* Krmtsys.cs.c Krmtsys.h Krmtsys.xdr.c