[PATCH] fsusage, regex, stat-size: remove Cray support

[Paul Eggert]

As near as I can make out this is actually support for UNICOS/mp,
last released 2005, and Cray hasn’t supported that for years.
* config/srclist.txt: Comment out regex.h for now.
* lib/fsusage.c (get_fs_usage):
* lib/regex.h (re_comp, re_exec):
* lib/stat-size.h (ST_NBLOCKSIZE):
Don’t worry about _CRAY.
---
 ChangeLog          | 11 +++++++++++
 config/srclist.txt |  2 +-
 lib/fsusage.c      |  4 ----
 lib/regex.h        |  2 --
 lib/stat-size.h    |  6 ------
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6962f160f..c5fd79351 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2020-07-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+       fsusage, regex, stat-size: remove Cray support
+       As near as I can make out this is actually support for UNICOS/mp,
+       last released 2005, and Cray hasn’t supported that for years.
+       * config/srclist.txt: Comment out regex.h for now.
+       * lib/fsusage.c (get_fs_usage):
+       * lib/regex.h (re_comp, re_exec):
+       * lib/stat-size.h (ST_NBLOCKSIZE):
+       Don’t worry about _CRAY.
+
 2020-07-29  Bruno Haible  <bruno@clisp.org>
 
        parse-datetime: Fix compilation error with bison 3.7.
diff --git a/config/srclist.txt b/config/srclist.txt
index 1ff511be1..55388b111 100644
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -57,7 +57,7 @@ $LIBCSRC malloc/scratch_buffer_set_array_size.c       
lib/malloc
 #$LIBCSRC include/intprops.h             lib
 $LIBCSRC posix/regcomp.c               lib
 #$LIBCSRC posix/regex.c                        lib
-$LIBCSRC posix/regex.h                 lib
+#$LIBCSRC posix/regex.h                        lib
 $LIBCSRC posix/regex_internal.c                lib
 #$LIBCSRC posix/regex_internal.h       lib
 $LIBCSRC posix/regexec.c               lib
diff --git a/lib/fsusage.c b/lib/fsusage.c
index 81960152d..85bfe0e28 100644
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -211,11 +211,7 @@ get_fs_usage (char const *file, char const *disk, struct 
fs_usage *fsp)
   /* Empirically, the block counts on most SVR3 and SVR3-derived
      systems seem to always be in terms of 512-byte blocks,
      no matter what value f_bsize has.  */
-# if defined _CRAY
-   fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_bsize);
-# else
    fsp->fsu_blocksize = 512;
-# endif
 
 #endif
 
diff --git a/lib/regex.h b/lib/regex.h
index 87cce7f5c..5fe41c868 100644
--- a/lib/regex.h
+++ b/lib/regex.h
@@ -600,11 +600,9 @@ extern void re_set_registers (struct re_pattern_buffer 
*__buffer,
 #endif /* Use GNU */
 
 #if defined _REGEX_RE_COMP || (defined _LIBC && defined __USE_MISC)
-# ifndef _CRAY
 /* 4.2 bsd compatibility.  */
 extern char *re_comp (const char *);
 extern int re_exec (const char *);
-# endif
 #endif
 
 /* For plain 'restrict', use glibc's __restrict if defined.
diff --git a/lib/stat-size.h b/lib/stat-size.h
index c1c96598d..574f3dbc4 100644
--- a/lib/stat-size.h
+++ b/lib/stat-size.h
@@ -77,12 +77,6 @@
   /* HP-UX counts st_blocks in 1024-byte units.
      This loses when mixing HP-UX and BSD file systems with NFS.  */
 #  define ST_NBLOCKSIZE 1024
-# else /* !hpux */
-#  if defined _CRAY
-#   define ST_NBLOCKS(statbuf) \
-  (S_ISREG ((statbuf).st_mode) || S_ISDIR ((statbuf).st_mode) \
-   ? (statbuf).st_blocks * ST_BLKSIZE (statbuf) / ST_NBLOCKSIZE : 0)
-#  endif
 # endif
 #endif
 
-- 
2.25.4