Skip to content

Commit 4e9a397

Browse files
kinkiekinkie
committed
Remove SGI IRIX support (#2404)
SGI IRIX was last released in 2006, and support discontinued in 2013.
1 parent 8106adf commit 4e9a397

11 files changed

Lines changed: 6 additions & 90 deletions

File tree

‎compat/Makefile.am‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ libcompatsquid_la_SOURCES = \
5858
os/openbsd.h \
5959
os/os2.h \
6060
os/qnx.h \
61-
os/sgi.h \
6261
os/solaris.h \
6362
os/sunos.h \
6463
osdetect.h \

‎compat/compat.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
#include "compat/os/openbsd.h"
7575
#include "compat/os/os2.h"
7676
#include "compat/os/qnx.h"
77-
#include "compat/os/sgi.h"
7877
#include "compat/os/solaris.h"
7978
#include "compat/os/sunos.h"
8079

‎compat/fdsetsize.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

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

‎compat/os/sgi.h‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎compat/osdetect.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@
4949
#elif defined(__FreeBSD_kernel__) /* GNU/kFreeBSD */
5050
#define _SQUID_KFREEBSD_ 1
5151

52-
#elif defined(__sgi__) || defined(sgi) || defined(__sgi) /* SGI */
53-
#define _SQUID_SGI_ 1
54-
5552
#elif defined(__NetBSD__)
5653
#define _SQUID_NETBSD_ 1
5754

‎configure.ac‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -288,19 +288,6 @@ AS_IF([test "x$PRESET_CFLAGS" = "x"],[
288288
],
289289
[CFLAGS="$squid_cv_cc_option_wall $CFLAGS"]
290290
)
291-
],[
292-
AS_CASE(["$host"],
293-
[*mips-sgi-irix6.*],[
294-
# suggested by Rafael Seidl <rafaels@cthulhu.engr.sgi.com>
295-
CFLAGS="$squid_cv_cc_option_optimize -OPT:Olimit=0:space=OFF \
296-
-woff 1009,1014,1110,1116,1183,1185,1188,1204,1230,1233,1355 \
297-
-Wl,-woff,85,-woff,84,-woff,134 \
298-
-nostdinc -I/usr/include -D_BSD_SIGNALS $CFLAGS"
299-
CXXFLAGS="$squid_cv_cc_option_optimize -OPT:Olimit=0:space=OFF \
300-
-woff 1009,1014,1110,1116,1183,1185,1188,1204,1230,1233,1355 \
301-
-Wl,-woff,85,-woff,84,-woff,134 \
302-
-nostdinc -I/usr/include -D_BSD_SIGNALS $CXXFLAGS"
303-
])
304291
])
305292
])
306293

@@ -2058,14 +2045,6 @@ AS_CASE(["$host"],
20582045
])
20592046
],
20602047

2061-
[*-sgi-irix*],[
2062-
AC_MSG_NOTICE([Removing -lsocket for IRIX...])
2063-
LIBS=`echo $LIBS | sed -e s/-lsocket//`
2064-
AC_MSG_NOTICE([Removing -lnsl for IRIX...])
2065-
LIBS=`echo $LIBS | sed -e s/-lnsl//`
2066-
ac_cv_lib_nsl_main=no
2067-
],
2068-
20692048
[*-ibm-aix*],[
20702049
SQUID_CC_REQUIRE_ARGUMENT([ac_cv_require_rtti],[-rtti],[[
20712050
#include <assert.h>

‎contrib/Makefile.am‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,6 @@ install-solaris2.4 install-solaris2.5:
3838
@echo "set SQUID=0 in /etc/init.d/squid to disable squid at startup"
3939
@echo "edit /etc/init.d/squid to change options"
4040

41-
install-irix6.2:
42-
$(INSTALL_BIN) $(SQUID_RC) /etc/init.d/squid
43-
$(INSTALL_FILE) $(SQUID_OPTIONS) /var/config/squid.options
44-
-$(LN_S) ../init.d/squid /etc/rc2.d/S99squid
45-
-$(LN_S) ../init.d/squid /etc/rc0.d/K01squid
46-
/sbin/chkconfig -f squid on
47-
@echo "use 'chkconfig squid off' to disable squid at startup"
48-
@echo "edit /var/config/squid.options to change options"
49-
5041
install-osf3.2:
5142
$(INSTALL_BIN) $(SQUID_RC) /sbin/init.d/squid
5243
-$(LN_S) ../init.d/squid /sbin/rc2.d/S99squid

‎scripts/icpserver.pl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
$whoami = (`uname -a`)[0];
4949
$IP_ADD_MEMBERSHIP=5;
5050
$whoami =~ /SunOS [^\s]+ 5/ && ($IP_MULTICAST_TTL=19);
51-
$whoami =~ /IRIX [^\s]+ 5/ && ($IP_MULTICAST_TTL=23);
5251
$whoami =~ /OSF1/ && ($IP_MULTICAST_TTL=12);
5352
# any more funnies ?
5453

‎src/time/rfc1123.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ Time::ParseRfc1123(const char *str)
179179
t = mktime(tm);
180180
if (t != -1) {
181181
time_t dst = 0;
182-
#if !(defined(_TIMEZONE) || defined(_timezone) || _SQUID_AIX_ || _SQUID_WINDOWS_ || _SQUID_SGI_)
182+
#if !(defined(_TIMEZONE) || defined(_timezone) || _SQUID_AIX_ || _SQUID_WINDOWS_)
183183
extern long timezone;
184184
#endif
185185
/*

‎src/tools.cc‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,7 @@ int
252252

253253
rusage_maxrss(struct rusage *r)
254254
{
255-
#if _SQUID_SGI_ && _ABIAPI
256-
return r->ru_pad[0];
257-
#elif _SQUID_SGI_|| _SQUID_OSF_ || _SQUID_AIX_ || defined(BSD4_4)
258-
255+
#if _SQUID_OSF_ || _SQUID_AIX_ || defined(BSD4_4)
259256
return r->ru_maxrss;
260257
#elif defined(HAVE_GETPAGESIZE) && HAVE_GETPAGESIZE != 0
261258

@@ -273,12 +270,7 @@ int
273270

274271
rusage_pagefaults(struct rusage *r)
275272
{
276-
#if _SQUID_SGI_ && _ABIAPI
277-
return r->ru_pad[5];
278-
#else
279-
280273
return r->ru_majflt;
281-
#endif
282274
}
283275

284276
/// Make the process traceable if possible. Call setTraceability() instead!

0 commit comments

Comments
 (0)