From c19713aa518d1deb43fecd31b99f9ba44317d82e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Tue, 21 Aug 2018 11:20:27 +0200
Subject: [PATCH] Remove support for legacy SGI IRIX

---
 bin/named/unix/os.c          |  2 +-
 configure                    | 16 ----------------
 configure.in                 | 15 ---------------
 lib/isc/unix/file.c          |  4 +---
 lib/isc/unix/ifiter_sysctl.c | 14 --------------
 5 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index 2893bb282a..d462a225eb 100644
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -23,8 +23,8 @@
 
 #include <ctype.h>
 #include <errno.h>
+#include <grp.h>
 #include <fcntl.h>
-#include <grp.h>		/* Required for initgroups() on IRIX. */
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/configure b/configure
index 737fea7f4c..6f2d3ea112 100755
--- a/configure
+++ b/configure
@@ -773,7 +773,6 @@ MKSYMTBL_PROGRAM
 ISC_PLATFORM_USEBACKTRACE
 PURIFY
 purify_path
-IRIX_DNSSEC_WARNINGS_HACK
 MKDEPPROG
 MKDEPCFLAGS
 MKDEPCC
@@ -17402,7 +17401,6 @@ esac
 #
 MKDEPCC="$CC"
 MKDEPCFLAGS="-M"
-IRIX_DNSSEC_WARNINGS_HACK=""
 
 if test "X$GCC" = "Xyes"; then
 	STD_CWARNINGS="$STD_CWARNINGS -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat -Wpointer-arith"
@@ -17477,17 +17475,6 @@ $as_echo "no" >&6; }
 	fi
 else
 	case $host in
-	*-sgi-irix*)
-		STD_CWARNINGS="-fullwarn -woff 1209"
-		#
-		# Silence more than 250 instances of
-		#   "prototyped function redeclared without prototype"
-		# and 11 instances of
-		#   "variable ... was set but never used"
-		# from lib/dns/sec/openssl.
-		#
-		IRIX_DNSSEC_WARNINGS_HACK="-woff 1692,1552"
-		;;
 	*-solaris*)
 		MKDEPCFLAGS="-xM"
 		;;
@@ -17498,7 +17485,6 @@ fi
 
 
 
-
 #
 # NLS
 #
@@ -17519,8 +17505,6 @@ fi
 # Use this for now, instead:
 #
 case "$host" in
-	mips-sgi-irix*)
-		;;
 	*-linux*)
 		;;
 	*)
diff --git a/configure.in b/configure.in
index 35934d2b7f..5fcc85117c 100644
--- a/configure.in
+++ b/configure.in
@@ -1702,7 +1702,6 @@ esac
 #
 MKDEPCC="$CC"
 MKDEPCFLAGS="-M"
-IRIX_DNSSEC_WARNINGS_HACK=""
 
 if test "X$GCC" = "Xyes"; then
 	STD_CWARNINGS="$STD_CWARNINGS -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat -Wpointer-arith"
@@ -1740,17 +1739,6 @@ if test "X$GCC" = "Xyes"; then
 	fi
 else
 	case $host in
-	*-sgi-irix*)
-		STD_CWARNINGS="-fullwarn -woff 1209"
-		#
-		# Silence more than 250 instances of
-		#   "prototyped function redeclared without prototype"
-		# and 11 instances of
-		#   "variable ... was set but never used"
-		# from lib/dns/sec/openssl.
-		#
-		IRIX_DNSSEC_WARNINGS_HACK="-woff 1692,1552"
-		;;
 	*-solaris*)
 		MKDEPCFLAGS="-xM"
 		;;
@@ -1760,7 +1748,6 @@ fi
 AC_SUBST(MKDEPCC)
 AC_SUBST(MKDEPCFLAGS)
 AC_SUBST(MKDEPPROG)
-AC_SUBST(IRIX_DNSSEC_WARNINGS_HACK)
 
 #
 # NLS
@@ -1777,8 +1764,6 @@ AC_CHECK_FUNC(catgets, AC_DEFINE(HAVE_CATGETS),)
 # Use this for now, instead:
 #
 case "$host" in
-	mips-sgi-irix*)
-		;;
 	*-linux*)
 		;;
 	*)
diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c
index c43afda7f7..6f214602d6 100644
--- a/lib/isc/unix/file.c
+++ b/lib/isc/unix/file.c
@@ -198,9 +198,7 @@ isc_file_settime(const char *file, isc_time_t *when) {
 
 	/*
 	 * isc_time_nanoseconds guarantees a value that divided by 1000 will
-	 * fit into the minimum possible size tv_usec field.  Unfortunately,
-	 * we don't know what that type is so can't cast directly ... but
-	 * we can at least cast to signed so the IRIX compiler shuts up.
+	 * fit into the minimum possible size tv_usec field.
 	 */
 	times[0].tv_usec = times[1].tv_usec =
 		(int32_t)(isc_time_nanoseconds(when) / 1000);
diff --git a/lib/isc/unix/ifiter_sysctl.c b/lib/isc/unix/ifiter_sysctl.c
index 33ecc69d58..f13065623f 100644
--- a/lib/isc/unix/ifiter_sysctl.c
+++ b/lib/isc/unix/ifiter_sysctl.c
@@ -29,14 +29,8 @@
 #include <isc/print.h>
 
 /* XXX what about Alpha? */
-#ifdef sgi
-#define ROUNDUP(a) ((a) > 0 ? \
-		(1 + (((a) - 1) | (sizeof(__uint64_t) - 1))) : \
-		sizeof(__uint64_t))
-#else
 #define ROUNDUP(a) ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) \
 		    : sizeof(long))
-#endif
 
 #define IFITER_MAGIC		ISC_MAGIC('I', 'F', 'I', 'S')
 #define VALID_IFITER(t)		ISC_MAGIC_VALID(t, IFITER_MAGIC)
@@ -218,18 +212,10 @@ internal_current(isc_interfaceiter_t *iter) {
 #ifdef ISC_PLATFORM_HAVESALEN
 			sa = (struct sockaddr *)((char*)(sa)
 					 + ROUNDUP(sa->sa_len));
-#else
-#ifdef sgi
-			/*
-			 * Do as the contributed SGI code does.
-			 */
-			sa = (struct sockaddr *)((char*)(sa)
-					 + ROUNDUP(_FAKE_SA_LEN_DST(sa)));
 #else
 			/* XXX untested. */
 			sa = (struct sockaddr *)((char*)(sa)
 					 + ROUNDUP(sizeof(struct sockaddr)));
-#endif
 #endif
 		}