From: Bruno Haible <bruno@clisp.org>
Date: Tue, 9 Sep 2025 10:50:18 +0000 (+0200)
Subject: Remove support for OSF/1.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19adc7a2f5ed9e83e39f197f2910eb79d741b720;p=thirdparty%2Fgnulib.git

Remove support for OSF/1.

* all-modules: Update comments.
* build-aux/install-reloc: Likewise.
* gnulib-tool: Likewise.
* gnulib-tool.py: Likewise.
* gnulib-tool.sh: Likewise.
* lib/calloc.c: Likewise.
* lib/euidaccess.c: Likewise.
* lib/fbufmode.c: Likewise.
* lib/fflush.c: Likewise.
* lib/fpending.c: Likewise.
* lib/fpurge.c: Likewise.
* lib/freadable.c: Likewise.
* lib/freadahead.c: Likewise.
* lib/freading.c: Likewise.
* lib/freadptr.c: Likewise.
* lib/freadseek.c: Likewise.
* lib/fseeko.c: Likewise.
* lib/fseterr.c: Likewise.
* lib/fwritable.c: Likewise.
* lib/fwriting.c: Likewise.
* lib/get-permissions.c: Likewise.
* lib/get-rusage-as.c: Likewise.
* lib/getdomainname.c: Likewise.
* lib/getpass.c: Likewise.
* lib/glthread/spin.c: Likewise.
* lib/idpriv-drop.c: Likewise.
* lib/idpriv-droptemp.c: Likewise.
* lib/log10l.c: Likewise.
* lib/login_tty.c: Likewise.
* lib/minmax.h: Likewise.
* lib/mountlist.c: Likewise.
* lib/netdb.in.h: Likewise.
* lib/nproc.c: Likewise.
* lib/passfd.c: Likewise.
* lib/posix_openpt.c: Likewise.
* lib/resource-ext.h: Likewise.
* lib/safe-read.h: Likewise.
* lib/safe-write.h: Likewise.
* lib/stdint.in.h: Likewise.
* lib/stdio.in.h: Likewise.
* lib/string.in.h: Likewise.
* lib/sys-limits.h: Likewise.
* lib/termcap.h: Likewise.
* lib/terminfo.h: Likewise.
* lib/ttyname_r.c: Likewise.
* lib/vasnprintf.c: Likewise.
* lib/wait-process.c: Likewise.
* m4/fmal.m4: Likewise.
* m4/getdomainname.m4: Likewise.
* m4/getopt.m4: Likewise.
* m4/hypot.m4: Likewise.
* m4/hypotf.m4: Likewise.
* m4/hypotl.m4: Likewise.
* m4/iconv.m4: Likewise.
* m4/iconv_open-utf.m4: Likewise.
* m4/imaxabs.m4: Likewise.
* m4/imaxdiv.m4: Likewise.
* m4/largefile.m4: Likewise.
* m4/link-follow.m4: Likewise.
* m4/locale-fr.m4: Likewise.
* m4/locale-ja.m4: Likewise.
* m4/locale_h.m4: Likewise.
* m4/lock.m4: Likewise.
* m4/log10l.m4: Likewise.
* m4/mkstemp.m4: Likewise.
* m4/mmap-anon.m4: Likewise.
* m4/modf.m4: Likewise.
* m4/modff.m4: Likewise.
* m4/modfl.m4: Likewise.
* m4/semaphore.m4: Likewise.
* m4/socklen.m4: Likewise.
* m4/strerror_r.m4: Likewise.
* m4/terminfo.m4: Likewise.
* m4/wcwidth.m4: Likewise.
* posix-modules: Likewise.
* tests/havelib/README: Likewise.
* tests/init.sh: Likewise.
* tests/socket-client.h: Likewise.
* tests/socket-server.h: Likewise.
* tests/test-echo.sh: Likewise.
* tests/test-nonblocking-socket.h: Likewise.
* tests/test-strtod.h: Likewise.
* tests/test-strtof.h: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 6d5607f850..0e0ff49b4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,90 @@
 2025-09-09  Bruno Haible  <bruno@clisp.org>
 
+	Remove support for OSF/1.
+	* all-modules: Update comments.
+	* build-aux/install-reloc: Likewise.
+	* gnulib-tool: Likewise.
+	* gnulib-tool.py: Likewise.
+	* gnulib-tool.sh: Likewise.
+	* lib/calloc.c: Likewise.
+	* lib/euidaccess.c: Likewise.
+	* lib/fbufmode.c: Likewise.
+	* lib/fflush.c: Likewise.
+	* lib/fpending.c: Likewise.
+	* lib/fpurge.c: Likewise.
+	* lib/freadable.c: Likewise.
+	* lib/freadahead.c: Likewise.
+	* lib/freading.c: Likewise.
+	* lib/freadptr.c: Likewise.
+	* lib/freadseek.c: Likewise.
+	* lib/fseeko.c: Likewise.
+	* lib/fseterr.c: Likewise.
+	* lib/fwritable.c: Likewise.
+	* lib/fwriting.c: Likewise.
+	* lib/get-permissions.c: Likewise.
+	* lib/get-rusage-as.c: Likewise.
+	* lib/getdomainname.c: Likewise.
+	* lib/getpass.c: Likewise.
+	* lib/glthread/spin.c: Likewise.
+	* lib/idpriv-drop.c: Likewise.
+	* lib/idpriv-droptemp.c: Likewise.
+	* lib/log10l.c: Likewise.
+	* lib/login_tty.c: Likewise.
+	* lib/minmax.h: Likewise.
+	* lib/mountlist.c: Likewise.
+	* lib/netdb.in.h: Likewise.
+	* lib/nproc.c: Likewise.
+	* lib/passfd.c: Likewise.
+	* lib/posix_openpt.c: Likewise.
+	* lib/resource-ext.h: Likewise.
+	* lib/safe-read.h: Likewise.
+	* lib/safe-write.h: Likewise.
+	* lib/stdint.in.h: Likewise.
+	* lib/stdio.in.h: Likewise.
+	* lib/string.in.h: Likewise.
+	* lib/sys-limits.h: Likewise.
+	* lib/termcap.h: Likewise.
+	* lib/terminfo.h: Likewise.
+	* lib/ttyname_r.c: Likewise.
+	* lib/vasnprintf.c: Likewise.
+	* lib/wait-process.c: Likewise.
+	* m4/fmal.m4: Likewise.
+	* m4/getdomainname.m4: Likewise.
+	* m4/getopt.m4: Likewise.
+	* m4/hypot.m4: Likewise.
+	* m4/hypotf.m4: Likewise.
+	* m4/hypotl.m4: Likewise.
+	* m4/iconv.m4: Likewise.
+	* m4/iconv_open-utf.m4: Likewise.
+	* m4/imaxabs.m4: Likewise.
+	* m4/imaxdiv.m4: Likewise.
+	* m4/largefile.m4: Likewise.
+	* m4/link-follow.m4: Likewise.
+	* m4/locale-fr.m4: Likewise.
+	* m4/locale-ja.m4: Likewise.
+	* m4/locale_h.m4: Likewise.
+	* m4/lock.m4: Likewise.
+	* m4/log10l.m4: Likewise.
+	* m4/mkstemp.m4: Likewise.
+	* m4/mmap-anon.m4: Likewise.
+	* m4/modf.m4: Likewise.
+	* m4/modff.m4: Likewise.
+	* m4/modfl.m4: Likewise.
+	* m4/semaphore.m4: Likewise.
+	* m4/socklen.m4: Likewise.
+	* m4/strerror_r.m4: Likewise.
+	* m4/terminfo.m4: Likewise.
+	* m4/wcwidth.m4: Likewise.
+	* posix-modules: Likewise.
+	* tests/havelib/README: Likewise.
+	* tests/init.sh: Likewise.
+	* tests/socket-client.h: Likewise.
+	* tests/socket-server.h: Likewise.
+	* tests/test-echo.sh: Likewise.
+	* tests/test-nonblocking-socket.h: Likewise.
+	* tests/test-strtod.h: Likewise.
+	* tests/test-strtof.h: Likewise.
+
 	tests: Remove support for OSF/1.
 	* tests/test-mbmemcasecmp.h (test_iso_8859_1): Remove code for OSF/1.
 	* tests/test-nonblocking-pipe.h (PIPE_DATA_BLOCK_SIZE): Likewise.
diff --git a/all-modules b/all-modules
index 2e9471d32e..d53c9a1d03 100755
--- a/all-modules
+++ b/all-modules
@@ -77,10 +77,10 @@ func_gnulib_dir ()
       # We use a canonicalized $pathx instead of $PATH, because empty PATH
       # elements are by definition equivalent to '.', however field splitting
       # according to IFS=: loses empty fields in many shells:
-      #   - /bin/sh on OSF/1 and Solaris loses all empty fields (at the
-      #     beginning, at the end, and in the middle),
-      #   - /bin/sh on IRIX and /bin/ksh on IRIX and OSF/1 lose empty fields
-      #     at the beginning and at the end,
+      #   - /bin/sh on Solaris loses all empty fields (at the beginning, at
+      #     the end, and in the middle),
+      #   - /bin/sh on IRIX and /bin/ksh on IRIX lose empty fields at the
+      #     beginning and at the end,
       #   - GNU bash, /bin/sh on AIX and HP-UX, and /bin/ksh on AIX, HP-UX,
       #     Solaris lose empty fields at the end.
       # The 'case' statement is an optimization, to avoid evaluating the
diff --git a/build-aux/install-reloc b/build-aux/install-reloc
index ebb5e4f75f..ec404632f6 100755
--- a/build-aux/install-reloc
+++ b/build-aux/install-reloc
@@ -304,7 +304,7 @@ func_create_wrapper ()
                -o "$destprog.wrapper$exeext"
   rc=$?
   # Clean up object files left over in the current directory by the native C
-  # compilers on Solaris, HP-UX, OSF/1, IRIX.
+  # compilers on Solaris, HP-UX, IRIX.
   rm -f relocwrapper.o \
         progname.o \
         progreloc.o \
diff --git a/gnulib-tool b/gnulib-tool
index 3dad968bc9..05675a0821 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -90,10 +90,10 @@ func_gnulib_dir ()
       # We use a canonicalized $pathx instead of $PATH, because empty PATH
       # elements are by definition equivalent to '.', however field splitting
       # according to IFS=: loses empty fields in many shells:
-      #   - /bin/sh on OSF/1 and Solaris loses all empty fields (at the
-      #     beginning, at the end, and in the middle),
-      #   - /bin/sh on IRIX and /bin/ksh on IRIX and OSF/1 lose empty fields
-      #     at the beginning and at the end,
+      #   - /bin/sh on Solaris loses all empty fields (at the beginning, at
+      #     the end, and in the middle),
+      #   - /bin/sh on IRIX and /bin/ksh on IRIX lose empty fields at the
+      #     beginning and at the end,
       #   - GNU bash, /bin/sh on AIX and HP-UX, and /bin/ksh on AIX, HP-UX,
       #     Solaris lose empty fields at the end.
       # The 'case' statement is an optimization, to avoid evaluating the
diff --git a/gnulib-tool.py b/gnulib-tool.py
index a30b54caa9..412b690634 100755
--- a/gnulib-tool.py
+++ b/gnulib-tool.py
@@ -79,10 +79,10 @@ func_gnulib_dir ()
       # We use a canonicalized $pathx instead of $PATH, because empty PATH
       # elements are by definition equivalent to '.', however field splitting
       # according to IFS=: loses empty fields in many shells:
-      #   - /bin/sh on OSF/1 and Solaris loses all empty fields (at the
-      #     beginning, at the end, and in the middle),
-      #   - /bin/sh on IRIX and /bin/ksh on IRIX and OSF/1 lose empty fields
-      #     at the beginning and at the end,
+      #   - /bin/sh on Solaris loses all empty fields (at the beginning, at
+      #     the end, and in the middle),
+      #   - /bin/sh on IRIX and /bin/ksh on IRIX lose empty fields at the
+      #     beginning and at the end,
       #   - GNU bash, /bin/sh on AIX and HP-UX, and /bin/ksh on AIX, HP-UX,
       #     Solaris lose empty fields at the end.
       # The 'case' statement is an optimization, to avoid evaluating the
diff --git a/gnulib-tool.sh b/gnulib-tool.sh
index 15a642279f..7fd3f104f4 100755
--- a/gnulib-tool.sh
+++ b/gnulib-tool.sh
@@ -472,10 +472,10 @@ func_gnulib_dir ()
       # We use a canonicalized $pathx instead of $PATH, because empty PATH
       # elements are by definition equivalent to '.', however field splitting
       # according to IFS=: loses empty fields in many shells:
-      #   - /bin/sh on OSF/1 and Solaris loses all empty fields (at the
-      #     beginning, at the end, and in the middle),
-      #   - /bin/sh on IRIX and /bin/ksh on IRIX and OSF/1 lose empty fields
-      #     at the beginning and at the end,
+      #   - /bin/sh on Solaris loses all empty fields (at the beginning, at
+      #     the end, and in the middle),
+      #   - /bin/sh on IRIX and /bin/ksh on IRIX lose empty fields at the
+      #     beginning and at the end,
       #   - GNU bash, /bin/sh on AIX and HP-UX, and /bin/ksh on AIX, HP-UX,
       #     Solaris lose empty fields at the end.
       # The 'case' statement is an optimization, to avoid evaluating the
@@ -911,7 +911,7 @@ func_hardlink ()
 # - in zsh, when sh-emulation is not set,
 # - in ksh (e.g. AIX /bin/sh and Solaris /usr/xpg4/bin/sh are ksh instances,
 #           and HP-UX /bin/sh and IRIX /bin/sh behave similarly),
-# - in Solaris /bin/sh and OSF/1 /bin/sh.
+# - in Solaris /bin/sh.
 # We try the following workarounds:
 # - for all: respawn using $CONFIG_SHELL if that is set and works.
 # - for bash >= 2.04: unset the shell option xpg_echo.
@@ -920,8 +920,7 @@ func_hardlink ()
 # - for zsh: turn sh-emulation on.
 # - for ksh: alias echo to 'print -r'.
 # - for ksh: alias echo to a function that uses cat of a here document.
-# - for Solaris /bin/sh and OSF/1 /bin/sh: respawn using /bin/ksh and rely on
-#   the ksh workaround.
+# - for Solaris /bin/sh: respawn using /bin/ksh and rely on the ksh workaround.
 # - otherwise: respawn using /bin/sh and rely on the workarounds.
 # When respawning, we pass --no-reexec as first argument, so as to avoid
 # turning this script into a fork bomb in unlucky situations.
@@ -1031,7 +1030,7 @@ if test -z "$have_echo"; then
     unalias echo 2>/dev/null
   fi
 fi
-# For Solaris /bin/sh and OSF/1 /bin/sh: respawn using /bin/ksh.
+# For Solaris /bin/sh: respawn using /bin/ksh.
 if test -z "$have_echo" \
    && test "X$1" != "X--no-reexec" \
    && test -f /bin/ksh; then
diff --git a/lib/calloc.c b/lib/calloc.c
index 5258c5dec6..66ed0cf941 100644
--- a/lib/calloc.c
+++ b/lib/calloc.c
@@ -1,5 +1,5 @@
 /* calloc() function that is glibc compatible.
-   This wrapper function is required at least on Tru64 UNIX 5.1 and mingw.
+   This wrapper function is required at least on mingw.
    Copyright (C) 2004-2007, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/lib/euidaccess.c b/lib/euidaccess.c
index 05e1f2a6dd..97b89523ee 100644
--- a/lib/euidaccess.c
+++ b/lib/euidaccess.c
@@ -79,7 +79,7 @@ euidaccess (const char *file, int mode)
 {
 #if HAVE_FACCESSAT                   /* glibc, AIX 7, Solaris 11, Cygwin 1.7 */
   return faccessat (AT_FDCWD, file, mode, AT_EACCESS);
-#elif defined EFF_ONLY_OK               /* IRIX, OSF/1, Interix */
+#elif defined EFF_ONLY_OK               /* IRIX, Interix */
   return access (file, mode | EFF_ONLY_OK);
 #elif defined ACC_SELF                  /* AIX */
   return accessx (file, mode, ACC_SELF);
diff --git a/lib/fbufmode.c b/lib/fbufmode.c
index b10a122f94..c64b4b164a 100644
--- a/lib/fbufmode.c
+++ b/lib/fbufmode.c
@@ -59,7 +59,7 @@ fbufmode (FILE *fp)
   return fp->_flags & (_IOLBF | _IONBF | _IOFBF);
 #elif defined __minix               /* Minix */
   return fp->_flags & (_IOLBF | _IONBF | _IOFBF);
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
 # if defined WINDOWS_OPAQUE_FILE
   if (fp_->_flag & 0x100)
     return _IOFBF; /* Impossible to distinguish _IOFBF and _IOLBF.  */
diff --git a/lib/fflush.c b/lib/fflush.c
index 896b9dab3d..1895503b9b 100644
--- a/lib/fflush.c
+++ b/lib/fflush.c
@@ -65,7 +65,7 @@ clear_ungetc_buffer (FILE *fp)
       fp->_ungetc_count = 0;
       fp->_rcount = - fp->_rcount;
     }
-# elif defined _IOERR               /* Minix, AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
+# elif defined _IOERR               /* Minix, AIX, HP-UX, IRIX, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
   /* Nothing to do.  */
 # else                              /* other implementations */
   fseeko (fp, 0, SEEK_CUR);
diff --git a/lib/fpending.c b/lib/fpending.c
index 529bc7f651..b1d66dca91 100644
--- a/lib/fpending.c
+++ b/lib/fpending.c
@@ -46,7 +46,7 @@ __fpending (FILE *fp)
   return fp->_ptr - fp->_buffer;
 #elif defined __minix                /* Minix */
   return fp_->_ptr - fp_->_buf;
-#elif defined _IOERR                 /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
+#elif defined _IOERR                 /* AIX, HP-UX, IRIX, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
   return (fp_->_ptr ? fp_->_ptr - fp_->_base : 0);
 #elif defined __UCLIBC__             /* uClibc */
   return (fp->__modeflags & __FLAG_WRITING ? fp->__bufpos - fp->__bufstart : 0);
diff --git a/lib/fpurge.c b/lib/fpurge.c
index a9f9c3d66f..4131f6b963 100644
--- a/lib/fpurge.c
+++ b/lib/fpurge.c
@@ -101,7 +101,7 @@ fpurge (FILE *fp)
   if (fp->_ptr != NULL)
     fp->_count = 0;
   return 0;
-# elif defined _IOERR               /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
+# elif defined _IOERR               /* AIX, HP-UX, IRIX, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
   fp_->_ptr = fp_->_base;
   if (fp_->_ptr != NULL)
     fp_->_cnt = 0;
diff --git a/lib/freadable.c b/lib/freadable.c
index 60eb32f93b..fcb4cdc938 100644
--- a/lib/freadable.c
+++ b/lib/freadable.c
@@ -45,7 +45,7 @@ freadable (FILE *fp)
   return (fp->_flags & (_IORW | _IOREAD)) != 0;
 #elif defined __minix               /* Minix */
   return (fp->_flags & _IOREAD) != 0;
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
   return (fp_->_flag & (_IORW | _IOREAD)) != 0;
 #elif defined __QNX__               /* QNX */
   return (fp->_Mode & 0x1 /* _MOPENR */) != 0;
diff --git a/lib/freadahead.c b/lib/freadahead.c
index c44ab033c7..f18e21ae31 100644
--- a/lib/freadahead.c
+++ b/lib/freadahead.c
@@ -62,7 +62,7 @@ freadahead (FILE *fp)
   if ((fp_->_flags & _IOWRITING) != 0)
     return 0;
   return fp_->_count;
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
   if ((fp_->_flag & _IOWRT) != 0)
     return 0;
   return fp_->_cnt;
diff --git a/lib/freading.c b/lib/freading.c
index cfa0dbb9da..113e2082c5 100644
--- a/lib/freading.c
+++ b/lib/freading.c
@@ -43,7 +43,7 @@ freading (FILE *fp)
   return (fp->_flags & _IOREAD) != 0;
 # elif defined __minix               /* Minix */
   return (fp->_flags & _IOREADING) != 0;
-# elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
+# elif defined _IOERR                /* AIX, HP-UX, IRIX, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
 #  if defined __sun                  /* Solaris */
   return (fp_->_flag & _IOREAD) != 0 && (fp_->_flag & _IOWRT) == 0;
 #  else
diff --git a/lib/freadptr.c b/lib/freadptr.c
index 9719c177e5..6bc310d85a 100644
--- a/lib/freadptr.c
+++ b/lib/freadptr.c
@@ -69,7 +69,7 @@ freadptr (FILE *fp, size_t *sizep)
     return NULL;
   *sizep = size;
   return (const char *) fp_->_ptr;
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
   if ((fp_->_flag & _IOWRT) != 0)
     return NULL;
   size = fp_->_cnt;
diff --git a/lib/freadseek.c b/lib/freadseek.c
index 5ddf7fab58..734bf20bda 100644
--- a/lib/freadseek.c
+++ b/lib/freadseek.c
@@ -49,7 +49,7 @@ freadptrinc (FILE *fp, size_t increment)
 #elif defined __minix               /* Minix */
   fp_->_ptr += increment;
   fp_->_count -= increment;
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
   fp_->_ptr += increment;
   fp_->_cnt -= increment;
 #elif defined __UCLIBC__            /* uClibc */
diff --git a/lib/fseeko.c b/lib/fseeko.c
index d4b6d8f44c..bfa98ee4bf 100644
--- a/lib/fseeko.c
+++ b/lib/fseeko.c
@@ -84,7 +84,7 @@ fseeko (FILE *fp, off_t offset, int whence)
 #elif defined __minix               /* Minix */
   if (fp_->_ptr == fp_->_buf
       && (fp_->_ptr == NULL || fp_->_count == 0))
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
   if (fp_->_ptr == fp_->_base
       && (fp_->_ptr == NULL || fp_->_cnt == 0))
 #elif defined __UCLIBC__            /* uClibc */
diff --git a/lib/fseterr.c b/lib/fseterr.c
index caa8ef1087..b69c25af2e 100644
--- a/lib/fseterr.c
+++ b/lib/fseterr.c
@@ -42,7 +42,7 @@ fseterr (FILE *fp)
   fp->_flags |= _IOERR;
 #elif defined __minix               /* Minix */
   fp->_flags |= _IOERR;
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
   fp_->_flag |= _IOERR;
 #elif defined __UCLIBC__            /* uClibc */
   fp->__modeflags |= __FLAG_ERROR;
diff --git a/lib/fwritable.c b/lib/fwritable.c
index 54471a8271..757c4bd95c 100644
--- a/lib/fwritable.c
+++ b/lib/fwritable.c
@@ -45,7 +45,7 @@ fwritable (FILE *fp)
   return (fp->_flags & (_IORW | _IOWRT)) != 0;
 #elif defined __minix               /* Minix */
   return (fp->_flags & _IOWRITE) != 0;
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
   return (fp_->_flag & (_IORW | _IOWRT)) != 0;
 #elif defined __QNX__               /* QNX */
   return (fp->_Mode & 0x2 /* _MOPENW */) != 0;
diff --git a/lib/fwriting.c b/lib/fwriting.c
index 90cb2c3ad5..68ade2220a 100644
--- a/lib/fwriting.c
+++ b/lib/fwriting.c
@@ -41,7 +41,7 @@ fwriting (FILE *fp)
   return (fp->_flags & _IOWRT) != 0;
 #elif defined __minix               /* Minix */
   return (fp->_flags & _IOWRITING) != 0;
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
   return (fp_->_flag & _IOWRT) != 0;
 #elif defined __UCLIBC__            /* uClibc */
   return (fp->__modeflags & __FLAG_WRITING) != 0;
diff --git a/lib/get-permissions.c b/lib/get-permissions.c
index f9e96afbe4..5ea23dc44f 100644
--- a/lib/get-permissions.c
+++ b/lib/get-permissions.c
@@ -38,9 +38,9 @@ get_permissions (const char *name, int desc, mode_t mode,
 
 #if USE_ACL && HAVE_ACL_GET_FILE
   /* POSIX 1003.1e (draft 17 -- abandoned) specific version.  */
-  /* Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5 */
+  /* Linux, FreeBSD, Mac OS X, IRIX, Cygwin >= 2.5 */
 # if !HAVE_ACL_TYPE_EXTENDED
-  /* Linux, FreeBSD, IRIX, Tru64, Cygwin >= 2.5 */
+  /* Linux, FreeBSD, IRIX, Cygwin >= 2.5 */
 
   if (HAVE_ACL_GET_FD && desc != -1)
     ctx->acl = acl_get_fd (desc);
diff --git a/lib/get-rusage-as.c b/lib/get-rusage-as.c
index f1dddbf926..c1dad89a1b 100644
--- a/lib/get-rusage-as.c
+++ b/lib/get-rusage-as.c
@@ -99,12 +99,6 @@
      b) The /proc/$pid file supports ioctls PIOCNMAP and PIOCMAP.
      Both methods agree,
 
-   OSF/1:
-     a) setrlimit with RLIMIT_AS works.
-     b) The /proc/$pid file supports ioctls PIOCNMAP and PIOCMAP.
-     The value returned by get_rusage_as_via_setrlimit() is 64 KB higher than
-     get_rusage_as_via_iterator().  It's not clear why.
-
    Solaris:
      a) setrlimit with RLIMIT_AS works.
      b) The /proc/$pid file supports ioctls PIOCNMAP and PIOCMAP, and the
diff --git a/lib/getdomainname.c b/lib/getdomainname.c
index 2be188c494..da71f4c9dc 100644
--- a/lib/getdomainname.c
+++ b/lib/getdomainname.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <errno.h>
 
-#if HAVE_SYSINFO && HAVE_SYS_SYSTEMINFO_H /* IRIX, OSF/1, Solaris */
+#if HAVE_SYSINFO && HAVE_SYS_SYSTEMINFO_H /* IRIX, Solaris */
 # include <sys/systeminfo.h>
 #endif
 
@@ -44,7 +44,7 @@ int
 getdomainname (char *name, size_t len)
 #undef getdomainname
 {
-#if HAVE_GETDOMAINNAME                 /* Mac OS X, FreeBSD, AIX, IRIX, OSF/1 */
+#if HAVE_GETDOMAINNAME                 /* Mac OS X, FreeBSD, AIX, IRIX */
   extern int getdomainname (char *, int);
 
   if (len > INT_MAX)
diff --git a/lib/getpass.c b/lib/getpass.c
index bb541dc032..36852d7f91 100644
--- a/lib/getpass.c
+++ b/lib/getpass.c
@@ -138,8 +138,8 @@ getpass (const char *prompt)
   /* According to the C standard, input may not be followed by output
      on the same stream without an intervening call to a file
      positioning function.  Suppose in == out; then without this fseek
-     call, on Solaris, HP-UX, AIX, OSF/1, the previous input gets
-     echoed, whereas on IRIX, the following newline is not output as
+     call, on Solaris, HP-UX, AIX, the previous input gets echoed,
+     whereas on IRIX, the following newline is not output as
      it should be.  POSIX imposes similar restrictions if fileno (in)
      == fileno (out).  The POSIX restrictions are tricky and change
      from POSIX version to POSIX version, so play it safe and invoke
diff --git a/lib/glthread/spin.c b/lib/glthread/spin.c
index c8dd483b64..707d3ebb1d 100644
--- a/lib/glthread/spin.c
+++ b/lib/glthread/spin.c
@@ -37,8 +37,8 @@
 #else
 
 /* We don't use semaphores (although sem_post() is allowed in signal handlers),
-   because it would require to link with -lrt on HP-UX 11, OSF/1, Solaris 10,
-   and also because on macOS only named semaphores work.
+   because it would require to link with -lrt on HP-UX 11, Solaris 10, and also
+   because on macOS only named semaphores work.
 
    We don't use the C11 <stdatomic.h> (available in GCC >= 4.9) because it would
    require to link with -latomic.  */
diff --git a/lib/idpriv-drop.c b/lib/idpriv-drop.c
index f23a432c6f..22d7966c74 100644
--- a/lib/idpriv-drop.c
+++ b/lib/idpriv-drop.c
@@ -42,7 +42,7 @@ idpriv_drop (void)
      setresuid.  */
   if (setresgid (gid, gid, gid) < 0)
     return -1;
-#elif HAVE_SETREGID /* Mac OS X, NetBSD, AIX, IRIX, Solaris, OSF/1, Cygwin */
+#elif HAVE_SETREGID /* Mac OS X, NetBSD, AIX, IRIX, Solaris, Cygwin */
   if (setregid (gid, gid) < 0)
     return -1;
 #elif HAVE_SETEGID /* Solaris 2.4 */
@@ -62,7 +62,7 @@ idpriv_drop (void)
      is used seems to vary a lot."  */
   if (setresuid (uid, uid, uid) < 0)
     return -1;
-#elif HAVE_SETREUID /* Mac OS X, NetBSD, AIX, IRIX, Solaris, OSF/1, Cygwin */
+#elif HAVE_SETREUID /* Mac OS X, NetBSD, AIX, IRIX, Solaris, Cygwin */
   if (setreuid (uid, uid) < 0)
     return -1;
 #elif HAVE_SETEUID /* Solaris 2.4 */
diff --git a/lib/idpriv-droptemp.c b/lib/idpriv-droptemp.c
index ecaab836f2..05d56a5b5f 100644
--- a/lib/idpriv-droptemp.c
+++ b/lib/idpriv-droptemp.c
@@ -51,7 +51,7 @@ idpriv_temp_drop (void)
 # if HAVE_SETRESGID /* glibc, FreeBSD, OpenBSD, HP-UX */
   if (setresgid (-1, gid, saved_gid) < 0)
     return -1;
-# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */
+# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, Cygwin */
   if (setregid (-1, gid) < 0)
     return -1;
 # endif
@@ -64,7 +64,7 @@ idpriv_temp_drop (void)
      figure 14.  */
   if (setresuid (-1, uid, saved_uid) < 0)
     return -1;
-# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */
+# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, Cygwin */
   if (setreuid (-1, uid) < 0)
     return -1;
 # endif
@@ -142,7 +142,7 @@ idpriv_temp_restore (void)
      figure 14.  */
   if (setresuid (-1, saved_uid, -1) < 0)
     return -1;
-# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */
+# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, Cygwin */
   if (setreuid (-1, saved_uid) < 0)
     return -1;
 # endif
@@ -151,7 +151,7 @@ idpriv_temp_restore (void)
 # if HAVE_SETRESGID /* glibc, FreeBSD, OpenBSD, HP-UX */
   if (setresgid (-1, saved_gid, -1) < 0)
     return -1;
-# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */
+# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, Cygwin */
   if (setregid (-1, saved_gid) < 0)
     return -1;
 # endif
diff --git a/lib/log10l.c b/lib/log10l.c
index 838a179a88..a607db8920 100644
--- a/lib/log10l.c
+++ b/lib/log10l.c
@@ -35,7 +35,7 @@ long double
 log10l (long double x)
 # undef log10l
 {
-  /* Work around the OSF/1 5.1 bug.  */
+  /* Work around the AIX, IRIX bug.  */
   if (x == 0.0L)
     /* Return -Infinity.  */
     return -1.0L / 0.0L;
diff --git a/lib/login_tty.c b/lib/login_tty.c
index 4ecba4f28f..98fd649668 100644
--- a/lib/login_tty.c
+++ b/lib/login_tty.c
@@ -33,7 +33,7 @@ login_tty (int slave_fd)
   setsid ();
 
   /* Make fd the controlling terminal for the current process.
-     On BSD and OSF/1: There is ioctl TIOCSCTTY for this purpose.
+     On BSD: There is ioctl TIOCSCTTY for this purpose.
      On Solaris:
        A terminal becomes the controlling terminal of a session
        if it is being open()ed, at a moment when
diff --git a/lib/minmax.h b/lib/minmax.h
index 355de4b1c3..a12975c51b 100644
--- a/lib/minmax.h
+++ b/lib/minmax.h
@@ -19,7 +19,7 @@
 #define _MINMAX_H
 
 /* Note: MIN, MAX are also defined in <sys/param.h> on some systems
-   (glibc, IRIX, HP-UX, OSF/1).  Therefore you might get warnings about
+   (glibc, IRIX, HP-UX).  Therefore you might get warnings about
    MIN, MAX macro redefinitions on some systems; the workaround is to
    #include this file as the last one among the #include list.  */
 
diff --git a/lib/mountlist.c b/lib/mountlist.c
index dcff6f8319..4730add37e 100644
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -41,7 +41,7 @@
 # include <sys/sysmacros.h>
 #endif
 
-#if defined MOUNTED_GETFSSTAT   /* OSF/1, also (obsolete) Apple Darwin 1.3 */
+#if defined MOUNTED_GETFSSTAT   /* (obsolete) Apple Darwin 1.3 */
 # if HAVE_SYS_UCRED_H
 #  include <grp.h> /* needed on OSF V4.0 for definition of NGROUPS,
                       NGROUPS is used as an array dimension in ucred.h */
@@ -764,7 +764,7 @@ read_file_system_list (bool need_fs_type)
   }
 #endif /* MOUNTED_FS_STAT_DEV */
 
-#if defined MOUNTED_GETFSSTAT   /* OSF/1, also (obsolete) Apple Darwin 1.3 */
+#if defined MOUNTED_GETFSSTAT   /* (obsolete) Apple Darwin 1.3 */
   {
     int numsys, counter;
     size_t bufsize;
diff --git a/lib/netdb.in.h b/lib/netdb.in.h
index 22059ea044..8c8aa558f2 100644
--- a/lib/netdb.in.h
+++ b/lib/netdb.in.h
@@ -41,7 +41,7 @@
  #error "Please include config.h first."
 #endif
 
-/* Get <netdb.h> definitions such as 'socklen_t' on IRIX 6.5 and OSF/1 4.0 and
+/* Get <netdb.h> definitions such as 'socklen_t' on IRIX 6.5 and
    'struct hostent' on MinGW.  */
 #include <sys/socket.h>
 
diff --git a/lib/nproc.c b/lib/nproc.c
index 7c5ae3acf9..f0b77ab381 100644
--- a/lib/nproc.c
+++ b/lib/nproc.c
@@ -279,8 +279,8 @@ num_processors_available (enum nproc_query query)
       }
 
 #if defined _SC_NPROCESSORS_ONLN
-      { /* This works on glibc, Mac OS X 10.5, FreeBSD, AIX, OSF/1, Solaris,
-           Cygwin, Haiku.  */
+      { /* This works on glibc, Mac OS X 10.5, FreeBSD, AIX, Solaris, Cygwin,
+           Haiku.  */
         long int nprocs = sysconf (_SC_NPROCESSORS_ONLN);
         if (nprocs > 0)
           return nprocs;
@@ -290,8 +290,8 @@ num_processors_available (enum nproc_query query)
   else /* query == NPROC_ALL */
     {
 #if defined _SC_NPROCESSORS_CONF
-      { /* This works on glibc, Mac OS X 10.5, FreeBSD, AIX, OSF/1, Solaris,
-           Cygwin, Haiku.  */
+      { /* This works on glibc, Mac OS X 10.5, FreeBSD, AIX, Solaris, Cygwin,
+           Haiku.  */
         long int nprocs = sysconf (_SC_NPROCESSORS_CONF);
 
 # if __GLIBC__ >= 2 && defined __linux__
diff --git a/lib/passfd.c b/lib/passfd.c
index 82ed5c0a4f..3f98402e52 100644
--- a/lib/passfd.c
+++ b/lib/passfd.c
@@ -31,7 +31,7 @@
 #include "cloexec.h"
 
 /* The code that uses CMSG_FIRSTHDR is enabled on
-   Linux, Mac OS X, FreeBSD, OpenBSD, NetBSD, AIX, OSF/1, Cygwin.
+   Linux, Mac OS X, FreeBSD, OpenBSD, NetBSD, AIX, Cygwin.
    The code that uses HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS is enabled on
    HP-UX, IRIX, Solaris.  */
 
diff --git a/lib/posix_openpt.c b/lib/posix_openpt.c
index e30fbc126b..2239709203 100644
--- a/lib/posix_openpt.c
+++ b/lib/posix_openpt.c
@@ -34,12 +34,11 @@
      AIX >= 5.2, HP-UX >= 11.31, Solaris >= 10, Cygwin >= 1.7.
    Thus, this replacement function is compiled on
      Mac OS X 10.3, OpenBSD 4.9, Minix 3.1.8,
-     AIX 5.1, HP-UX 11.23, IRIX 6.5, OSF/1 5.1, Solaris 9,
+     AIX 5.1, HP-UX 11.23, IRIX 6.5, Solaris 9,
      Cygwin 1.5.x, mingw, MSVC 9, Interix 3.5, BeOS.
    Among these:
      - AIX has /dev/ptc.
-     - HP-UX 10..11, IRIX 6.5, OSF/1 5.1, Solaris 2.6..9, Cygwin 1.5
-       have /dev/ptmx.
+     - HP-UX 10..11, IRIX 6.5, Solaris 2.6..9, Cygwin 1.5 have /dev/ptmx.
      - HP-UX 10..11 also has /dev/ptym/clone, but this should not be needed.
      - OpenBSD 4.9 has /dev/ptm and the PTMGET ioctl.
      - Minix 3.1.8 have a list of pseudo-terminal devices in /dev.
@@ -87,7 +86,7 @@ posix_openpt (int flags)
   else
     master = -1;
 
-#else /* Mac OS X, Minix, HP-UX, IRIX, OSF/1, Solaris 9, Cygwin 1.5 */
+#else /* Mac OS X, Minix, HP-UX, IRIX, Solaris 9, Cygwin 1.5 */
 
   /* Most systems that lack posix_openpt() have /dev/ptmx.  */
   master = open ("/dev/ptmx", flags);
@@ -98,7 +97,6 @@ posix_openpt (int flags)
      - On Minix:    /dev/pty[p-q][0-9a-f]
      - On AIX:      /dev/ptyp[0-9a-f]
      - On HP-UX:    /dev/pty[p-r][0-9a-f]
-     - On OSF/1:    /dev/pty[p-q][0-9a-f]
      - On Solaris:  /dev/pty[p-r][0-9a-f]
    */
 
diff --git a/lib/resource-ext.h b/lib/resource-ext.h
index 2177629369..6d42de0776 100644
--- a/lib/resource-ext.h
+++ b/lib/resource-ext.h
@@ -36,7 +36,7 @@ extern uintptr_t get_rusage_as (void);
    Note: This function always returns zero on HP-UX 11.00.
    Note: The total size of all malloc()ed memory is bounded by the size of
    the data segment only on the following platforms:
-   FreeBSD, AIX, HP-UX 11.23 and newer, IRIX, OSF/1, Solaris, BeOS, Haiku.  */
+   FreeBSD, AIX, HP-UX 11.23 and newer, IRIX, Solaris, BeOS, Haiku.  */
 extern uintptr_t get_rusage_data (void);
 
 
diff --git a/lib/safe-read.h b/lib/safe-read.h
index 4b9d10a516..a97a42e49c 100644
--- a/lib/safe-read.h
+++ b/lib/safe-read.h
@@ -23,7 +23,7 @@
        SA_RESTART.
      - The process receives a signal for which a signal handler was installed
        with signal() and for which no call to siginterrupt(sig,0) was done,
-       on some platforms: AIX, HP-UX, IRIX, OSF/1, Solaris.
+       on some platforms: AIX, HP-UX, IRIX, Solaris.
 
    This module provides a wrapper around read() that handles EINTR.  */
 
diff --git a/lib/safe-write.h b/lib/safe-write.h
index 34ab4469b1..baa9cb9e29 100644
--- a/lib/safe-write.h
+++ b/lib/safe-write.h
@@ -23,7 +23,7 @@
        SA_RESTART.
      - The process receives a signal for which a signal handler was installed
        with signal() and for which no call to siginterrupt(sig,0) was done,
-       on some platforms: AIX, HP-UX, IRIX, OSF/1, Solaris.
+       on some platforms: AIX, HP-UX, IRIX, Solaris.
 
    This module provides a wrapper around write() that handles EINTR.  */
 
diff --git a/lib/stdint.in.h b/lib/stdint.in.h
index ca566b303e..226165fa10 100644
--- a/lib/stdint.in.h
+++ b/lib/stdint.in.h
@@ -584,11 +584,7 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
 # endif
 
 /* wchar_t limits */
-/* Get WCHAR_MIN, WCHAR_MAX.
-   This include is not on the top, above, because on OSF/1 4.0 we have a
-   sequence of nested includes
-   <wchar.h> -> <stdio.h> -> <getopt.h> -> <stdlib.h>, and the latter includes
-   <stdint.h> and assumes its types are already defined.  */
+/* Get WCHAR_MIN, WCHAR_MAX.  */
 # if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX)
 #  define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
 #  include <wchar.h>
diff --git a/lib/stdio.in.h b/lib/stdio.in.h
index e506e30991..3de226811a 100644
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -22,12 +22,7 @@
 
 #if defined __need_FILE || defined __need___FILE || defined _@GUARD_PREFIX@_ALREADY_INCLUDING_STDIO_H || defined _GL_SKIP_GNULIB_STDIO_H
 /* Special invocation convention:
-   - Inside glibc header files.
-   - On OSF/1 5.1 we have a sequence of nested includes
-     <stdio.h> -> <getopt.h> -> <ctype.h> -> <sys/localedef.h> ->
-     <sys/lc_core.h> -> <nl_types.h> -> <mesg.h> -> <stdio.h>.
-     In this situation, the functions are not yet declared, therefore we cannot
-     provide the C++ aliases.  */
+   - Inside glibc header files.  */
 
 #@INCLUDE_NEXT@ @NEXT_STDIO_H@
 
diff --git a/lib/string.in.h b/lib/string.in.h
index 4333055993..995efd36d1 100644
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -1208,7 +1208,7 @@ _GL_EXTERN_C bool str_endswith (const char *string, const char *prefix)
 # ifdef __MirBSD__  /* MirBSD defines mbslen as a macro.  Override it.  */
 #  undef mbslen
 # endif
-# if @HAVE_MBSLEN@  /* AIX, OSF/1, MirBSD define mbslen already in libc.  */
+# if @HAVE_MBSLEN@  /* AIX, MirBSD define mbslen already in libc.  */
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define mbslen rpl_mbslen
 #  endif
diff --git a/lib/sys-limits.h b/lib/sys-limits.h
index a556dfeb6d..5f074fc7db 100644
--- a/lib/sys-limits.h
+++ b/lib/sys-limits.h
@@ -30,10 +30,6 @@
    Using this also works around a serious Linux bug before 2.6.16; see
    <https://bugzilla.redhat.com/show_bug.cgi?id=612839>.
 
-   Using this also works around a Tru64 5.1 bug, where attempting
-   to read INT_MAX bytes fails with errno == EINVAL.  See
-   <https://lists.gnu.org/r/bug-gnu-utils/2002-04/msg00010.html>.
-
    Using this is likely to work around similar bugs in other operating
    systems.  */
 
diff --git a/lib/termcap.h b/lib/termcap.h
index dacf5b265f..40fd1f79b4 100644
--- a/lib/termcap.h
+++ b/lib/termcap.h
@@ -87,7 +87,6 @@ extern char * tparam (const char *str, void *buf, int bufsize, ...);
 
 /* API provided by
      - GNU ncurses in <term.h>, <curses.h>, <ncurses.h>,
-     - OSF/1 curses in <term.h>, <curses.h>,
      - Solaris, AIX, HP-UX, IRIX curses in <term.h>,
      - gnulib's replacement.  */
 
diff --git a/lib/terminfo.h b/lib/terminfo.h
index 3e57e48975..15fa590fca 100644
--- a/lib/terminfo.h
+++ b/lib/terminfo.h
@@ -85,7 +85,6 @@ extern char * tparam (const char *str, void *buf, int bufsize, ...);
 
 /* API provided by
      - GNU ncurses in <term.h>, <curses.h>, <ncurses.h>,
-     - OSF/1 curses in <term.h>, <curses.h>,
      - Solaris, AIX, HP-UX, IRIX curses in <term.h>,
      - gnulib's replacement.  */
 
diff --git a/lib/ttyname_r.c b/lib/ttyname_r.c
index 4f4c9dd18c..ce7511bc66 100644
--- a/lib/ttyname_r.c
+++ b/lib/ttyname_r.c
@@ -60,8 +60,7 @@ ttyname_r (int fd, char *buf, size_t buflen)
 #elif HAVE_TTYNAME_R
   /* When ttyname_r exists, use it.  */
   /* This code is multithread-safe.  */
-  /* On Solaris, ttyname_r always fails if buflen < 128.  On OSF/1 5.1,
-     ttyname_r ignores the buffer size and assumes the buffer is large enough.
+  /* On Solaris, ttyname_r always fails if buflen < 128.
      So provide a buffer that is large enough.  */
   char largerbuf[512];
 # if HAVE_POSIXDECL_TTYNAME_R
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index 9c68661204..afdcffd5e0 100644
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -6992,7 +6992,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                    on musl libc because we would run into an swprintf() bug.
                    See <https://www.openwall.com/lists/musl/2023/03/19/1>.  */
                 fbp[1] = '\0';
-# else           /* AIX <= 5.1, HP-UX, IRIX, OSF/1, Solaris <= 9, BeOS */
+# else           /* AIX <= 5.1, HP-UX, IRIX, Solaris <= 9, BeOS */
                 fbp[1] = '%';
                 fbp[2] = 'n';
                 fbp[3] = '\0';
diff --git a/lib/wait-process.c b/lib/wait-process.c
index d3afe23c4a..e95f98c7a7 100644
--- a/lib/wait-process.c
+++ b/lib/wait-process.c
@@ -241,8 +241,8 @@ wait_subprocess (pid_t child, const char *progname,
 {
 #if HAVE_WAITID && defined WNOWAIT && 0
   /* Commented out because waitid() without WEXITED and with WNOWAIT doesn't
-     work: On Solaris 7 and OSF/1 4.0, it returns -1 and sets errno = ECHILD,
-     and on HP-UX 10.20 it just hangs.  */
+     work: On Solaris 7, it returns -1 and sets errno = ECHILD, and on
+     HP-UX 10.20 it just hangs.  */
   /* Use of waitid() with WNOWAIT avoids a race condition: If slave_process is
      true, and this process sleeps a very long time between the return from
      waitpid() and the execution of unregister_slave_subprocess(), and
diff --git a/m4/fmal.m4 b/m4/fmal.m4
index 9f1eb7d61e..f8267cdbec 100644
--- a/m4/fmal.m4
+++ b/m4/fmal.m4
@@ -1,5 +1,5 @@
 # fmal.m4
-# serial 12
+# serial 13
 dnl Copyright (C) 2011-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -145,7 +145,7 @@ int main()
       failed_tests |= 1;
   }
   /* This test fails on glibc 2.11 x86,x86_64,powerpc, glibc 2.7 hppa,sparc,
-     OSF/1 5.1, mingw.  */
+     mingw.  */
   {
     volatile long double x = 1.0L + ldexpl (1.0L, 1 - LDBL_MANT_DIG); /* 2^0 + 2^-63 */
     volatile long double y = x;
@@ -160,7 +160,7 @@ int main()
       failed_tests |= 2;
   }
   /* This test fails on glibc 2.11 x86,x86_64,powerpc glibc 2.7 hppa,sparc,
-     OpenBSD 7.4/arm64, OSF/1 5.1, mingw.  */
+     OpenBSD 7.4/arm64, mingw.  */
   {
     volatile long double x = 1.0L + ldexpl (1.0L, 1 - LDBL_MANT_DIG); /* 2^0 + 2^-63 */
     volatile long double y = - x;
@@ -190,7 +190,7 @@ int main()
   }
   if ((LDBL_MANT_DIG % 2) == 1)
     {
-      /* These tests fail on glibc 2.7 hppa,sparc, OpenBSD 7.4/arm64, OSF/1 5.1.  */
+      /* These tests fail on glibc 2.7 hppa,sparc, OpenBSD 7.4/arm64.  */
       {
         volatile long double x = 1.0L + ldexpl (1.0L, - (LDBL_MANT_DIG + 1) / 2); /* 2^0 + 2^-27 */
         volatile long double y = 1.0L - ldexpl (1.0L, - (LDBL_MANT_DIG + 1) / 2); /* 2^0 - 2^-27 */
@@ -358,7 +358,7 @@ int main()
       failed_tests |= 16;
   }
   /* This test fails on glibc 2.11 x86,x86_64,powerpc glibc 2.7 hppa,sparc,
-     Mac OS X 10.5, FreeBSD 6.4 x86, OSF/1 5.1, mingw.  */
+     Mac OS X 10.5, FreeBSD 6.4 x86, mingw.  */
   {
     volatile long double x = ldexpl (1.0L, LDBL_MAX_EXP - 1);
     volatile long double y = 2.0L;
diff --git a/m4/getdomainname.m4 b/m4/getdomainname.m4
index c2a9a13259..2eae812e26 100644
--- a/m4/getdomainname.m4
+++ b/m4/getdomainname.m4
@@ -1,5 +1,5 @@
 # getdomainname.m4
-# serial 14
+# serial 15
 dnl Copyright (C) 2002-2003, 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -45,8 +45,7 @@ AC_DEFUN([gl_FUNC_GETDOMAINNAME],
 
   dnl What about the declaration?
   dnl - It's  int getdomainname(char *, size_t)  on glibc, NetBSD, OpenBSD.
-  dnl - It's  int getdomainname(char *, int)  on Mac OS X, FreeBSD, AIX, IRIX,
-  dnl   OSF/1.
+  dnl - It's  int getdomainname(char *, int)  on Mac OS X, FreeBSD, AIX, IRIX.
   AC_CHECK_DECLS([getdomainname], , ,
     [[#include <sys/types.h>
       #ifdef HAVE_SYS_SOCKET_H
diff --git a/m4/getopt.m4 b/m4/getopt.m4
index cb344c15d1..c459265c65 100644
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -1,5 +1,5 @@
 # getopt.m4
-# serial 50
+# serial 51
 dnl Copyright (C) 2002-2006, 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -88,8 +88,8 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
         dnl Merging these three different test programs into a single one
         dnl would require a reset mechanism. On BSD systems, it can be done
         dnl through 'optreset'; on some others (glibc), it can be done by
-        dnl setting 'optind' to 0; on others again (HP-UX, IRIX, OSF/1,
-        dnl Solaris 9, musl libc), there is no such mechanism.
+        dnl setting 'optind' to 0; on others again (HP-UX, IRIX, Solaris 9,
+        dnl musl libc), there is no such mechanism.
         if test $cross_compiling = no; then
           dnl Sanity check. Succeeds everywhere (except on MSVC,
           dnl which lacks <unistd.h> and getopt() entirely).
@@ -239,7 +239,7 @@ dnl is ambiguous with environment values that contain newlines.
 
              /* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw,
                 and fails on Mac OS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5,
-                OSF/1 5.1, Solaris 10.  */
+                Solaris 10.  */
              {
                static char conftest[] = "conftest";
                static char plus[] = "-+";
@@ -250,7 +250,7 @@ dnl is ambiguous with environment values that contain newlines.
              }
              /* This code succeeds on glibc 2.8, mingw,
                 and fails on Mac OS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11,
-                IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x.  */
+                IRIX 6.5, Solaris 10, Cygwin 1.5.x.  */
              {
                static char program[] = "program";
                static char p[] = "-p";
diff --git a/m4/hypot.m4 b/m4/hypot.m4
index 0765d435c6..3b0fbcdeaa 100644
--- a/m4/hypot.m4
+++ b/m4/hypot.m4
@@ -1,5 +1,5 @@
 # hypot.m4
-# serial 12
+# serial 13
 dnl Copyright (C) 2012-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ int main (int argc, char *argv[])
   double (* volatile my_hypot) (double, double) = argc ? hypot : dummy;
   double f;
   /* Test hypot(NaN,Infinity).
-     This test fails on OSF/1 5.1 and native Windows.  */
+     This test fails on native Windows.  */
   f = my_hypot (zero / zero, one / zero);
   if (!numeric_equal (f, f))
     return 1;
diff --git a/m4/hypotf.m4 b/m4/hypotf.m4
index e1c0da9137..6665c6815f 100644
--- a/m4/hypotf.m4
+++ b/m4/hypotf.m4
@@ -1,5 +1,5 @@
 # hypotf.m4
-# serial 13
+# serial 14
 dnl Copyright (C) 2012-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -63,7 +63,7 @@ int main (int argc, char *argv[])
   float (* volatile my_hypotf) (float, float) = argc ? hypotf : dummy;
   float f;
   /* Test hypotf(NaN,Infinity).
-     This test fails on OSF/1 5.1 and native Windows.  */
+     This test fails on native Windows.  */
   f = my_hypotf (zero / zero, one / zero);
   if (!numeric_equal (f, f))
     return 1;
diff --git a/m4/hypotl.m4 b/m4/hypotl.m4
index 6869a8462e..9d44d236df 100644
--- a/m4/hypotl.m4
+++ b/m4/hypotl.m4
@@ -1,5 +1,5 @@
 # hypotl.m4
-# serial 15
+# serial 16
 dnl Copyright (C) 2012-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -63,7 +63,7 @@ int main (int argc, char *argv[])
   long double (* volatile my_hypotl) (long double, long double) = argc ? hypotl : dummy;
   long double f;
   /* Test hypotl(NaN,Infinity).
-     This test fails on OSF/1 5.1 and native Windows.  */
+     This test fails on native Windows.  */
   f = my_hypotl (zero / zero, one / zero);
   if (!numeric_equal (f, f))
     return 1;
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 915c45ad15..62530721e9 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,5 +1,5 @@
 # iconv.m4
-# serial 30
+# serial 31
 dnl Copyright (C) 2000-2002, 2007-2014, 2016-2025 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -28,8 +28,8 @@ AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
 
 AC_DEFUN([AM_ICONV_LINK],
 [
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
+  dnl Some systems have iconv in libc, some have it in libiconv (those
+  dnl with the standalone portable GNU libiconv installed).
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
 
   dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
@@ -209,7 +209,7 @@ AC_DEFUN([AM_ICONV_LINK],
   {
     /* Try standardized names.  */
     iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
-    /* Try IRIX, OSF/1 names.  */
+    /* Try IRIX names.  */
     iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
     /* Try AIX names.  */
     iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
diff --git a/m4/iconv_open-utf.m4 b/m4/iconv_open-utf.m4
index a9004829eb..7f43129022 100644
--- a/m4/iconv_open-utf.m4
+++ b/m4/iconv_open-utf.m4
@@ -1,5 +1,5 @@
 # iconv_open-utf.m4
-# serial 6
+# serial 7
 dnl Copyright (C) 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -214,8 +214,6 @@ int main ()
           [gl_cv_func_iconv_supports_utf=no],
           [
            dnl We know that GNU libiconv, GNU libc, musl libc, and Solaris >= 9 do.
-           dnl OSF/1 5.1 has these encodings, but inserts a BOM in the "to"
-           dnl direction.
            gl_cv_func_iconv_supports_utf="$gl_cross_guess_normal"
            if test $gl_func_iconv_gnu = yes; then
              gl_cv_func_iconv_supports_utf="guessing yes"
diff --git a/m4/imaxabs.m4 b/m4/imaxabs.m4
index 12317759cb..577e75b4d3 100644
--- a/m4/imaxabs.m4
+++ b/m4/imaxabs.m4
@@ -1,5 +1,5 @@
 # imaxabs.m4
-# serial 6
+# serial 7
 dnl Copyright (C) 2006, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,7 +10,6 @@ AC_DEFUN([gl_FUNC_IMAXABS],
 [
   AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
 
-  dnl On OSF/1 5.1 with cc, this function is declared but not defined.
   gl_CHECK_FUNCS_ANDROID([imaxabs], [[#include <inttypes.h>]])
   if test $ac_cv_func_imaxabs = no; then
     HAVE_IMAXABS=0
diff --git a/m4/imaxdiv.m4 b/m4/imaxdiv.m4
index e3203d8c87..43b640e5f0 100644
--- a/m4/imaxdiv.m4
+++ b/m4/imaxdiv.m4
@@ -1,5 +1,5 @@
 # imaxdiv.m4
-# serial 7
+# serial 8
 dnl Copyright (C) 2006, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,7 +10,6 @@ AC_DEFUN([gl_FUNC_IMAXDIV],
 [
   AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
 
-  dnl On OSF/1 5.1 with cc, this function is declared but not defined.
   gl_CHECK_FUNCS_ANDROID([imaxdiv], [[#include <inttypes.h>]])
   if test $ac_cv_func_imaxdiv = no; then
     HAVE_IMAXDIV=0
diff --git a/m4/largefile.m4 b/m4/largefile.m4
index b24f657dec..1f2bc2ebb6 100644
--- a/m4/largefile.m4
+++ b/m4/largefile.m4
@@ -1,5 +1,5 @@
 # largefile.m4
-# serial 2
+# serial 3
 dnl Copyright 1992-1996, 1998-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -356,7 +356,7 @@ AC_DEFUN([gl_LARGEFILE],
       dnl Nothing to do on gnulib's side.
       dnl A 64-bit off_t is
       dnl   - already the default on Mac OS X, FreeBSD, NetBSD, OpenBSD, IRIX,
-      dnl     OSF/1, Cygwin,
+      dnl     Cygwin,
       dnl   - enabled by _FILE_OFFSET_BITS=64 (ensured by AC_SYS_LARGEFILE) on
       dnl     glibc, HP-UX, Solaris,
       dnl   - enabled by _LARGE_FILES=1 (ensured by AC_SYS_LARGEFILE) on AIX,
diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
index 3d4304e584..45ac676f22 100644
--- a/m4/link-follow.m4
+++ b/m4/link-follow.m4
@@ -1,5 +1,5 @@
 # link-follow.m4
-# serial 21
+# serial 22
 dnl Copyright (C) 1999-2001, 2004-2006, 2009-2025 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -87,7 +87,7 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK],
            [gl_cv_func_link_follows_symlink=yes], dnl Followed link/compile failed
            [dnl We're cross compiling.
             dnl The past results are "yes" on Mac OS X, FreeBSD, NetBSD,
-            dnl OpenBSD, Minix, AIX, HP-UX, OSF/1, and "no" on Linux, Cygwin.
+            dnl OpenBSD, Minix, AIX, HP-UX, and "no" on Linux, Cygwin.
             case "$host_os" in
                                   # On glibc/Linux we know the result.
               linux*-gnu* | gnu*) gl_cv_func_link_follows_symlink="guessing no" ;;
diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4
index f504d5b522..31c3bf3355 100644
--- a/m4/locale-fr.m4
+++ b/m4/locale-fr.m4
@@ -1,5 +1,5 @@
 # locale-fr.m4
-# serial 24
+# serial 25
 dnl Copyright (C) 2003, 2005-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -112,7 +112,7 @@ int main () {
             if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
               gt_cv_locale_fr=fr_FR.ISO-8859-1
             else
-              # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
+              # Test for the AIX, FreeBSD, NetBSD, OpenBSD locale name.
               if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
                 gt_cv_locale_fr=fr_FR.ISO8859-1
               else
diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4
index 1c813b8972..0c579f2a87 100644
--- a/m4/locale-ja.m4
+++ b/m4/locale-ja.m4
@@ -1,5 +1,5 @@
 # locale-ja.m4
-# serial 19
+# serial 20
 dnl Copyright (C) 2003, 2005-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -112,7 +112,7 @@ int main ()
             if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
               gt_cv_locale_ja=ja_JP.EUC-JP
             else
-              # Test for the HP-UX, OSF/1, NetBSD locale name.
+              # Test for the HP-UX, NetBSD locale name.
               if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
                 gt_cv_locale_ja=ja_JP.eucJP
               else
diff --git a/m4/locale_h.m4 b/m4/locale_h.m4
index e1afbc16da..3c768b5c53 100644
--- a/m4/locale_h.m4
+++ b/m4/locale_h.m4
@@ -1,5 +1,5 @@
 # locale_h.m4
-# serial 37
+# serial 38
 dnl Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -63,7 +63,7 @@ AC_DEFUN_ONCE([gl_LOCALE_H],
 
   dnl Check whether 'struct lconv' is complete.
   dnl Bionic libc's 'struct lconv' is just a dummy.
-  dnl On OpenBSD 4.9, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 9, Cygwin 1.5.x,
+  dnl On OpenBSD 4.9, HP-UX 11, IRIX 6.5, Solaris 9, Cygwin 1.5.x,
   dnl mingw, MSVC 9, it lacks the int_p_* and int_n_* members.
   AC_CACHE_CHECK([whether struct lconv is properly defined],
     [gl_cv_sys_struct_lconv_ok],
diff --git a/m4/lock.m4 b/m4/lock.m4
index b1d3f435d8..d085f44256 100644
--- a/m4/lock.m4
+++ b/m4/lock.m4
@@ -1,5 +1,5 @@
 # lock.m4
-# serial 14
+# serial 15
 dnl Copyright (C) 2005-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -12,8 +12,8 @@ AC_DEFUN([gl_LOCK],
 [
   AC_REQUIRE([gl_THREADLIB])
   if test "$gl_threads_api" = posix; then
-    # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
-    # pthread_rwlock_* functions.
+    # Mac OS X 10.1 lacks the pthread_rwlock_t type and the pthread_rwlock_*
+    # functions.
     has_rwlock=false
     AC_CHECK_TYPE([pthread_rwlock_t],
       [has_rwlock=true
diff --git a/m4/log10l.m4 b/m4/log10l.m4
index af7054a28d..8242d984e5 100644
--- a/m4/log10l.m4
+++ b/m4/log10l.m4
@@ -1,5 +1,5 @@
 # log10l.m4
-# serial 15
+# serial 16
 dnl Copyright (C) 2011-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -56,7 +56,6 @@ AC_DEFUN([gl_FUNC_LOG10L],
 ])
 
 dnl Test whether log10l() works.
-dnl On OSF/1 5.1, log10l(-0.0L) is NaN.
 dnl On IRIX 6.5, log10l(-0.0L) is an unnormalized negative infinity
 dnl 0xFFF00000000000007FF0000000000000, should be
 dnl 0xFFF00000000000000000000000000000.
@@ -127,7 +126,7 @@ int main (int argc, char *argv[])
   /* Dummy call, to trigger the AIX 5.1 bug.  */
   gx = 0.6L;
   gy = log10l (gx);
-  /* This test fails on AIX 5.1, IRIX 6.5, OSF/1 5.1.  */
+  /* This test fails on AIX 5.1, IRIX 6.5.  */
   {
     gx = -0.0L;
     gy = log10l (gx);
diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4
index 9121fdb2be..b7ea1cbbde 100644
--- a/m4/mkstemp.m4
+++ b/m4/mkstemp.m4
@@ -1,5 +1,5 @@
 # mkstemp.m4
-# serial 30
+# serial 31
 dnl Copyright (C) 2001, 2003-2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,8 +9,6 @@ dnl This file is offered as-is, without any warranty.
 # On some hosts (e.g., HP-UX 10.20, SunOS 4.1.4, Solaris 2.5.1), mkstemp has a
 # silly limit that it can create no more than 26 files from a given template.
 # Other systems lack mkstemp altogether.
-# On OSF1/Tru64 V4.0F, the system-provided mkstemp function can create
-# only 32 files per process.
 # On some hosts, mkstemp creates files with mode 0666, which is a security
 # problem and a violation of POSIX 2008.
 # On systems like the above, arrange to use the replacement function.
diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4
index 3f7a66561b..aee4c2106f 100644
--- a/m4/mmap-anon.m4
+++ b/m4/mmap-anon.m4
@@ -1,5 +1,5 @@
 # mmap-anon.m4
-# serial 12
+# serial 13
 dnl Copyright (C) 2005, 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -8,8 +8,8 @@ dnl This file is offered as-is, without any warranty.
 
 # Detect how mmap can be used to create anonymous (not file-backed) memory
 # mappings.
-# - On Linux, AIX, OSF/1, Solaris, Cygwin, Interix, Haiku, both MAP_ANONYMOUS
-#   and MAP_ANON exist and have the same value.
+# - On Linux, AIX, Solaris, Cygwin, Interix, Haiku, both MAP_ANONYMOUS and
+#   MAP_ANON exist and have the same value.
 # - On HP-UX, only MAP_ANONYMOUS exists.
 # - On Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, only MAP_ANON exists.
 # - On IRIX, neither exists, and a file descriptor opened to /dev/zero must be
diff --git a/m4/modf.m4 b/m4/modf.m4
index ee7fd69558..9c1b1d716f 100644
--- a/m4/modf.m4
+++ b/m4/modf.m4
@@ -1,5 +1,5 @@
 # modf.m4
-# serial 13
+# serial 14
 dnl Copyright (C) 2011-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -53,7 +53,7 @@ int main (int argc, char *argv[])
   if (numeric_equal (f, f))
     result |= 1;
   /* Test modf(-Inf,...).
-     This test fails on FreeBSD 6.4, OpenBSD 6.7, IRIX 6.5, OSF/1 5.1.  */
+     This test fails on FreeBSD 6.4, OpenBSD 6.7, IRIX 6.5.  */
   f = my_modf (minus_one / zero, &i);
   if (!(f == 0.0) || (signbitd (minus_zerod) && !signbitd (f)))
     result |= 2;
diff --git a/m4/modff.m4 b/m4/modff.m4
index f25db24e26..d64e309685 100644
--- a/m4/modff.m4
+++ b/m4/modff.m4
@@ -1,5 +1,5 @@
 # modff.m4
-# serial 15
+# serial 16
 dnl Copyright (C) 2011-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -61,7 +61,7 @@ int main (int argc, char *argv[])
   if (numeric_equal (f, f))
     result |= 1;
   /* Test modff(-Inf,...).
-     This test fails on IRIX 6.5, OSF/1 5.1, mingw.  */
+     This test fails on IRIX 6.5, mingw.  */
   f = my_modff (minus_one / zero, &i);
   if (!(f == 0.0f) || (signbitf (minus_zerof) && !signbitf (f)))
     result |= 2;
diff --git a/m4/modfl.m4 b/m4/modfl.m4
index ae2b83d9a5..9f5c0b0af2 100644
--- a/m4/modfl.m4
+++ b/m4/modfl.m4
@@ -1,5 +1,5 @@
 # modfl.m4
-# serial 14
+# serial 15
 dnl Copyright (C) 2011-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -99,7 +99,7 @@ int main (int argc, char *argv[])
   long double i;
   long double f;
   /* Test modfl(-Inf,...).
-     This test fails on IRIX 6.5, OSF/1 5.1, mingw.  */
+     This test fails on IRIX 6.5, mingw.  */
   f = my_modfl (minus_one / zero, &i);
   if (!(f == 0.0L) || (signbitl (minus_zerol) && !signbitl (f)))
     return 1;
diff --git a/m4/semaphore.m4 b/m4/semaphore.m4
index 6ddb21467c..1dd437a790 100644
--- a/m4/semaphore.m4
+++ b/m4/semaphore.m4
@@ -1,5 +1,5 @@
 # semaphore.m4
-# serial 2
+# serial 3
 dnl Copyright (C) 2019-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,7 @@ AC_DEFUN([gl_SEMAPHORE],
   dnl   - in libc on macOS, FreeBSD, AIX, IRIX, Solaris 11, Haiku, Cygwin,
   dnl   - in libpthread on glibc systems, OpenBSD,
   dnl   - in libpthread or librt on NetBSD,
-  dnl   - in librt on HP-UX 11, OSF/1, Solaris 10.
+  dnl   - in librt on HP-UX 11, Solaris 10.
   dnl On the platforms where -lpthread is needed, it is contained in
   dnl $LIBMULTITHREAD. Therefore, the only library we need to test for is -lrt.
   AC_CACHE_CHECK([for library needed for semaphore functions],
diff --git a/m4/socklen.m4 b/m4/socklen.m4
index a8ac25b1c3..9251dccf2e 100644
--- a/m4/socklen.m4
+++ b/m4/socklen.m4
@@ -1,5 +1,5 @@
 # socklen.m4
-# serial 11
+# serial 12
 dnl Copyright (C) 2005-2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -11,7 +11,7 @@ dnl From Albert Chin, Windows fixes from Simon Josefsson.
 dnl Check for socklen_t: historically on BSD it is an int, and in
 dnl POSIX 1g it is a type of its own, but some platforms use different
 dnl types for the argument to getsockopt, getpeername, etc.:
-dnl HP-UX 10.20, IRIX 6.5, OSF/1 4.0, Interix 3.5, BeOS.
+dnl HP-UX 10.20, IRIX 6.5, Interix 3.5, BeOS.
 dnl So we have to test to find something that will work.
 
 AC_DEFUN([gl_TYPE_SOCKLEN_T],
diff --git a/m4/strerror_r.m4 b/m4/strerror_r.m4
index ed819bfbe5..4bbb8a0fc8 100644
--- a/m4/strerror_r.m4
+++ b/m4/strerror_r.m4
@@ -1,5 +1,5 @@
 # strerror_r.m4
-# serial 28
+# serial 29
 dnl Copyright (C) 2002, 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -64,7 +64,7 @@ AC_DEFUN([gl_FUNC_STRERROR_R_WORKS],
     if test "$GL_GENERATE_ERRNO_H:$REPLACE_STRERROR_0" = false:0; then
       dnl The POSIX prototype is:  int strerror_r (int, char *, size_t);
       dnl glibc, Cygwin:           char *strerror_r (int, char *, size_t);
-      dnl AIX 5.1, OSF/1 5.1:      int strerror_r (int, char *, int);
+      dnl AIX 5.1:                 int strerror_r (int, char *, int);
       AC_CACHE_CHECK([for strerror_r with POSIX signature],
         [gl_cv_func_strerror_r_posix_signature],
         [AC_COMPILE_IFELSE(
diff --git a/m4/terminfo.m4 b/m4/terminfo.m4
index 07543a6968..27b6db4001 100644
--- a/m4/terminfo.m4
+++ b/m4/terminfo.m4
@@ -1,5 +1,5 @@
 # terminfo.m4
-# serial 7
+# serial 8
 dnl Copyright (C) 2000-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -31,8 +31,8 @@ AC_DEFUN([gl_TERMINFO_BODY],
   dnl tputs(), tgoto() in the same library as tgetent(), tgetnum(), tgetstr(),
   dnl tgetflag(), e.g. Linux (in libncurses) or Solaris (in libtermcap =
   dnl libncurses).
-  dnl Some systems have them in a different library, e.g. OSF/1 (in libcurses,
-  dnl not in libtermcap) or AIX, HP-UX (in libxcurses, not in libtermcap).
+  dnl Some systems have them in a different library, e.g. AIX, HP-UX (in
+  dnl libxcurses, not in libtermcap).
   dnl Some systems, like NetBSD or BeOS, don't have these functions at all;
   dnl they have only a libtermcap.
   dnl Some systems, like BeOS, use GNU termcap, which has tparam() instead of
diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4
index 2cc6ebb134..cb2cca979c 100644
--- a/m4/wcwidth.m4
+++ b/m4/wcwidth.m4
@@ -1,5 +1,5 @@
 # wcwidth.m4
-# serial 38
+# serial 39
 dnl Copyright (C) 2006-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -44,7 +44,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
     dnl On Mac OS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
     dnl On macOS 12.5, NetBSD 9.3, OpenBSD 5.0, MidnightBSD 1.1,
     dnl wcwidth(0x05B0) (HEBREW POINT SHEVA) returns 1.
-    dnl On macOS 12.5, NetBSD 9.3, MidnightBSD 1.1, OSF/1 5.1,
+    dnl On macOS 12.5, NetBSD 9.3, MidnightBSD 1.1,
     dnl wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
     dnl On OpenBSD 5.8, wcwidth(0xFF1A) (FULLWIDTH COLON) returns 0.
     dnl This leads to bugs in 'ls' (coreutils).
diff --git a/posix-modules b/posix-modules
index 3544e4d66e..9b534d280e 100755
--- a/posix-modules
+++ b/posix-modules
@@ -77,10 +77,10 @@ func_gnulib_dir ()
       # We use a canonicalized $pathx instead of $PATH, because empty PATH
       # elements are by definition equivalent to '.', however field splitting
       # according to IFS=: loses empty fields in many shells:
-      #   - /bin/sh on OSF/1 and Solaris loses all empty fields (at the
-      #     beginning, at the end, and in the middle),
-      #   - /bin/sh on IRIX and /bin/ksh on IRIX and OSF/1 lose empty fields
-      #     at the beginning and at the end,
+      #   - /bin/sh on Solaris loses all empty fields (at the beginning, at
+      #     the end, and in the middle),
+      #   - /bin/sh on IRIX and /bin/ksh on IRIX lose empty fields at the
+      #     beginning and at the end,
       #   - GNU bash, /bin/sh on AIX and HP-UX, and /bin/ksh on AIX, HP-UX,
       #     Solaris lose empty fields at the end.
       # The 'case' statement is an optimization, to avoid evaluating the
diff --git a/tests/havelib/README b/tests/havelib/README
index add09ad8a3..b9e5b26b27 100644
--- a/tests/havelib/README
+++ b/tests/havelib/README
@@ -48,13 +48,6 @@ Known failures:
   static library indirectly through two different dependency paths,
   libtool attempts to link together invalid sets of object files.
 
-* OSF/1 4.0: the tests
-    rpath-2bbd
-    rpath-3bbd rpath-3bbf rpath-3bbg rpath-3bbh
-  fail, because -rpath options are not cumulative:
-  The last -rpath option overrides all previous ones. One would need to
-  pass all directories, separated by colons, in a single -rpath option.
-
 * On Linux/x86_64: the tests
     rpath-2aac rpath-2abc rpath-2bac rpath-2bbc
     rpath-3aac rpath-3aaf rpath-3abc rpath-3abf
diff --git a/tests/init.sh b/tests/init.sh
index d695020545..def831af05 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -639,7 +639,7 @@ emit_diff_u_header_ ()
 }
 
 # Arrange not to let diff or cmp operate on /dev/null,
-# since on some systems (at least OSF/1 5.1), that doesn't work.
+# since on some old systems, that doesn't work.
 # When there are not two arguments, or no argument is /dev/null, return 2.
 # When one argument is /dev/null and the other is not empty,
 # cat the nonempty file to stderr and return 1.
diff --git a/tests/socket-client.h b/tests/socket-client.h
index d67b745900..41de1dcead 100644
--- a/tests/socket-client.h
+++ b/tests/socket-client.h
@@ -34,7 +34,7 @@ create_client_socket (int port)
   {
     struct sockaddr_in addr;
 
-    memset (&addr, 0, sizeof (addr)); /* needed on AIX and OSF/1 */
+    memset (&addr, 0, sizeof (addr)); /* needed on AIX */
     addr.sin_family = AF_INET;
     #if 0 /* Unoptimized */
     inet_pton (AF_INET, "127.0.0.1", &addr.sin_addr);
diff --git a/tests/socket-server.h b/tests/socket-server.h
index ab1f311721..78281f7fd2 100644
--- a/tests/socket-server.h
+++ b/tests/socket-server.h
@@ -58,7 +58,7 @@ create_server (int port, unsigned int max_backlog, int *pport)
   {
     struct sockaddr_in addr;
 
-    memset (&addr, 0, sizeof (addr)); /* needed on AIX and OSF/1 */
+    memset (&addr, 0, sizeof (addr)); /* needed on AIX */
     addr.sin_family = AF_INET;
     #if 0 /* Unoptimized */
     inet_pton (AF_INET, "127.0.0.1", &addr.sin_addr);
diff --git a/tests/test-echo.sh b/tests/test-echo.sh
index f4c62d14e7..17b87ee877 100755
--- a/tests/test-echo.sh
+++ b/tests/test-echo.sh
@@ -29,7 +29,7 @@ func_fatal_error ()
 # - in zsh, when sh-emulation is not set,
 # - in ksh (e.g. AIX /bin/sh and Solaris /usr/xpg4/bin/sh are ksh instances,
 #           and HP-UX /bin/sh and IRIX /bin/sh behave similarly),
-# - in Solaris /bin/sh and OSF/1 /bin/sh.
+# - in Solaris /bin/sh.
 # We try the following workarounds:
 # - for all: respawn using $CONFIG_SHELL if that is set and works.
 # - for bash >= 2.04: unset the shell option xpg_echo.
@@ -38,8 +38,7 @@ func_fatal_error ()
 # - for zsh: turn sh-emulation on.
 # - for ksh: alias echo to 'print -r'.
 # - for ksh: alias echo to a function that uses cat of a here document.
-# - for Solaris /bin/sh and OSF/1 /bin/sh: respawn using /bin/ksh and rely on
-#   the ksh workaround.
+# - for Solaris /bin/sh: respawn using /bin/ksh and rely on the ksh workaround.
 # - otherwise: respawn using /bin/sh and rely on the workarounds.
 # When respawning, we pass --no-reexec as first argument, so as to avoid
 # turning this script into a fork bomb in unlucky situations.
@@ -136,7 +135,7 @@ fi
 if test -z "$have_echo"; then
   unalias echo 2>/dev/null
 fi
-# For Solaris /bin/sh and OSF/1 /bin/sh: respawn using /bin/ksh.
+# For Solaris /bin/sh: respawn using /bin/ksh.
 if test -z "$have_echo" \
    && test "X$1" != "X--no-reexec" \
    && test -f /bin/ksh; then
diff --git a/tests/test-nonblocking-socket.h b/tests/test-nonblocking-socket.h
index 22f02969fb..a46a53b1e0 100644
--- a/tests/test-nonblocking-socket.h
+++ b/tests/test-nonblocking-socket.h
@@ -29,7 +29,6 @@
      AIX 7.1                         >= 200000 (depends on circumstances)
      HP-UX                           >= 114689
      IRIX                            >= 61089
-     OSF/1                           >= 122881
      Solaris 7                       >= 63000 (depends on circumstances)
      Solaris 8                       >= 49153
      Solaris 9                       >= 73729
diff --git a/tests/test-strtod.h b/tests/test-strtod.h
index 75e14b44e9..e29c9b1d83 100644
--- a/tests/test-strtod.h
+++ b/tests/test-strtod.h
@@ -72,7 +72,7 @@ test_function (double (*my_strtod) (const char *, char **))
     result = my_strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
-    ASSERT (ptr == input);              /* IRIX 6.5, OSF/1 5.1 */
+    ASSERT (ptr == input);              /* IRIX 6.5 */
     ASSERT (errno == 0 || errno == EINVAL);
   }
   {
@@ -83,7 +83,7 @@ test_function (double (*my_strtod) (const char *, char **))
     result = my_strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
-    ASSERT (ptr == input);              /* IRIX 6.5, OSF/1 5.1 */
+    ASSERT (ptr == input);              /* IRIX 6.5 */
     ASSERT (errno == 0 || errno == EINVAL);
   }
   {
@@ -284,7 +284,7 @@ test_function (double (*my_strtod) (const char *, char **))
     errno = 0;
     result = my_strtod (input, &ptr);
     ASSERT (result == 0.0);
-    ASSERT (!!signbit (result) == !!signbit (minus_zerod)); /* IRIX 6.5, OSF/1 4.0 */
+    ASSERT (!!signbit (result) == !!signbit (minus_zerod)); /* IRIX 6.5 */
     ASSERT (ptr == input + 2);
     ASSERT (errno == 0);
   }
@@ -346,7 +346,7 @@ test_function (double (*my_strtod) (const char *, char **))
     double result;
     errno = 0;
     result = my_strtod (input, &ptr);
-    ASSERT (result == 1.0);             /* HP-UX 11.11, IRIX 6.5, OSF/1 4.0 */
+    ASSERT (result == 1.0);             /* HP-UX 11.11, IRIX 6.5 */
     ASSERT (ptr == input + 1);          /* HP-UX 11.11, IRIX 6.5 */
     ASSERT (errno == 0);
   }
@@ -379,7 +379,7 @@ test_function (double (*my_strtod) (const char *, char **))
     errno = 0;
     result = my_strtod (input, &ptr);
     ASSERT (result == 0.0);
-    ASSERT (!!signbit (result) == !!signbit (minus_zerod)); /* Mac OS X 10.3, FreeBSD 6.2, IRIX 6.5, OSF/1 4.0 */
+    ASSERT (!!signbit (result) == !!signbit (minus_zerod)); /* Mac OS X 10.3, FreeBSD 6.2, IRIX 6.5 */
     ASSERT (ptr == input + 2);          /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, AIX 7.1 */
     ASSERT (errno == 0);
   }
@@ -489,7 +489,7 @@ test_function (double (*my_strtod) (const char *, char **))
     errno = 0;
     result = my_strtod (input, &ptr);
     ASSERT (result == HUGE_VAL);
-    ASSERT (ptr == input + 5);          /* OSF/1 5.1 */
+    ASSERT (ptr == input + 5);
     ASSERT (errno == ERANGE);
   }
   {
@@ -499,7 +499,7 @@ test_function (double (*my_strtod) (const char *, char **))
     errno = 0;
     result = my_strtod (input, &ptr);
     ASSERT (result == HUGE_VAL);
-    ASSERT (ptr == input + 9);          /* OSF/1 5.1 */
+    ASSERT (ptr == input + 9);
     ASSERT (errno == ERANGE);
   }
   {
@@ -580,7 +580,7 @@ test_function (double (*my_strtod) (const char *, char **))
     double result;
     errno = 0;
     result = my_strtod (input, &ptr);
-    ASSERT (result == 1.0);             /* HP-UX 11.11, IRIX 6.5, OSF/1 4.0 */
+    ASSERT (result == 1.0);             /* HP-UX 11.11, IRIX 6.5 */
     ASSERT (ptr == input + 1);          /* HP-UX 11.11, IRIX 6.5 */
     ASSERT (errno == 0);
   }
@@ -590,8 +590,8 @@ test_function (double (*my_strtod) (const char *, char **))
     double result;
     errno = 0;
     result = my_strtod (input, &ptr);
-    ASSERT (result == 1.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 1.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
 
@@ -602,9 +602,9 @@ test_function (double (*my_strtod) (const char *, char **))
     double result;
     errno = 0;
     result = my_strtod (input, &ptr);
-    ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (ptr == input + 3);          /* OpenBSD 4.0, HP-UX 11.00, IRIX 6.5, OSF/1 5.1, Solaris 9, mingw */
-    ASSERT (errno == 0);                /* HP-UX 11.11, OSF/1 4.0 */
+    ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, IRIX 6.5, mingw */
+    ASSERT (ptr == input + 3);          /* OpenBSD 4.0, HP-UX 11.00, IRIX 6.5, Solaris 9, mingw */
+    ASSERT (errno == 0);                /* HP-UX 11.11 */
   }
   {
     const char input[] = "-InF";
@@ -612,9 +612,9 @@ test_function (double (*my_strtod) (const char *, char **))
     double result;
     errno = 0;
     result = my_strtod (input, &ptr);
-    ASSERT (result == -HUGE_VAL);       /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (ptr == input + 4);          /* OpenBSD 4.0, HP-UX 11.00, IRIX 6.5, OSF/1 4.0, Solaris 9, mingw */
-    ASSERT (errno == 0);                /* HP-UX 11.11, OSF/1 4.0 */
+    ASSERT (result == -HUGE_VAL);       /* OpenBSD 4.0, IRIX 6.5, mingw */
+    ASSERT (ptr == input + 4);          /* OpenBSD 4.0, HP-UX 11.00, IRIX 6.5, Solaris 9, mingw */
+    ASSERT (errno == 0);                /* HP-UX 11.11 */
   }
   {
     const char input[] = "infinite";
@@ -622,9 +622,9 @@ test_function (double (*my_strtod) (const char *, char **))
     double result;
     errno = 0;
     result = my_strtod (input, &ptr);
-    ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (ptr == input + 3);          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (errno == 0);                /* OSF/1 4.0 */
+    ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (ptr == input + 3);          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (errno == 0);
   }
   {
     const char input[] = "infinitY";
@@ -632,9 +632,9 @@ test_function (double (*my_strtod) (const char *, char **))
     double result;
     errno = 0;
     result = my_strtod (input, &ptr);
-    ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (ptr == input + 8);          /* OpenBSD 4.0, HP-UX 11.00, IRIX 6.5, OSF/1 5.1, Solaris 9, mingw */
-    ASSERT (errno == 0);                /* HP-UX 11.11, OSF/1 4.0 */
+    ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, IRIX 6.5, mingw */
+    ASSERT (ptr == input + 8);          /* OpenBSD 4.0, HP-UX 11.00, IRIX 6.5, Solaris 9, mingw */
+    ASSERT (errno == 0);                /* HP-UX 11.11 */
   }
   {
     const char input[] = "infinitY.";
@@ -642,9 +642,9 @@ test_function (double (*my_strtod) (const char *, char **))
     double result;
     errno = 0;
     result = my_strtod (input, &ptr);
-    ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (ptr == input + 8);          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (errno == 0);                /* OSF/1 4.0 */
+    ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (ptr == input + 8);          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (errno == 0);
   }
 
   /* NaN.  Some processors set the sign bit of the default NaN, so all
@@ -659,15 +659,15 @@ test_function (double (*my_strtod) (const char *, char **))
     result1 = my_strtod (input, &ptr1);
     result2 = my_strtod (input + 1, &ptr2);
 #if 1 /* All known CPUs support NaNs.  */
-    ASSERT (isnand (result1));          /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (isnand (result2));          /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (isnand (result1));          /* OpenBSD 4.0, IRIX 6.5, mingw */
+    ASSERT (isnand (result2));          /* OpenBSD 4.0, IRIX 6.5, mingw */
 # if 0
     /* Sign bits of NaN is a portability sticking point, not worth
        worrying about.  */
-    ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX 6.5, mingw */
 # endif
-    ASSERT (ptr1 == input + 4);         /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, Solaris 2.5.1, mingw */
-    ASSERT (ptr2 == input + 4);         /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, Solaris 2.5.1, mingw */
+    ASSERT (ptr1 == input + 4);         /* OpenBSD 4.0, IRIX 6.5, Solaris 2.5.1, mingw */
+    ASSERT (ptr2 == input + 4);         /* OpenBSD 4.0, IRIX 6.5, Solaris 2.5.1, mingw */
     ASSERT (errno == 0);                /* HP-UX 11.11 */
 #else
     ASSERT (result1 == 0.0);
@@ -689,11 +689,11 @@ test_function (double (*my_strtod) (const char *, char **))
     result1 = my_strtod (input, &ptr1);
     result2 = my_strtod (input + 1, &ptr2);
 #if 1 /* All known CPUs support NaNs.  */
-    ASSERT (isnand (result1));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (isnand (result2));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (isnand (result1));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (isnand (result2));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
     ASSERT (!!signbit (result1) == !!signbit (result2));
-    ASSERT (ptr1 == input + 4);         /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 2.5.1, mingw */
-    ASSERT (ptr2 == input + 4);         /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 2.5.1, mingw */
+    ASSERT (ptr1 == input + 4);         /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, Solaris 2.5.1, mingw */
+    ASSERT (ptr2 == input + 4);         /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, Solaris 2.5.1, mingw */
     ASSERT (errno == 0);
 #else
     ASSERT (result1 == 0.0);
@@ -715,15 +715,15 @@ test_function (double (*my_strtod) (const char *, char **))
     result1 = my_strtod (input, &ptr1);
     result2 = my_strtod (input + 1, &ptr2);
 #if 1 /* All known CPUs support NaNs.  */
-    ASSERT (isnand (result1));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (isnand (result2));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (isnand (result1));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (isnand (result2));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
 # if 0
     /* Sign bits of NaN is a portability sticking point, not worth
        worrying about.  */
-    ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX 6.5, mingw */
 # endif
-    ASSERT (ptr1 == input + 6);         /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (ptr2 == input + 6);         /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (ptr1 == input + 6);         /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (ptr2 == input + 6);         /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, mingw */
     ASSERT (errno == 0);
 #else
     ASSERT (result1 == 0.0);
@@ -742,8 +742,8 @@ test_function (double (*my_strtod) (const char *, char **))
     errno = 0;
     result = my_strtod (input, &ptr);
 #if 1 /* All known CPUs support NaNs.  */
-    ASSERT (isnand (result));           /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (ptr == input + 6);          /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (isnand (result));           /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (ptr == input + 6);          /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, mingw */
     ASSERT (errno == 0);
 #else
     ASSERT (result == 0.0);
@@ -765,15 +765,15 @@ test_function (double (*my_strtod) (const char *, char **))
     result1 = my_strtod (input, &ptr1);
     result2 = my_strtod (input + 1, &ptr2);
 #if 1 /* All known CPUs support NaNs.  */
-    ASSERT (isnand (result1));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (isnand (result2));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (isnand (result1));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (isnand (result2));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
 # if 0
     /* Sign bits of NaN is a portability sticking point, not worth
        worrying about.  */
-    ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX 6.5, mingw */
 # endif
-    ASSERT (ptr1 == input + 7);         /* glibc-2.3.6, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (ptr2 == input + 7);         /* glibc-2.3.6, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (ptr1 == input + 7);         /* glibc-2.3.6, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (ptr2 == input + 7);         /* glibc-2.3.6, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, mingw */
     ASSERT (errno == 0);
 #else
     ASSERT (result1 == 0.0);
@@ -793,8 +793,8 @@ test_function (double (*my_strtod) (const char *, char **))
     double result;
     errno = 0;
     result = my_strtod (input, &ptr);
-    ASSERT (result == 10.0);            /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 10.0);            /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
@@ -803,8 +803,8 @@ test_function (double (*my_strtod) (const char *, char **))
     double result;
     errno = 0;
     result = my_strtod (input, &ptr);
-    ASSERT (result == 10.0);            /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 10.0);            /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
@@ -813,8 +813,8 @@ test_function (double (*my_strtod) (const char *, char **))
     double result;
     errno = 0;
     result = my_strtod (input, &ptr);
-    ASSERT (result == 1.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 1.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
@@ -823,8 +823,8 @@ test_function (double (*my_strtod) (const char *, char **))
     double result;
     errno = 0;
     result = my_strtod (input, &ptr);
-    ASSERT (result == 1.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 1.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
@@ -833,8 +833,8 @@ test_function (double (*my_strtod) (const char *, char **))
     double result;
     errno = 0;
     result = my_strtod (input, &ptr);
-    ASSERT (result == 1.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 1.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
@@ -843,8 +843,8 @@ test_function (double (*my_strtod) (const char *, char **))
     double result;
     errno = 0;
     result = my_strtod (input, &ptr);
-    ASSERT (result == 2.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 6);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 2.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 6);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
@@ -853,8 +853,8 @@ test_function (double (*my_strtod) (const char *, char **))
     double result;
     errno = 0;
     result = my_strtod (input, &ptr);
-    ASSERT (result == 2.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 6);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 2.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 6);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
@@ -863,8 +863,8 @@ test_function (double (*my_strtod) (const char *, char **))
     double result;
     errno = 0;
     result = my_strtod (input, &ptr);
-    ASSERT (result == 2.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 6);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 2.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 6);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
@@ -873,8 +873,8 @@ test_function (double (*my_strtod) (const char *, char **))
     double result;
     errno = 0;
     result = my_strtod (input, &ptr);
-    ASSERT (result == 1.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 1.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
 
@@ -939,9 +939,9 @@ test_function (double (*my_strtod) (const char *, char **))
         input[m] = '\0';
         errno = 0;
         result = my_strtod (input, &ptr);
-        ASSERT (result == 1.0);         /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
-        ASSERT (ptr == input + m);      /* OSF/1 5.1 */
-        ASSERT (errno == 0);            /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
+        ASSERT (result == 1.0);         /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, mingw */
+        ASSERT (ptr == input + m);
+        ASSERT (errno == 0);            /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, mingw */
       }
     free (input);
   }
@@ -965,9 +965,9 @@ test_function (double (*my_strtod) (const char *, char **))
         input[m] = '\0';
         errno = 0;
         result = my_strtod (input, &ptr);
-        ASSERT (result == 1.0);         /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
+        ASSERT (result == 1.0);         /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, mingw */
         ASSERT (ptr == input + m);
-        ASSERT (errno == 0);            /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
+        ASSERT (errno == 0);            /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, mingw */
       }
     free (input);
   }
@@ -988,7 +988,7 @@ test_function (double (*my_strtod) (const char *, char **))
         errno = 0;
         result = my_strtod (input, &ptr);
         ASSERT (result == 0.0);
-        ASSERT (!!signbit (result) == !!signbit (minus_zerod)); /* IRIX 6.5, OSF/1 4.0 */
+        ASSERT (!!signbit (result) == !!signbit (minus_zerod)); /* IRIX 6.5 */
         ASSERT (ptr == input + m);
         ASSERT (errno == 0);
       }
diff --git a/tests/test-strtof.h b/tests/test-strtof.h
index d137c4d514..03ddb7c059 100644
--- a/tests/test-strtof.h
+++ b/tests/test-strtof.h
@@ -72,7 +72,7 @@ test_function (float (*my_strtof) (const char *, char **))
     result = my_strtof (input, &ptr);
     ASSERT (result == 0.0f);
     ASSERT (!signbit (result));
-    ASSERT (ptr == input);              /* IRIX 6.5, OSF/1 5.1 */
+    ASSERT (ptr == input);              /* IRIX 6.5 */
     ASSERT (errno == 0 || errno == EINVAL);
   }
   {
@@ -83,7 +83,7 @@ test_function (float (*my_strtof) (const char *, char **))
     result = my_strtof (input, &ptr);
     ASSERT (result == 0.0f);
     ASSERT (!signbit (result));
-    ASSERT (ptr == input);              /* IRIX 6.5, OSF/1 5.1 */
+    ASSERT (ptr == input);              /* IRIX 6.5 */
     ASSERT (errno == 0 || errno == EINVAL);
   }
   {
@@ -284,7 +284,7 @@ test_function (float (*my_strtof) (const char *, char **))
     errno = 0;
     result = my_strtof (input, &ptr);
     ASSERT (result == 0.0f);
-    ASSERT (!!signbit (result) == !!signbit (minus_zerof)); /* IRIX 6.5, OSF/1 4.0 */
+    ASSERT (!!signbit (result) == !!signbit (minus_zerof)); /* IRIX 6.5 */
     ASSERT (ptr == input + 2);
     ASSERT (errno == 0);
   }
@@ -346,7 +346,7 @@ test_function (float (*my_strtof) (const char *, char **))
     float result;
     errno = 0;
     result = my_strtof (input, &ptr);
-    ASSERT (result == 1.0f);            /* HP-UX 11.11, IRIX 6.5, OSF/1 4.0 */
+    ASSERT (result == 1.0f);            /* HP-UX 11.11, IRIX 6.5 */
     ASSERT (ptr == input + 1);          /* HP-UX 11.11, IRIX 6.5 */
     ASSERT (errno == 0);
   }
@@ -379,7 +379,7 @@ test_function (float (*my_strtof) (const char *, char **))
     errno = 0;
     result = my_strtof (input, &ptr);
     ASSERT (result == 0.0f);
-    ASSERT (!!signbit (result) == !!signbit (minus_zerof)); /* Mac OS X 10.3, FreeBSD 6.2, IRIX 6.5, OSF/1 4.0 */
+    ASSERT (!!signbit (result) == !!signbit (minus_zerof)); /* Mac OS X 10.3, FreeBSD 6.2, IRIX 6.5 */
     ASSERT (ptr == input + 2);          /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, AIX 7.1 */
     ASSERT (errno == 0);
   }
@@ -489,7 +489,7 @@ test_function (float (*my_strtof) (const char *, char **))
     errno = 0;
     result = my_strtof (input, &ptr);
     ASSERT (result == HUGE_VAL);
-    ASSERT (ptr == input + 4);          /* OSF/1 5.1 */
+    ASSERT (ptr == input + 4);
     ASSERT (errno == ERANGE);
   }
   {
@@ -499,7 +499,7 @@ test_function (float (*my_strtof) (const char *, char **))
     errno = 0;
     result = my_strtof (input, &ptr);
     ASSERT (result == HUGE_VAL);
-    ASSERT (ptr == input + 9);          /* OSF/1 5.1 */
+    ASSERT (ptr == input + 9);
     ASSERT (errno == ERANGE);
   }
   {
@@ -580,7 +580,7 @@ test_function (float (*my_strtof) (const char *, char **))
     float result;
     errno = 0;
     result = my_strtof (input, &ptr);
-    ASSERT (result == 1.0f);            /* HP-UX 11.11, IRIX 6.5, OSF/1 4.0 */
+    ASSERT (result == 1.0f);            /* HP-UX 11.11, IRIX 6.5 */
     ASSERT (ptr == input + 1);          /* HP-UX 11.11, IRIX 6.5 */
     ASSERT (errno == 0);
   }
@@ -590,8 +590,8 @@ test_function (float (*my_strtof) (const char *, char **))
     float result;
     errno = 0;
     result = my_strtof (input, &ptr);
-    ASSERT (result == 1.0f);            /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 1.0f);            /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
 
@@ -602,9 +602,9 @@ test_function (float (*my_strtof) (const char *, char **))
     float result;
     errno = 0;
     result = my_strtof (input, &ptr);
-    ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (ptr == input + 3);          /* OpenBSD 4.0, HP-UX 11.00, IRIX 6.5, OSF/1 5.1, Solaris 9, mingw */
-    ASSERT (errno == 0);                /* HP-UX 11.11, OSF/1 4.0 */
+    ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, IRIX 6.5, mingw */
+    ASSERT (ptr == input + 3);          /* OpenBSD 4.0, HP-UX 11.00, IRIX 6.5, Solaris 9, mingw */
+    ASSERT (errno == 0);                /* HP-UX 11.11 */
   }
   {
     const char input[] = "-InF";
@@ -612,9 +612,9 @@ test_function (float (*my_strtof) (const char *, char **))
     float result;
     errno = 0;
     result = my_strtof (input, &ptr);
-    ASSERT (result == -HUGE_VAL);       /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (ptr == input + 4);          /* OpenBSD 4.0, HP-UX 11.00, IRIX 6.5, OSF/1 4.0, Solaris 9, mingw */
-    ASSERT (errno == 0);                /* HP-UX 11.11, OSF/1 4.0 */
+    ASSERT (result == -HUGE_VAL);       /* OpenBSD 4.0, IRIX 6.5, mingw */
+    ASSERT (ptr == input + 4);          /* OpenBSD 4.0, HP-UX 11.00, IRIX 6.5, Solaris 9, mingw */
+    ASSERT (errno == 0);                /* HP-UX 11.11 */
   }
   {
     const char input[] = "infinite";
@@ -622,9 +622,9 @@ test_function (float (*my_strtof) (const char *, char **))
     float result;
     errno = 0;
     result = my_strtof (input, &ptr);
-    ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (ptr == input + 3);          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (errno == 0);                /* OSF/1 4.0 */
+    ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (ptr == input + 3);          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (errno == 0);
   }
   {
     const char input[] = "infinitY";
@@ -632,9 +632,9 @@ test_function (float (*my_strtof) (const char *, char **))
     float result;
     errno = 0;
     result = my_strtof (input, &ptr);
-    ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (ptr == input + 8);          /* OpenBSD 4.0, HP-UX 11.00, IRIX 6.5, OSF/1 5.1, Solaris 9, mingw */
-    ASSERT (errno == 0);                /* HP-UX 11.11, OSF/1 4.0 */
+    ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, IRIX 6.5, mingw */
+    ASSERT (ptr == input + 8);          /* OpenBSD 4.0, HP-UX 11.00, IRIX 6.5, Solaris 9, mingw */
+    ASSERT (errno == 0);                /* HP-UX 11.11 */
   }
   {
     const char input[] = "infinitY.";
@@ -642,9 +642,9 @@ test_function (float (*my_strtof) (const char *, char **))
     float result;
     errno = 0;
     result = my_strtof (input, &ptr);
-    ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (ptr == input + 8);          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (errno == 0);                /* OSF/1 4.0 */
+    ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (ptr == input + 8);          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (errno == 0);
   }
 
   /* NaN.  Some processors set the sign bit of the default NaN, so all
@@ -659,15 +659,15 @@ test_function (float (*my_strtof) (const char *, char **))
     result1 = my_strtof (input, &ptr1);
     result2 = my_strtof (input + 1, &ptr2);
 #if 1 /* All known CPUs support NaNs.  */
-    ASSERT (isnanf (result1));          /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (isnanf (result2));          /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (isnanf (result1));          /* OpenBSD 4.0, IRIX 6.5, mingw */
+    ASSERT (isnanf (result2));          /* OpenBSD 4.0, IRIX 6.5, mingw */
 # if 0
     /* Sign bits of NaN is a portability sticking point, not worth
        worrying about.  */
-    ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX 6.5, mingw */
 # endif
-    ASSERT (ptr1 == input + 4);         /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, Solaris 2.5.1, mingw */
-    ASSERT (ptr2 == input + 4);         /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, Solaris 2.5.1, mingw */
+    ASSERT (ptr1 == input + 4);         /* OpenBSD 4.0, IRIX 6.5, Solaris 2.5.1, mingw */
+    ASSERT (ptr2 == input + 4);         /* OpenBSD 4.0, IRIX 6.5, Solaris 2.5.1, mingw */
     ASSERT (errno == 0);                /* HP-UX 11.11 */
 #else
     ASSERT (result1 == 0.0f);
@@ -689,11 +689,11 @@ test_function (float (*my_strtof) (const char *, char **))
     result1 = my_strtof (input, &ptr1);
     result2 = my_strtof (input + 1, &ptr2);
 #if 1 /* All known CPUs support NaNs.  */
-    ASSERT (isnanf (result1));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (isnanf (result2));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (isnanf (result1));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (isnanf (result2));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
     ASSERT (!!signbit (result1) == !!signbit (result2));
-    ASSERT (ptr1 == input + 4);         /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 2.5.1, mingw */
-    ASSERT (ptr2 == input + 4);         /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 2.5.1, mingw */
+    ASSERT (ptr1 == input + 4);         /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, Solaris 2.5.1, mingw */
+    ASSERT (ptr2 == input + 4);         /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, Solaris 2.5.1, mingw */
     ASSERT (errno == 0);
 #else
     ASSERT (result1 == 0.0f);
@@ -715,15 +715,15 @@ test_function (float (*my_strtof) (const char *, char **))
     result1 = my_strtof (input, &ptr1);
     result2 = my_strtof (input + 1, &ptr2);
 #if 1 /* All known CPUs support NaNs.  */
-    ASSERT (isnanf (result1));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (isnanf (result2));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (isnanf (result1));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (isnanf (result2));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
 # if 0
     /* Sign bits of NaN is a portability sticking point, not worth
        worrying about.  */
-    ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX 6.5, mingw */
 # endif
-    ASSERT (ptr1 == input + 6);         /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (ptr2 == input + 6);         /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (ptr1 == input + 6);         /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (ptr2 == input + 6);         /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, mingw */
     ASSERT (errno == 0);
 #else
     ASSERT (result1 == 0.0f);
@@ -742,8 +742,8 @@ test_function (float (*my_strtof) (const char *, char **))
     errno = 0;
     result = my_strtof (input, &ptr);
 #if 1 /* All known CPUs support NaNs.  */
-    ASSERT (isnanf (result));           /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (ptr == input + 6);          /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (isnanf (result));           /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (ptr == input + 6);          /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, mingw */
     ASSERT (errno == 0);
 #else
     ASSERT (result == 0.0f);
@@ -765,15 +765,15 @@ test_function (float (*my_strtof) (const char *, char **))
     result1 = my_strtof (input, &ptr1);
     result2 = my_strtof (input + 1, &ptr2);
 #if 1 /* All known CPUs support NaNs.  */
-    ASSERT (isnanf (result1));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (isnanf (result2));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (isnanf (result1));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (isnanf (result2));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, mingw */
 # if 0
     /* Sign bits of NaN is a portability sticking point, not worth
        worrying about.  */
-    ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX 6.5, mingw */
 # endif
-    ASSERT (ptr1 == input + 7);         /* glibc-2.3.6, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (ptr2 == input + 7);         /* glibc-2.3.6, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (ptr1 == input + 7);         /* glibc-2.3.6, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, mingw */
+    ASSERT (ptr2 == input + 7);         /* glibc-2.3.6, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, mingw */
     ASSERT (errno == 0);
 #else
     ASSERT (result1 == 0.0f);
@@ -793,8 +793,8 @@ test_function (float (*my_strtof) (const char *, char **))
     float result;
     errno = 0;
     result = my_strtof (input, &ptr);
-    ASSERT (result == 10.0f);           /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 10.0f);           /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
@@ -803,8 +803,8 @@ test_function (float (*my_strtof) (const char *, char **))
     float result;
     errno = 0;
     result = my_strtof (input, &ptr);
-    ASSERT (result == 10.0f);           /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 10.0f);           /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
@@ -813,8 +813,8 @@ test_function (float (*my_strtof) (const char *, char **))
     float result;
     errno = 0;
     result = my_strtof (input, &ptr);
-    ASSERT (result == 1.0f);            /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 1.0f);            /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
@@ -823,8 +823,8 @@ test_function (float (*my_strtof) (const char *, char **))
     float result;
     errno = 0;
     result = my_strtof (input, &ptr);
-    ASSERT (result == 1.0f);            /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 1.0f);            /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
@@ -833,8 +833,8 @@ test_function (float (*my_strtof) (const char *, char **))
     float result;
     errno = 0;
     result = my_strtof (input, &ptr);
-    ASSERT (result == 1.0f);            /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 1.0f);            /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
@@ -843,8 +843,8 @@ test_function (float (*my_strtof) (const char *, char **))
     float result;
     errno = 0;
     result = my_strtof (input, &ptr);
-    ASSERT (result == 2.0f);            /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 6);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 2.0f);            /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 6);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
@@ -853,8 +853,8 @@ test_function (float (*my_strtof) (const char *, char **))
     float result;
     errno = 0;
     result = my_strtof (input, &ptr);
-    ASSERT (result == 2.0f);            /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 6);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 2.0f);            /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 6);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
@@ -863,8 +863,8 @@ test_function (float (*my_strtof) (const char *, char **))
     float result;
     errno = 0;
     result = my_strtof (input, &ptr);
-    ASSERT (result == 2.0f);            /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 6);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 2.0f);            /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 6);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
@@ -873,8 +873,8 @@ test_function (float (*my_strtof) (const char *, char **))
     float result;
     errno = 0;
     result = my_strtof (input, &ptr);
-    ASSERT (result == 1.0f);            /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
-    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
+    ASSERT (result == 1.0f);            /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
+    ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
 
@@ -939,9 +939,9 @@ test_function (float (*my_strtof) (const char *, char **))
         input[m] = '\0';
         errno = 0;
         result = my_strtof (input, &ptr);
-        ASSERT (result == 1.0f);        /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
-        ASSERT (ptr == input + m);      /* OSF/1 5.1 */
-        ASSERT (errno == 0);            /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
+        ASSERT (result == 1.0f);        /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, mingw */
+        ASSERT (ptr == input + m);
+        ASSERT (errno == 0);            /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, mingw */
       }
     free (input);
   }
@@ -965,9 +965,9 @@ test_function (float (*my_strtof) (const char *, char **))
         input[m] = '\0';
         errno = 0;
         result = my_strtof (input, &ptr);
-        ASSERT (result == 1.0f);        /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
+        ASSERT (result == 1.0f);        /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, mingw */
         ASSERT (ptr == input + m);
-        ASSERT (errno == 0);            /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
+        ASSERT (errno == 0);            /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, mingw */
       }
     free (input);
   }
@@ -988,7 +988,7 @@ test_function (float (*my_strtof) (const char *, char **))
         errno = 0;
         result = my_strtof (input, &ptr);
         ASSERT (result == 0.0f);
-        ASSERT (!!signbit (result) == !!signbit (minus_zerof)); /* IRIX 6.5, OSF/1 4.0 */
+        ASSERT (!!signbit (result) == !!signbit (minus_zerof)); /* IRIX 6.5 */
         ASSERT (ptr == input + m);
         ASSERT (errno == 0);
       }