--- a/ChangeLog	Tue Oct 16 21:25:00 2018 +0200
+++ b/ChangeLog	Tue Oct 16 21:27:45 2018 +0200
@@ -1,3 +1,10 @@
+2018-10-16  Bruno Haible  <bruno@clisp.org>
+
+	mountlist: Remove support for Cray with UNICOS 9.
+	* m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't define
+	MOUNTED_LISTMNTENT.
+	* lib/mountlist.c: Remove MOUNTED_LISTMNTENT case.
+
 2018-10-16  Bruno Haible  <bruno@clisp.org>
 
 	fsusage, mountlist, getloadavg, getgroups: Remove support for Ultrix.

--- a/lib/mountlist.c	Tue Oct 16 21:25:00 2018 +0200
+++ b/lib/mountlist.c	Tue Oct 16 21:27:45 2018 +0200
@@ -95,10 +95,6 @@
 # include <sys/statfs.h>
 #endif
 
-#ifdef MOUNTED_LISTMNTENT       /* (obsolete) Cray UNICOS 9 */
-# include <mntent.h>
-#endif
-
 #ifdef MOUNTED_GETEXTMNTENT     /* Solaris >= 8 */
 # include <sys/mnttab.h>
 #endif
@@ -423,37 +419,6 @@
   struct mount_entry **mtail = &mount_list;
   (void) need_fs_type;
 
-#ifdef MOUNTED_LISTMNTENT       /* (obsolete) Cray UNICOS 9 */
-  {
-    struct tabmntent *mntlist, *p;
-    struct mntent *mnt;
-
-    /* the third and fourth arguments could be used to filter mounts,
-       but Crays doesn't seem to have any mounts that we want to
-       remove. Specifically, automount create normal NFS mounts.
-       */
-
-    if (listmntent (&mntlist, KMTAB, NULL, NULL) < 0)
-      return NULL;
-    for (p = mntlist; p; p = p->next)
-      {
-        mnt = p->ment;
-        me = xmalloc (sizeof *me);
-        me->me_devname = xstrdup (mnt->mnt_fsname);
-        me->me_mountdir = xstrdup (mnt->mnt_dir);
-        me->me_mntroot = NULL;
-        me->me_type = xstrdup (mnt->mnt_type);
-        me->me_type_malloced = 1;
-        me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
-        me->me_remote = ME_REMOTE (me->me_devname, me->me_type);
-        me->me_dev = -1;
-        *mtail = me;
-        mtail = &me->me_next;
-      }
-    freemntlist (mntlist);
-  }
-#endif
-
 #ifdef MOUNTED_GETMNTENT1       /* glibc, HP-UX, IRIX, Cygwin, Android,
                                    also (obsolete) 4.3BSD, SunOS */
   {

--- a/m4/ls-mntd-fs.m4	Tue Oct 16 21:25:00 2018 +0200
+++ b/m4/ls-mntd-fs.m4	Tue Oct 16 21:27:45 2018 +0200
@@ -68,36 +68,6 @@
   # make sure LIBS contains the appropriate -l option.
   AC_FUNC_GETMNTENT
 
-  # This test must precede the ones for getmntent because Unicos-9 is
-  # reported to have the getmntent function, but its support is incompatible
-  # with other getmntent implementations.
-
-  # NOTE: Normally, I wouldn't use a check for system type as I've done for
-  # 'CRAY' below since that goes against the whole autoconf philosophy.  But
-  # I think there is too great a chance that some non-Cray system has a
-  # function named listmntent to risk the false positive.
-
-  if test -z "$ac_list_mounted_fs"; then
-    # (obsolete) Cray UNICOS 9
-    AC_CACHE_CHECK([for listmntent of Cray/Unicos-9],
-      [fu_cv_sys_mounted_cray_listmntent],
-      [fu_cv_sys_mounted_cray_listmntent=no
-        AC_EGREP_CPP([yes],
-          [#ifdef _CRAY
-yes
-#endif
-          ], [test $ac_cv_func_listmntent = yes \
-              && fu_cv_sys_mounted_cray_listmntent=yes]
-        )
-      ])
-    if test $fu_cv_sys_mounted_cray_listmntent = yes; then
-      ac_list_mounted_fs=found
-      AC_DEFINE([MOUNTED_LISTMNTENT], [1],
-        [Define if there is a function named listmntent that can be used to
-         list all mounted file systems.  (UNICOS)])
-    fi
-  fi
-
   if test -z "$ac_list_mounted_fs"; then
     # AIX.
     AC_CACHE_CHECK([for mntctl function and struct vmount],