Remove SGI IRIX support

compat/Makefile.am

@@ -60,7 +60,6 @@ libcompatsquid_la_SOURCES = \
 	os/openbsd.h \
 	os/os2.h \
 	os/qnx.h \
-	os/sgi.h \
 	os/solaris.h \
 	os/sunos.h \
 	osdetect.h \

compat/compat.h

@@ -74,7 +74,6 @@
 #include "compat/os/openbsd.h"
 #include "compat/os/os2.h"
 #include "compat/os/qnx.h"
-#include "compat/os/sgi.h"
 #include "compat/os/solaris.h"
 #include "compat/os/sunos.h"
 

compat/fdsetsize.h

@@ -17,9 +17,9 @@
 
 /*
  * On some systems, FD_SETSIZE is set to something lower than the
- * actual number of files which can be opened.  IRIX is one case,
- * NetBSD is another.  So here we increase FD_SETSIZE to our
- * configure-discovered maximum *before* any system includes.
+ * actual number of files which can be opened. NetBSD is one
+ * case. So here we increase FD_SETSIZE to our configure-discovered
+ * maximum *before* any system includes.
  */
 #define CHANGE_FD_SETSIZE 1
 

compat/osdetect.h

@@ -49,9 +49,6 @@
 #elif defined(__FreeBSD_kernel__)      /* GNU/kFreeBSD */
 #define _SQUID_KFREEBSD_ 1
 
-#elif defined(__sgi__)  || defined(sgi) || defined(__sgi)   /* SGI */
-#define _SQUID_SGI_ 1
-
 #elif defined(__NetBSD__)
 #define _SQUID_NETBSD_ 1
 

configure.ac

@@ -292,19 +292,6 @@ AS_IF([test "x$PRESET_CFLAGS" = "x"],[
       ],
       [CFLAGS="$squid_cv_cc_option_wall $CFLAGS"]
     )
-  ],[
-    AS_CASE(["$host"],
-      [*mips-sgi-irix6.*],[
-        # suggested by Rafael Seidl <rafaels@cthulhu.engr.sgi.com>
-        CFLAGS="$squid_cv_cc_option_optimize -OPT:Olimit=0:space=OFF \
-                -woff 1009,1014,1110,1116,1183,1185,1188,1204,1230,1233,1355 \
-                -Wl,-woff,85,-woff,84,-woff,134 \
-                -nostdinc -I/usr/include -D_BSD_SIGNALS $CFLAGS"
-        CXXFLAGS="$squid_cv_cc_option_optimize -OPT:Olimit=0:space=OFF \
-                  -woff 1009,1014,1110,1116,1183,1185,1188,1204,1230,1233,1355 \
-                  -Wl,-woff,85,-woff,84,-woff,134 \
-                  -nostdinc -I/usr/include -D_BSD_SIGNALS $CXXFLAGS"
-    ])
   ])
 ])
 
@@ -2060,28 +2047,13 @@ SQUID_CHECK_SIN_LEN_IN_SOCKADDR_IN
 dnl System-specific library modifications
 AH_TEMPLATE(GETTIMEOFDAY_NO_TZP,[Whether gettimeofday takes only one argument])
 AS_CASE(["$host"],
-  [*-pc-sco3.2*],[
-    # -lintl is needed on SCO version 3.2v4.2 for strftime()
-    # Robert Side <rside@aiinc.bc.ca>
-    # Mon, 18 Jan 1999 17:48:00 GMT
-    AC_CHECK_LIB(intl, strftime)
-  ],
-
   [i386-*-solaris2.*],[
     AS_IF([test "x$GCC" = "xyes"],[
       AC_MSG_NOTICE([Removing -O for gcc on $host])
       CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9g]]*//'`"
     ])
   ],
 
-  [*-sgi-irix*],[
-    AC_MSG_NOTICE([Removing -lsocket for IRIX...])
-    LIBS=`echo $LIBS | sed -e s/-lsocket//`
-    AC_MSG_NOTICE([Removing -lnsl for IRIX...])
-    LIBS=`echo $LIBS | sed -e s/-lnsl//`
-    ac_cv_lib_nsl_main=no
-  ],
-
   [*-ibm-aix*],[
     SQUID_CC_REQUIRE_ARGUMENT([ac_cv_require_rtti],[-rtti],[[
 #include <assert.h>

contrib/Makefile.am

@@ -38,15 +38,6 @@ install-solaris2.4 install-solaris2.5:
 	@echo "set SQUID=0 in /etc/init.d/squid to disable squid at startup"
 	@echo "edit /etc/init.d/squid to change options"
 
-install-irix6.2:
-	$(INSTALL_BIN) $(SQUID_RC) /etc/init.d/squid
-	$(INSTALL_FILE) $(SQUID_OPTIONS) /var/config/squid.options
-	-$(LN_S) ../init.d/squid /etc/rc2.d/S99squid
-	-$(LN_S) ../init.d/squid /etc/rc0.d/K01squid
-	/sbin/chkconfig -f squid on
-	@echo "use 'chkconfig squid off' to disable squid at startup"
-	@echo "edit /var/config/squid.options to change options"
-
 install-osf3.2:
 	$(INSTALL_BIN) $(SQUID_RC) /sbin/init.d/squid
 	-$(LN_S) ../init.d/squid /sbin/rc2.d/S99squid

scripts/icpserver.pl

@@ -48,7 +48,6 @@
     $whoami = (`uname -a`)[0];
     $IP_ADD_MEMBERSHIP=5;
     $whoami =~ /SunOS [^\s]+ 5/ && ($IP_MULTICAST_TTL=19);
-    $whoami =~ /IRIX [^\s]+ 5/ && ($IP_MULTICAST_TTL=23);
     $whoami =~ /OSF1/ && ($IP_MULTICAST_TTL=12);
     # any more funnies ?
 

src/time/rfc1123.cc

@@ -179,7 +179,7 @@ Time::ParseRfc1123(const char *str)
     t = mktime(tm);
     if (t != -1) {
         time_t dst = 0;
-#if !(defined(_TIMEZONE) || defined(_timezone) || _SQUID_AIX_ || _SQUID_WINDOWS_ || _SQUID_SGI_)
+#if !(defined(_TIMEZONE) || defined(_timezone) || _SQUID_AIX_ || _SQUID_WINDOWS_)
         extern long timezone;
 #endif
         /*

src/tools.cc

@@ -253,10 +253,7 @@ int
 
 rusage_maxrss(struct rusage *r)
 {
-#if _SQUID_SGI_ && _ABIAPI
-    return r->ru_pad[0];
-#elif _SQUID_SGI_|| _SQUID_OSF_ || _SQUID_AIX_ || defined(BSD4_4)
-
+#if _SQUID_OSF_ || _SQUID_AIX_ || defined(BSD4_4)
     return r->ru_maxrss;
 #elif defined(HAVE_GETPAGESIZE) && HAVE_GETPAGESIZE != 0
 
@@ -274,12 +271,7 @@ int
 
 rusage_pagefaults(struct rusage *r)
 {
-#if _SQUID_SGI_ && _ABIAPI
-    return r->ru_pad[5];
-#else
-
     return r->ru_majflt;
-#endif
 }
 
 /// Make the process traceable if possible. Call setTraceability() instead!

tools/sysvinit/squid.rc

@@ -18,18 +18,8 @@ export PATH
 
 config()
 {
-    # SGI IRIX 6.2
-    if [ -f /sbin/chkconfig ]
-    then if /sbin/chkconfig squid
-	 then if [ -f /var/config/squid.options ]
-	      then . /var/config/squid.options
-	      fi
-	      SQUID=1
-	 else SQUID=0
-	 fi
-
     # Digital UNIX
-    elif [ -f /usr/sbin/rcmgr ]
+    if [ -f /usr/sbin/rcmgr ]
     then SQUID=`/usr/sbin/rcmgr get SQUID 0`
 	 SQUID_OPTIONS=`/usr/sbin/rcmgr get SQUID_OPTIONS "-s"`
 	 SQUID_RESPAWN=`/usr/sbin/rcmgr get SQUID_RESPAWN 1`