Retire most of IRIX support.

In parsenfsfh.c keep IRIX-specific code that is not specific to
*compiling* on IRIX.  Do not touch AC_LBL_LIBRARY_NET yet.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce1d21e346a7362614f350af151d57e7bd81e5c3..ee3eb9529a78afd3383791b87c5295dbe1207f2a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1299,14 +1299,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
     #
     set(MAN_FILE_FORMATS 4)
     set(MAN_MISC_INFO 5)
     #
     set(MAN_FILE_FORMATS 4)
     set(MAN_MISC_INFO 5)

-elseif(CMAKE_SYSTEM_NAME STREQUAL "IRIX" OR CMAKE_SYSTEM_NAME STREQUAL "IRIX64")
-    #
-    # Use IRIX conventions for man pages; they're the same as the
-    # System V conventions, except that they use section 8 for
-    # administrative commands and daemons.
-    #
-    set(MAN_FILE_FORMATS 4)
-    set(MAN_MISC_INFO 5)

 elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_VERSION MATCHES "5[.][0-9.]*")
     #
     # SunOS 5.x.
 elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_VERSION MATCHES "5[.][0-9.]*")
     #
     # SunOS 5.x.

diff --git a/aclocal.m4 b/aclocal.m4
index 4c21721172a6c8f102381931b619189f8018ab69..78bbba413cb7105dc5221332b5de58cae7888668 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -115,39 +115,6 @@ AC_DEFUN(AC_LBL_C_INIT,
                    ac_lbl_cc_dont_try_gcc_dashW=yes
                    ;;
 
                    ac_lbl_cc_dont_try_gcc_dashW=yes
                    ;;
 

-           irix*)
-                   #
-                   # MIPS C, which is what we presume we're using, doesn't
-                   # necessarily exit with a non-zero exit status if we
-                   # hand it an invalid -W flag, can't be forced to do
-                   # so, and doesn't handle GCC-style -W flags, so we
-                   # don't want to try using GCC-style -W flags.
-                   #
-                   ac_lbl_cc_dont_try_gcc_dashW=yes
-                   #
-                   # It also, apparently, defaults to "char" being
-                   # unsigned, unlike most other C implementations;
-                   # I suppose we could say "signed char" whenever
-                   # we want to guarantee a signed "char", but let's
-                   # just force signed chars.
-                   #
-                   # -xansi is normally the default, but the
-                   # configure script was setting it; perhaps -cckr
-                   # was the default in the Old Days.  (Then again,
-                   # that would probably be for backwards compatibility
-                   # in the days when ANSI C was Shiny and New, i.e.
-                   # 1989 and the early '90's, so maybe we can just
-                   # drop support for those compilers.)
-                   #
-                   # -g is equivalent to -g2, which turns off
-                   # optimization; we choose -g3, which generates
-                   # debugging information but doesn't turn off
-                   # optimization (even if the optimization would
-                   # cause inaccuracies in debugging).
-                   #
-                   $1="$$1 -xansi -signed -g3"
-                   ;;
-

            solaris*)
                    #
                    # Assumed to be Sun C, which requires -errwarn to force
            solaris*)
                    #
                    # Assumed to be Sun C, which requires -errwarn to force


@@ -249,9 +216,9 @@ AC_DEFUN(AC_LBL_CHECK_DEPENDENCY_GENERATION_OPT,
                #
                case "$host_os" in
 
                #
                case "$host_os" in
 

-               irix*|darwin*)
+               darwin*)

                        #
                        #

-                       # MIPS C for IRIX and Clang use -M.
+                       # Clang uses -M.

                        #
                        ac_lbl_dependency_flag="-M"
                        ;;
                        #
                        ac_lbl_dependency_flag="-M"
                        ;;


@@ -802,14 +769,6 @@ AC_DEFUN(AC_LBL_DEVEL,
                    AC_LBL_CHECK_COMPILER_OPT($1, -Wwrite-strings)
            fi
            AC_LBL_CHECK_DEPENDENCY_GENERATION_OPT()
                    AC_LBL_CHECK_COMPILER_OPT($1, -Wwrite-strings)
            fi
            AC_LBL_CHECK_DEPENDENCY_GENERATION_OPT()

-           #
-           # We used to set -n32 for IRIX 6 when not using GCC (presumed
-           # to mean that we're using MIPS C or MIPSpro C); it specified
-           # the "new" faster 32-bit ABI, introduced in IRIX 6.2.  I'm
-           # not sure why that would be something to do *only* with a
-           # .devel file; why should the ABI for which we produce code
-           # depend on .devel?
-           #

            AC_MSG_CHECKING([whether to use an os-proto.h header])
            os=`echo $host_os | sed -e 's/\([[0-9]][[0-9]]*\)[[^0-9]].*$/\1/'`
            name="lbl/os-$os.h"
            AC_MSG_CHECKING([whether to use an os-proto.h header])
            os=`echo $host_os | sed -e 's/\([[0-9]][[0-9]]*\)[[^0-9]].*$/\1/'`
            name="lbl/os-$os.h"

diff --git a/configure.ac b/configure.ac
index 0f1c08b80f3a410fab586685542f11d24384695f..93b0aac79d353b25e79700378956e9a2078d1786 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -724,16 +724,6 @@ hpux*)
        MAN_MISC_INFO=5
        ;;
 
        MAN_MISC_INFO=5
        ;;
 

-irix*)
-       V_GROUP=sys
-
-       #
-       # Use System V conventions for man pages.
-       #
-       MAN_FILE_FORMATS=4
-       MAN_MISC_INFO=5
-       ;;
-

 solaris*)
        V_GROUP=sys
 
 solaris*)
        V_GROUP=sys
 

diff --git a/parsenfsfh.c b/parsenfsfh.c
index f73aa4630377d23aca166661236d8a76671dffcc..f6e5ab2fdf35c7111c8097f92d77fc48b00df177 100644 (file)
--- a/parsenfsfh.c
+++ b/parsenfsfh.c
@@ -103,15 +103,6 @@ Parse_fh(netdissect_options *ndo, const unsigned char *fh, u_int len,
        else {
                if (ourself) {
                    /* File handle generated on this host, no need for guessing */
        else {
                if (ourself) {
                    /* File handle generated on this host, no need for guessing */

-#if    defined(IRIX40)
-                   fhtype = FHT_IRIX4;
-#endif
-#if    defined(IRIX50)
-                   fhtype = FHT_IRIX5;
-#endif
-#if    defined(IRIX51)
-                   fhtype = FHT_IRIX5;
-#endif

 #if    defined(SUNOS4)
                    fhtype = FHT_SUNOS4;
 #endif
 #if    defined(SUNOS4)
                    fhtype = FHT_SUNOS4;
 #endif


@@ -267,6 +258,7 @@ Parse_fh(netdissect_options *ndo, const unsigned char *fh, u_int len,
            break;
 
        case FHT_IRIX5:
            break;
 
        case FHT_IRIX5:

+           /* FIXME: None of the heuristics above return this. */

            fsidp->Fsid_dev.Minor = GET_BE_U_2(fhp + 2);
            fsidp->Fsid_dev.Major = GET_BE_U_2(fhp);
            fsidp->fsid_code = GET_BE_U_4(fhp + 4);
            fsidp->Fsid_dev.Minor = GET_BE_U_2(fhp + 2);
            fsidp->Fsid_dev.Major = GET_BE_U_2(fhp);
            fsidp->fsid_code = GET_BE_U_4(fhp + 4);