32-bit PA-RISC with HP-UX: remove deprecated ports

Message ID f977bee1-f8d7-b523-1b4d-75bd4d6dbb73@suse.cz
State New, archived
Headers
Series 32-bit PA-RISC with HP-UX: remove deprecated ports |

Commit Message

Martin Liška Aug. 26, 2022, 7:15 a.m. UTC
  Removes the deprecated ports. If I'm correct all hpux9,hpux10 should be removed
as they only provide 32-bit targets. On the contrary, hpux11 supports hppa64 that
we still do support.

Ready to be installed?
Thanks,
Martin

ChangeLog:

	* config.rpath: Delete hpux9 and hpux10.
	* configure: Regenerate.
	* configure.ac: Delete hpux9 and hpux10.
	* libgo/config/libtool.m4: Ignore 32-bit
	hpux targets.
	* libgo/configure: Regenerate.
	* libtool.m4: Delete hpux9 and hpux10.

config/ChangeLog:

	* mmap.m4: Remove hpux10.
	* mh-pa-hpux10: Removed.

contrib/ChangeLog:

	* config-list.mk: Remove deprecated ports.

contrib/header-tools/ChangeLog:

	* README: Remove deprecated ports.
	* reduce-headers: Likewise.

fixincludes/ChangeLog:

	* configure: Regenerate.
	* inclhack.def: Remove patterns for deprecated ports.
	* fixincl.x: Regenerate.

gcc/ChangeLog:

	* config.build: Remove deprecated ports.
	* config.gcc: Likewise.
	* config.host: Likewise.
	* configure.ac: Likewise.
	* configure: Regenerate.
	* config/pa/pa-hpux10.h: Removed.
	* config/pa/pa-hpux10.opt: Removed.
	* config/pa/t-dce-thr: Removed.

gnattools/ChangeLog:

	* configure.ac: Remove deprecated ports.
	* configure: Regenerate.

libatomic/ChangeLog:

	* configure: Regenerate.

libbacktrace/ChangeLog:

	* configure: Regenerate.

libcc1/ChangeLog:

	* configure: Regenerate.

libffi/ChangeLog:

	* acinclude.m4: Remove deprecated ports.
	* configure: Regenerate.

libgcc/ChangeLog:

	* config.host: Remove deprecated ports.

libgfortran/ChangeLog:

	* configure: Regenerate.

libgomp/ChangeLog:

	* configure: Regenerate.

libitm/ChangeLog:

	* configure: Regenerate.

libobjc/ChangeLog:

	* configure: Regenerate.

liboffloadmic/ChangeLog:

	* configure: Regenerate.
	* plugin/configure: Regenerate.

libphobos/ChangeLog:

	* configure: Regenerate.

libquadmath/ChangeLog:

	* configure: Regenerate.

libsanitizer/ChangeLog:

	* configure: Regenerate.

libssp/ChangeLog:

	* configure: Regenerate.

libstdc++-v3/ChangeLog:

	* configure: Regenerate.
	* crossconfig.m4: Remove deprecated ports.

libvtv/ChangeLog:

	* configure: Regenerate.

lto-plugin/ChangeLog:

	* configure: Regenerate.

zlib/ChangeLog:

	* configure: Regenerate.

gcc/testsuite/ChangeLog:

	* g++.dg/cpp0x/lambda/lambda-conv.C: Remove useless test.
	* gcc.c-torture/execute/ieee/hugeval.x: Likewise.
	* gcc.dg/torture/pr47917.c: Likewise.
	* lib/target-supports.exp: Likewise.
---
 config.rpath                                  |   14 +-
 config/mh-pa-hpux10                           |    4 -
 config/mmap.m4                                |    2 +-
 configure                                     |   14 -
 configure.ac                                  |   14 -
 contrib/config-list.mk                        |    3 +-
 contrib/header-tools/README                   |    2 +-
 contrib/header-tools/reduce-headers           |    1 -
 fixincludes/configure                         |    2 +-
 fixincludes/fixincl.x                         | 1571 +++--------------
 fixincludes/inclhack.def                      |  475 +----
 gcc/config.build                              |    5 +-
 gcc/config.gcc                                |   82 -
 gcc/config.host                               |    5 -
 gcc/config/pa/pa-hpux10.h                     |  157 --
 gcc/config/pa/pa-hpux10.opt                   |   22 -
 gcc/config/pa/t-dce-thr                       |    2 -
 gcc/configure                                 |  105 +-
 gcc/configure.ac                              |   13 -
 .../g++.dg/cpp0x/lambda/lambda-conv.C         |    2 +-
 .../gcc.c-torture/execute/ieee/hugeval.x      |    3 -
 gcc/testsuite/gcc.dg/torture/pr47917.c        |    1 -
 gcc/testsuite/lib/target-supports.exp         |   15 +-
 gnattools/configure                           |    2 -
 gnattools/configure.ac                        |    2 -
 libatomic/configure                           |   45 +-
 libbacktrace/configure                        |   45 +-
 libcc1/configure                              |   88 +-
 libffi/acinclude.m4                           |    2 +-
 libffi/configure                              |   90 +-
 libgcc/config.host                            |   22 -
 libgfortran/configure                         |   84 +-
 libgo/config/libtool.m4                       |  126 +-
 libgo/configure                               |  132 +-
 libgomp/configure                             |   84 +-
 libitm/configure                              |   90 +-
 libobjc/configure                             |   45 +-
 liboffloadmic/configure                       |   88 +-
 liboffloadmic/plugin/configure                |   88 +-
 libphobos/configure                           |   82 +-
 libquadmath/configure                         |   45 +-
 libsanitizer/configure                        |   88 +-
 libssp/configure                              |   45 +-
 libstdc++-v3/configure                        |  114 +-
 libstdc++-v3/crossconfig.m4                   |    9 -
 libtool.m4                                    |   82 +-
 libvtv/configure                              |   88 +-
 lto-plugin/configure                          |   45 +-
 zlib/configure                                |   45 +-
 49 files changed, 381 insertions(+), 3809 deletions(-)
 delete mode 100644 config/mh-pa-hpux10
 delete mode 100644 gcc/config/pa/pa-hpux10.h
 delete mode 100644 gcc/config/pa/pa-hpux10.opt
 delete mode 100644 gcc/config/pa/t-dce-thr
  

Comments

Andreas Schwab Aug. 26, 2022, 7:20 a.m. UTC | #1
On Aug 26 2022, Martin Liška wrote:

> diff --git a/config.rpath b/config.rpath

This is part of gettext.
  
Martin Liška Aug. 26, 2022, 7:22 a.m. UTC | #2
On 8/26/22 09:20, Andreas Schwab wrote:
> On Aug 26 2022, Martin Liška wrote:
> 
>> diff --git a/config.rpath b/config.rpath
> 
> This is part of gettext.
> 

Ah, thanks, but how should one know that :P ?

Cheers,
Martin
  
John David Anglin Aug. 26, 2022, 7:09 p.m. UTC | #3
On 2022-08-26 3:15 a.m., Martin Liška wrote:
> fixincludes/ChangeLog:
>
> 	* configure: Regenerate.
> 	* inclhack.def: Remove patterns for deprecated ports.
> 	* fixincl.x: Regenerate.
There are problems with the fixincludes changes.  These break build on hppa64-hpux11.

configure:4015: checking whether we are cross compiling
configure:4023: /home/dave/gnu/gcc/objdir64/./gcc/xgcc -B/home/dave/gnu/gcc/objd
ir64/./gcc/ -B/opt/gnu64/gcc/gcc-12/hppa64-hp-hpux11.11/bin/ -B/opt/gnu64/gcc/gc
c-12/hppa64-hp-hpux11.11/lib/ -isystem /opt/gnu64/gcc/gcc-12/hppa64-hp-hpux11.11
/include -isystem /opt/gnu64/gcc/gcc-12/hppa64-hp-hpux11.11/sys-include   -fno-c
hecking -o conftest -g -O2   conftest.c  >&5
In file included from /home/dave/gnu/gcc/objdir64/gcc/include-fixed/stdio.h:21,
                  from conftest.c:11:
/home/dave/gnu/gcc/objdir64/gcc/include-fixed/stdio.h:608:59: error: unknown type name 'va_list'
   608 |      extern int vsnprintf(char *, __size_t, const char *, __va__list);
       | ^~~~~~~~~~
/home/dave/gnu/gcc/objdir64/gcc/include-fixed/stdio.h:116:1: note: 'va_list' is defined in header '<stdarg.h>'; did you forget to '#include 
<stdarg.h>'?
   115 | #               include <sys/_size_t.h>

Some hpux11 specific hacks are removed.  Some non system specific hpux hacks are also removed.
One can't trust comments or hacknames to infer applicability.

Dave
  
John David Anglin Aug. 28, 2022, 4:34 p.m. UTC | #4
On 2022-08-26 3:15 a.m., Martin Liška wrote:
> Removes the deprecated ports. If I'm correct all hpux9,hpux10 should be removed
> as they only provide 32-bit targets. On the contrary, hpux11 supports hppa64 that
> we still do support.
It is my understanding that the 32-bit hppa hpux targets were deprecated because they don't
support ELF and the DWARF debug format (.stabs is to be removed). Some of the changes to
libtool.m4 affect the 32-bit ia64 hpux target.  As far as I know, it supports ELF and the DWARF
debug format.

Possibly, the removal of ia64-hpux should be considered but I think it's a separate issue.

>
> Ready to be installed?
> Thanks,
> Martin
>
> ChangeLog:
>
> 	* config.rpath: Delete hpux9 and hpux10.
> 	* configure: Regenerate.
> 	* configure.ac: Delete hpux9 and hpux10.
> 	* libgo/config/libtool.m4: Ignore 32-bit
> 	hpux targets.
> 	* libgo/configure: Regenerate.
> 	* libtool.m4: Delete hpux9 and hpux10.
The libtool.m4 files are from GNU libtool.  I don't think these files should be changed.

Dave
  
Martin Liška Aug. 29, 2022, 2:06 p.m. UTC | #5
On 8/28/22 18:34, John David Anglin wrote:
> On 2022-08-26 3:15 a.m., Martin Liška wrote:
>> Removes the deprecated ports. If I'm correct all hpux9,hpux10 should be removed
>> as they only provide 32-bit targets. On the contrary, hpux11 supports hppa64 that
>> we still do support.
> It is my understanding that the 32-bit hppa hpux targets were deprecated because they don't
> support ELF and the DWARF debug format (.stabs is to be removed).

Yes, .stabs is the motivation for the removal.

> Some of the changes to
> libtool.m4 affect the 32-bit ia64 hpux target.  As far as I know, it supports ELF and the DWARF
> debug format.
> 
> Possibly, the removal of ia64-hpux should be considered but I think it's a separate issue.
> 
>>
>> Ready to be installed?
>> Thanks,
>> Martin
>>
>> ChangeLog:
>>
>>     * config.rpath: Delete hpux9 and hpux10.
>>     * configure: Regenerate.
>>     * configure.ac: Delete hpux9 and hpux10.
>>     * libgo/config/libtool.m4: Ignore 32-bit
>>     hpux targets.
>>     * libgo/configure: Regenerate.
>>     * libtool.m4: Delete hpux9 and hpux10.
> The libtool.m4 files are from GNU libtool.  I don't think these files should be changed.


Thanks for the feedback, can you please check the updated version of the patch?

Martin

> 
> Dave
>
  
John David Anglin Aug. 30, 2022, 6:39 p.m. UTC | #6
On 2022-08-29 10:06 a.m., Martin Liška wrote:
> Thanks for the feedback, can you please check the updated version of the patch?

hppa64-hp-hpux11.11 built successfully with the updated patch:
https://gcc.gnu.org/pipermail/gcc-testresults/2022-August/767508.html


Dave
  
John David Anglin Aug. 30, 2022, 7 p.m. UTC | #7
On 2022-08-29 10:06 a.m., Martin Liška wrote:
> Thanks for the feedback, can you please check the updated version of the patch?
The changes to the libffi directory are not necessary and incorrect.  libffi is a separate project.

Dave
  
John David Anglin Aug. 30, 2022, 7:51 p.m. UTC | #8
On 2022-08-29 10:06 a.m., Martin Liška wrote:
> Thanks for the feedback, can you please check the updated version of the patch?
@@ -353,9 +347,6 @@ proc check_weak_available { } {
  # return 1 if weak undefined symbols are supported.

  proc check_effective_target_weak_undefined { } {
-    if { [istarget hppa*-*-hpux*] } {
-       return 0
-    }

This code needs to be retained for hppa64.

@@ -562,7 +553,6 @@ proc check_effective_target_trampolines { } {
      if { [istarget avr-*-*]
          || [istarget msp430-*-*]
          || [istarget nvptx-*-*]
-        || [istarget hppa2.0w-hp-hpux11.23]
          || [istarget hppa64-hp-hpux11.23]
          || [istarget pru-*-*]
          || [istarget bpf-*-*] } {

The above looks odd.  As far as I know, support for trampolines doesn't depend in any way on hpux11.23.
I suspect the hppa64 line can be removed as well.

@@ -1,4 +0,0 @@
-# The ada virtual array implementation requires that indexing be disabled on
-# hosts such as hpux that use a segmented memory architecture. Both the c
-# and ada files need to be compiled with this option for correct operation.
-ADA_CFLAGS = -mdisable-indexing -D_X_HPUX10
diff --git a/config/mmap.m4 b/config/mmap.m4
index fba0d9d3657..53e5215d833 100644
--- a/config/mmap.m4
+++ b/config/mmap.m4
@@ -42,7 +42,7 @@ else
     # Systems known to be in this category are Windows (all variants),
     # VMS, and Darwin.
     case "$host_os" in
-     *vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00)
+     *vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux11.00)
          gcc_cv_func_mmap_dev_zero=no ;;
       *)
          gcc_cv_func_mmap_dev_zero=yes;;

Strictly, all hpux versions up to and including hpux11.00 don't have /dev/zero.

Dave
  
Jeff Law Aug. 31, 2022, 12:13 a.m. UTC | #9
On 8/28/2022 10:34 AM, John David Anglin wrote:
> On 2022-08-26 3:15 a.m., Martin Liška wrote:
>> Removes the deprecated ports. If I'm correct all hpux9,hpux10 should 
>> be removed
>> as they only provide 32-bit targets. On the contrary, hpux11 supports 
>> hppa64 that
>> we still do support.
> It is my understanding that the 32-bit hppa hpux targets were 
> deprecated because they don't
> support ELF and the DWARF debug format (.stabs is to be removed). Some 
> of the changes to
> libtool.m4 affect the 32-bit ia64 hpux target.  As far as I know, it 
> supports ELF and the DWARF
> debug format.
If someone really cared, they could support dwarf on the 32bit PA SOM 
targets -- but I'm not going to lose any sleep over 32bit PA SOM:-)


>
> Possibly, the removal of ia64-hpux should be considered but I think 
> it's a separate issue.
Definitely separate.  I'd support at least deprecation if we haven't 
deprecated it already.

jeff
  
John David Anglin Aug. 31, 2022, 12:32 a.m. UTC | #10
On 2022-08-30 8:13 p.m., Jeff Law wrote:
>
>
> On 8/28/2022 10:34 AM, John David Anglin wrote:
>> On 2022-08-26 3:15 a.m., Martin Liška wrote:
>>> Removes the deprecated ports. If I'm correct all hpux9,hpux10 should be removed
>>> as they only provide 32-bit targets. On the contrary, hpux11 supports hppa64 that
>>> we still do support.
>> It is my understanding that the 32-bit hppa hpux targets were deprecated because they don't
>> support ELF and the DWARF debug format (.stabs is to be removed). Some of the changes to
>> libtool.m4 affect the 32-bit ia64 hpux target.  As far as I know, it supports ELF and the DWARF
>> debug format.
> If someone really cared, they could support dwarf on the 32bit PA SOM targets -- but I'm not going to lose any sleep over 32bit PA SOM:-)
Yes.  I thought about working on it.  However, although 32bit hppa-hpux lives on in qemu, my main focus is linux.
I also had to shutdown my dedicated hpux machine.

Dave
  

Patch

diff --git a/config.rpath b/config.rpath
index 4dea75957c2..2fab1593189 100755
--- a/config.rpath
+++ b/config.rpath
@@ -62,7 +62,7 @@  else
       ;;
     mingw* | pw32* | os2*)
       ;;
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       wl='-Wl,'
       ;;
     irix5* | irix6* | nonstopux*)
@@ -296,15 +296,7 @@  else
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       ;;
-    hpux9*)
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      ;;
-    hpux10* | hpux11*)
+    hpux11*)
       if test "$with_gnu_ld" = no; then
         case "$host_cpu" in
           hppa*64*)
@@ -449,7 +441,7 @@  case "$host_os" in
     ;;
   gnu*)
     ;;
-  hpux9* | hpux10* | hpux11*)
+  hpux11*)
     case "$host_cpu" in
       ia64*)
         shrext=.so
diff --git a/config/mh-pa-hpux10 b/config/mh-pa-hpux10
deleted file mode 100644
index 99a2278f281..00000000000
--- a/config/mh-pa-hpux10
+++ /dev/null
@@ -1,4 +0,0 @@ 
-# The ada virtual array implementation requires that indexing be disabled on
-# hosts such as hpux that use a segmented memory architecture.  Both the c
-# and ada files need to be compiled with this option for correct operation.
-ADA_CFLAGS = -mdisable-indexing -D_X_HPUX10
diff --git a/config/mmap.m4 b/config/mmap.m4
index fba0d9d3657..53e5215d833 100644
--- a/config/mmap.m4
+++ b/config/mmap.m4
@@ -42,7 +42,7 @@  else
    # Systems known to be in this category are Windows (all variants),
    # VMS, and Darwin.
    case "$host_os" in
-     *vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00)
+     *vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux11.00)
         gcc_cv_func_mmap_dev_zero=no ;;
      *)
         gcc_cv_func_mmap_dev_zero=yes;;
diff --git a/configure b/configure
index 81c034b553f..e90b8df217d 100755
--- a/configure
+++ b/configure
@@ -3544,11 +3544,6 @@  case "${target}" in
   hppa*64*-*-hpux*)
     noconfigdirs="$noconfigdirs target-libffi"
     ;;
-  hppa*-hp-hpux11*)
-    ;;
-  hppa*-*-hpux*)
-    noconfigdirs="$noconfigdirs target-libffi"
-    ;;
   ia64*-*-*vms*)
     noconfigdirs="$noconfigdirs target-libffi"
     ;;
@@ -3855,14 +3850,9 @@  case "${target}" in
   h8500-*-*)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
-  hppa1.1-*-osf* | hppa1.1-*-bsd* )
-    ;;
   hppa*64*-*-hpux*)
     noconfigdirs="$noconfigdirs gdb"
     ;;
-  hppa*-*-hpux11*)
-    noconfigdirs="$noconfigdirs gdb ld"
-    ;;
   hppa*64*-*-linux*)
     ;;
   hppa*-*-linux*)
@@ -4076,9 +4066,6 @@  fi
   alpha*-linux*)
     host_makefile_frag="config/mh-alpha-linux"
     ;;
-  hppa*-hp-hpux10*)
-    host_makefile_frag="config/mh-pa-hpux10"
-    ;;
   hppa*-hp-hpux*)
     host_makefile_frag="config/mh-pa"
     ;;
@@ -18324,7 +18311,6 @@  fi
 compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"
 case "$target" in
   hppa*64*-*-hpux*) ;;
-  hppa*-*-hpux*) compare_exclusions="$compare_exclusions | */libgcc/lib2funcs* | gcc/function-tests.o" ;;
   powerpc*-ibm-aix*) compare_exclusions="$compare_exclusions | *libgomp*\$(objext)" ;;
 esac
 
diff --git a/configure.ac b/configure.ac
index 13f8c5f2a9f..3ecb532138d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -804,11 +804,6 @@  case "${target}" in
   hppa*64*-*-hpux*)
     noconfigdirs="$noconfigdirs target-libffi"
     ;;
-  hppa*-hp-hpux11*)
-    ;;
-  hppa*-*-hpux*)
-    noconfigdirs="$noconfigdirs target-libffi"
-    ;;
   ia64*-*-*vms*)
     noconfigdirs="$noconfigdirs target-libffi"
     ;;
@@ -1112,14 +1107,9 @@  case "${target}" in
   h8500-*-*)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
-  hppa1.1-*-osf* | hppa1.1-*-bsd* )
-    ;;
   hppa*64*-*-hpux*)
     noconfigdirs="$noconfigdirs gdb"
     ;;
-  hppa*-*-hpux11*)
-    noconfigdirs="$noconfigdirs gdb ld"
-    ;;
   hppa*64*-*-linux*)
     ;;
   hppa*-*-linux*)
@@ -1314,9 +1304,6 @@  case "${host}" in
   alpha*-linux*)
     host_makefile_frag="config/mh-alpha-linux"
     ;;
-  hppa*-hp-hpux10*)
-    host_makefile_frag="config/mh-pa-hpux10"
-    ;;
   hppa*-hp-hpux*)
     host_makefile_frag="config/mh-pa"
     ;;
@@ -3780,7 +3767,6 @@  AC_SUBST(stage2_werror_flag)
 compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"
 case "$target" in
   hppa*64*-*-hpux*) ;;
-  hppa*-*-hpux*) compare_exclusions="$compare_exclusions | */libgcc/lib2funcs* | gcc/function-tests.o" ;;
   powerpc*-ibm-aix*) compare_exclusions="$compare_exclusions | *libgomp*\$(objext)" ;;
 esac
 AC_SUBST(compare_exclusions)
diff --git a/contrib/config-list.mk b/contrib/config-list.mk
index dd22420f078..4f4d586b263 100644
--- a/contrib/config-list.mk
+++ b/contrib/config-list.mk
@@ -45,9 +45,8 @@  LIST = aarch64-elf aarch64-linux-gnu aarch64-rtems \
   epiphany-elf epiphany-elfOPT-with-stack-offset=16 fido-elf \
   fr30-elf frv-elf frv-linux ft32-elf h8300-elf hppa-linux-gnu \
   hppa-linux-gnuOPT-enable-sjlj-exceptions=yes hppa64-linux-gnu \
-  hppa2.0-hpux10.1OPT-enable-obsolete hppa64-hpux11.3 \
+  hppa64-hpux11.3 \
   hppa64-hpux11.0OPT-enable-sjlj-exceptions=yes \
-  hppa2.0-hpux11.9OPT-enable-obsolete \
   i686-pc-linux-gnu i686-apple-darwin i686-apple-darwin9 i686-apple-darwin10 \
   i486-freebsd4 i686-freebsd6 i686-kfreebsd-gnu \
   i686-netbsdelf9 \
diff --git a/contrib/header-tools/README b/contrib/header-tools/README
index f4eee329b33..48381fe0ba4 100644
--- a/contrib/header-tools/README
+++ b/contrib/header-tools/README
@@ -203,7 +203,7 @@  reduce-headers
   these targets.  They are also known to the tool.  When building targets it
   will check those targets before the rest.  
   This coverage can be achieved by building config-list.mk with :
-  LIST="aarch64-linux-gnu arm-netbsdelf c6x-elf epiphany-elf hppa2.0-hpux10.1 i686-mingw32crt i686-pc-msdosdjgpp mipsel-elf powerpc-eabisimaltivec rs6000-ibm-aix5.1.0 sh-superh-elf sparc64-elf"
+  LIST="aarch64-linux-gnu arm-netbsdelf c6x-elf epiphany-elf i686-mingw32crt i686-pc-msdosdjgpp mipsel-elf powerpc-eabisimaltivec rs6000-ibm-aix5.1.0 sh-superh-elf sparc64-elf"
 
   -b specifies the native bootstrapped build root directory
   -t specifies a target build root directory that config-list.mk was run from
diff --git a/contrib/header-tools/reduce-headers b/contrib/header-tools/reduce-headers
index 8363736d0c8..7d236e30688 100755
--- a/contrib/header-tools/reduce-headers
+++ b/contrib/header-tools/reduce-headers
@@ -25,7 +25,6 @@  target_priority = [
     "arm-netbsdelf",
     "c6x-elf",
     "epiphany-elf",
-    "hppa2.0-hpux10.1",
     "i686-mingw32crt",
     "i686-pc-msdosdjgpp",
     "mipsel-elf",
diff --git a/fixincludes/configure b/fixincludes/configure
index b3bca666a4d..52ec8db0f89 100755
--- a/fixincludes/configure
+++ b/fixincludes/configure
@@ -5347,7 +5347,7 @@  else
    # Systems known to be in this category are Windows (all variants),
    # VMS, and Darwin.
    case "$host_os" in
-     *vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00)
+     *vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux11.00)
         gcc_cv_func_mmap_dev_zero=no ;;
      *)
         gcc_cv_func_mmap_dev_zero=yes;;
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index bad490453b7..93343c8f5a6 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@ 
  *
  * DO NOT EDIT THIS FILE   (fixincl.x)
  *
- * It has been AutoGen-ed  February 27, 2022 at 07:47:03 PM by AutoGen 5.18.16
+ * It has been AutoGen-ed  August 25, 2022 at 12:43:22 PM by AutoGen 5.18.16
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Feb 27 19:47:03 UTC 2022
+/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Aug 25 12:43:22 CEST 2022
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -15,7 +15,7 @@ 
  * certain ANSI-incompatible system header files which are fixed to work
  * correctly with ANSI C and placed in a directory that GNU C will search.
  *
- * This file contains 267 fixup descriptions.
+ * This file contains 242 fixup descriptions.
  *
  * See README for more information.
  *
@@ -2335,41 +2335,6 @@  static const char* apzAvoid_Wchar_T_TypePatch[] = {
 #endif",
     (char*)NULL };
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Bad_Struct_Term fix
- */
-tSCC zBad_Struct_TermName[] =
-     "bad_struct_term";
-
-/*
- *  File name selection pattern
- */
-tSCC zBad_Struct_TermList[] =
-  "curses.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzBad_Struct_TermMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zBad_Struct_TermSelect0[] =
-       "^[ \t]*typedef[ \t]+struct[ \t]+term[ \t]*;";
-
-#define    BAD_STRUCT_TERM_TEST_CT  1
-static tTestDesc aBad_Struct_TermTests[] = {
-  { TT_EGREP,    zBad_Struct_TermSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Bad_Struct_Term
- */
-static const char* apzBad_Struct_TermPatch[] = {
-    "format",
-    "struct term;",
-    (char*)NULL };
-
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Badquote fix
@@ -4146,1323 +4111,404 @@  s/{ { 0, } }/{ { 0, 0, 0, 0, 0, 0 } }/\n\
     "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\)_NP\\) }/{ \\1, 0, 0 }/",
     "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(ERRORCHECK\\)_NP\\) }/{ \\1, 0, 0 }/",
     "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(ADAPTIVE\\)_NP\\) }/{ \\1, 0, 0 }/",
-    "-e", "/define[ \t]\\{1,\\}PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\/N;s/^[ \t]*#[ \t]*\\(define[ \t]\\{1,\\}PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\\\)\\n[ \t]*{ { 0, } }/# if __WORDSIZE == 64\\\n\
-#  \\1\\\n\
-  { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }\\\n\
-# else\\\n\
-#  \\1\\\n\
-  { { 0, 0, 0, 0, 0, 0, 0, 0 } }\\\n\
-# endif/",
-    "-e", "s/{ \\(0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP\\) }/{ \\1, 0 }/",
-    "-e", "/define[ \t]\\{1,\\}PTHREAD_COND_INITIALIZER/s/{ { 0, } }/{ { 0, 0, 0, 0, 0, (void *) 0, 0, 0 } }/",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Glibc_Stdint fix
- */
-tSCC zGlibc_StdintName[] =
-     "glibc_stdint";
-
-/*
- *  File name selection pattern
- */
-tSCC zGlibc_StdintList[] =
-  "stdint.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzGlibc_StdintMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zGlibc_StdintSelect0[] =
-       "GNU C Library";
-
-#define    GLIBC_STDINT_TEST_CT  1
-static tTestDesc aGlibc_StdintTests[] = {
-  { TT_EGREP,    zGlibc_StdintSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Glibc_Stdint
- */
-static const char* apzGlibc_StdintPatch[] = {
-    "format",
-    "# define UINT8_C(c)\tc\n\
-# define UINT16_C(c)\tc",
-    "# define UINT8_C\\(c\\)\tc ## U\n\
-# define UINT16_C\\(c\\)\tc ## U",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Glibc_Strncpy fix
- */
-tSCC zGlibc_StrncpyName[] =
-     "glibc_strncpy";
-
-/*
- *  File name selection pattern
- */
-tSCC zGlibc_StrncpyList[] =
-  "bits/string2.h\0*/bits/string2.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzGlibc_StrncpyMachs (const char**)NULL
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zGlibc_StrncpyBypass0[] =
-       "__builtin_strncpy";
-
-#define    GLIBC_STRNCPY_TEST_CT  1
-static tTestDesc aGlibc_StrncpyTests[] = {
-  { TT_NEGREP,   zGlibc_StrncpyBypass0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Glibc_Strncpy
- */
-static const char* apzGlibc_StrncpyPatch[] = {
-    "format",
-    "#  define strncpy(dest, src, n) __builtin_strncpy (dest, src, n)",
-    "#  define strncpy([^\n\
-]*\\\\\n\
-)*[^\n\
-]*",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Glibc_Tgmath fix
- */
-tSCC zGlibc_TgmathName[] =
-     "glibc_tgmath";
-
-/*
- *  File name selection pattern
- */
-tSCC zGlibc_TgmathList[] =
-  "tgmath.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzGlibc_TgmathMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zGlibc_TgmathSelect0[] =
-       "\\(\\(\\(type\\) 0.25\\) && \\(\\(type\\) 0.25 - 1\\)\\)";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zGlibc_TgmathBypass0[] =
-       "__floating_type\\(type\\) \\\\\n\
-.*__builtin_classify_type";
-
-#define    GLIBC_TGMATH_TEST_CT  2
-static tTestDesc aGlibc_TgmathTests[] = {
-  { TT_NEGREP,   zGlibc_TgmathBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zGlibc_TgmathSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Glibc_Tgmath
- */
-static const char* apzGlibc_TgmathPatch[] = {
-    "format",
-    "(__builtin_classify_type ((type) 0) == 8 || (__builtin_classify_type ((type) 0) == 9 && __builtin_classify_type (__real__ ((type) 0)) == 8))",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Gnu_Types fix
- */
-tSCC zGnu_TypesName[] =
-     "gnu_types";
-
-/*
- *  File name selection pattern
- */
-tSCC zGnu_TypesList[] =
-  "sys/types.h\0stdlib.h\0sys/stdtypes.h\0stddef.h\0memory.h\0unistd.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzGnu_TypesMachs[] = {
-        "*-*-solaris2.1[0-9]*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zGnu_TypesSelect0[] =
-       "^[ \t]*typedef[ \t]+.*[ \t](ptrdiff|size|wchar)_t;";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zGnu_TypesBypass0[] =
-       "_GCC_(PTRDIFF|SIZE|WCHAR)_T";
-
-#define    GNU_TYPES_TEST_CT  2
-static tTestDesc aGnu_TypesTests[] = {
-  { TT_NEGREP,   zGnu_TypesBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zGnu_TypesSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Gnu_Types
- */
-static const char* apzGnu_TypesPatch[] = {
-    "gnu_type",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hp_Inline fix
- */
-tSCC zHp_InlineName[] =
-     "hp_inline";
-
-/*
- *  File name selection pattern
- */
-tSCC zHp_InlineList[] =
-  "sys/spinlock.h\0machine/machparam.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzHp_InlineMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHp_InlineSelect0[] =
-       "[ \t]*#[ \t]*include[ \t]+\"\\.\\./machine/";
-
-#define    HP_INLINE_TEST_CT  1
-static tTestDesc aHp_InlineTests[] = {
-  { TT_EGREP,    zHp_InlineSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hp_Inline
- */
-static const char* apzHp_InlinePatch[] = {
-    "format",
-    "%1<machine/%2.h>",
-    "([ \t]*#[ \t]*include[ \t]+)\"\\.\\./machine/([a-z]+)\\.h\"",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hp_Sysfile fix
- */
-tSCC zHp_SysfileName[] =
-     "hp_sysfile";
-
-/*
- *  File name selection pattern
- */
-tSCC zHp_SysfileList[] =
-  "sys/file.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzHp_SysfileMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHp_SysfileSelect0[] =
-       "HPUX_SOURCE";
-
-#define    HP_SYSFILE_TEST_CT  1
-static tTestDesc aHp_SysfileTests[] = {
-  { TT_EGREP,    zHp_SysfileSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hp_Sysfile
- */
-static const char* apzHp_SysfilePatch[] = {
-    "format",
-    "(struct file *, ...)",
-    "\\(\\.\\.\\.\\)",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hppa_Hpux_Fp_Macros fix
- */
-tSCC zHppa_Hpux_Fp_MacrosName[] =
-     "hppa_hpux_fp_macros";
-
-/*
- *  File name selection pattern
- */
-tSCC zHppa_Hpux_Fp_MacrosList[] =
-  "math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHppa_Hpux_Fp_MacrosMachs[] = {
-        "hppa*-hp-hpux11*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHppa_Hpux_Fp_MacrosSelect0[] =
-       "#[ \t]*define[ \t]*FP_NORMAL.*\n\
-#[ \t]*define[ \t]*FP_ZERO.*\n\
-#[ \t]*define[ \t]*FP_INFINITE.*\n\
-#[ \t]*define[ \t]*FP_SUBNORMAL.*\n\
-#[ \t]*define[ \t]*FP_NAN.*\n";
-
-#define    HPPA_HPUX_FP_MACROS_TEST_CT  1
-static tTestDesc aHppa_Hpux_Fp_MacrosTests[] = {
-  { TT_EGREP,    zHppa_Hpux_Fp_MacrosSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hppa_Hpux_Fp_Macros
- */
-static const char* apzHppa_Hpux_Fp_MacrosPatch[] = {
-    "format",
-    "#endif /* _INCLUDE_HPUX_SOURCE */\n\n\
-#if defined(_INCLUDE_HPUX_SOURCE) || \\\n\
-   (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))\n\
-%0#endif\n\n\
-#ifdef _INCLUDE_HPUX_SOURCE\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux10_Cpp_Pow_Inline fix
- */
-tSCC zHpux10_Cpp_Pow_InlineName[] =
-     "hpux10_cpp_pow_inline";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux10_Cpp_Pow_InlineList[] =
-  "fixinc-test-limits.h\0math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzHpux10_Cpp_Pow_InlineMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux10_Cpp_Pow_InlineSelect0[] =
-       "^# +ifdef +__cplusplus\n\
- +\\}\n\
- +inline +double +pow\\(double +__d,int +__expon\\) +\\{\n\
-[ \t]+return +pow\\(__d,\\(double\\)__expon\\);\n\
- +\\}\n\
- +extern +\"C\" +\\{\n\
-#else\n\
-# +endif";
-
-#define    HPUX10_CPP_POW_INLINE_TEST_CT  1
-static tTestDesc aHpux10_Cpp_Pow_InlineTests[] = {
-  { TT_EGREP,    zHpux10_Cpp_Pow_InlineSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux10_Cpp_Pow_Inline
- */
-static const char* apzHpux10_Cpp_Pow_InlinePatch[] = {
-    "format",
-    "",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux11_Cpp_Pow_Inline fix
- */
-tSCC zHpux11_Cpp_Pow_InlineName[] =
-     "hpux11_cpp_pow_inline";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux11_Cpp_Pow_InlineList[] =
-  "math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzHpux11_Cpp_Pow_InlineMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux11_Cpp_Pow_InlineSelect0[] =
-       " +inline double pow\\(double d,int expon\\) \\{\n\
- +return pow\\(d, \\(double\\)expon\\);\n\
- +\\}\n";
-
-#define    HPUX11_CPP_POW_INLINE_TEST_CT  1
-static tTestDesc aHpux11_Cpp_Pow_InlineTests[] = {
-  { TT_EGREP,    zHpux11_Cpp_Pow_InlineSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux11_Cpp_Pow_Inline
- */
-static const char* apzHpux11_Cpp_Pow_InlinePatch[] = {
-    "format",
-    "",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux_Math_Constexpr fix
- */
-tSCC zHpux_Math_ConstexprName[] =
-     "hpux_math_constexpr";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux_Math_ConstexprList[] =
-  "math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux_Math_ConstexprMachs[] = {
-        "*-hp-hpux11*",
-        (const char*)NULL };
-#define HPUX_MATH_CONSTEXPR_TEST_CT  0
-#define aHpux_Math_ConstexprTests   (tTestDesc*)NULL
-
-/*
- *  Fix Command Arguments for Hpux_Math_Constexpr
- */
-static const char* apzHpux_Math_ConstexprPatch[] = { sed_cmd_z,
-    "-e", "s@^[ \t]*extern[ \t]*const[ \t]*double[ \t]*_DINFINITY;[ \t]*$@#  define _DINFINITY (__builtin_inf ())@",
-    "-e", "s@^[ \t]*extern[ \t]*const[ \t]*float[ \t]*_SINFINITY;[ \t]*$@#    define _SINFINITY (__builtin_inff ())@",
-    "-e", "s@^[ \t]*extern[ \t]*const[ \t]*float[ \t]*_SQNAN;[ \t]*$@#    define _SQNAN (__builtin_nanf (\\\"\\\"))@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux10_Ctype_Declarations1 fix
- */
-tSCC zHpux10_Ctype_Declarations1Name[] =
-     "hpux10_ctype_declarations1";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux10_Ctype_Declarations1List[] =
-  "ctype.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzHpux10_Ctype_Declarations1Machs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux10_Ctype_Declarations1Select0[] =
-       "^#[ \t]*define _toupper\\(__c\\)[ \t]*__toupper\\(__c\\)";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zHpux10_Ctype_Declarations1Bypass0[] =
-       "^[ \t]*extern[ \t]*int[ \t]*__tolower[ \t]*\\(";
-
-#define    HPUX10_CTYPE_DECLARATIONS1_TEST_CT  2
-static tTestDesc aHpux10_Ctype_Declarations1Tests[] = {
-  { TT_NEGREP,   zHpux10_Ctype_Declarations1Bypass0, (regex_t*)NULL },
-  { TT_EGREP,    zHpux10_Ctype_Declarations1Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux10_Ctype_Declarations1
- */
-static const char* apzHpux10_Ctype_Declarations1Patch[] = {
-    "format",
-    "#ifdef _PROTOTYPES\n\
-extern int __tolower(int);\n\
-extern int __toupper(int);\n\
-#else /* NOT _PROTOTYPES */\n\
-extern int __tolower();\n\
-extern int __toupper();\n\
-#endif /* _PROTOTYPES */\n\n\
-%0\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux10_Ctype_Declarations2 fix
- */
-tSCC zHpux10_Ctype_Declarations2Name[] =
-     "hpux10_ctype_declarations2";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux10_Ctype_Declarations2List[] =
-  "ctype.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzHpux10_Ctype_Declarations2Machs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux10_Ctype_Declarations2Select0[] =
-       "^#  if defined\\(_SB_CTYPE_MACROS\\) && \\!defined\\(__lint\\)";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zHpux10_Ctype_Declarations2Bypass0[] =
-       "^[ \t]*extern[ \t]*int[ \t]*_isalnum[ \t]*\\(";
-
-#define    HPUX10_CTYPE_DECLARATIONS2_TEST_CT  2
-static tTestDesc aHpux10_Ctype_Declarations2Tests[] = {
-  { TT_NEGREP,   zHpux10_Ctype_Declarations2Bypass0, (regex_t*)NULL },
-  { TT_EGREP,    zHpux10_Ctype_Declarations2Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux10_Ctype_Declarations2
- */
-static const char* apzHpux10_Ctype_Declarations2Patch[] = {
-    "format",
-    "%0\n\n\
-#ifdef _PROTOTYPES\n\
-     extern int _isalnum(int);\n\
-     extern int _isalpha(int);\n\
-     extern int _iscntrl(int);\n\
-     extern int _isdigit(int);\n\
-     extern int _isgraph(int);\n\
-     extern int _islower(int);\n\
-     extern int _isprint(int);\n\
-     extern int _ispunct(int);\n\
-     extern int _isspace(int);\n\
-     extern int _isupper(int);\n\
-     extern int _isxdigit(int);\n\
-#  else /* not _PROTOTYPES */\n\
-     extern int _isalnum();\n\
-     extern int _isalpha();\n\
-     extern int _iscntrl();\n\
-     extern int _isdigit();\n\
-     extern int _isgraph();\n\
-     extern int _islower();\n\
-     extern int _isprint();\n\
-     extern int _ispunct();\n\
-     extern int _isspace();\n\
-     extern int _isupper();\n\
-     extern int _isxdigit();\n\
-#endif /* _PROTOTYPES */\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux10_Stdio_Declarations fix
- */
-tSCC zHpux10_Stdio_DeclarationsName[] =
-     "hpux10_stdio_declarations";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux10_Stdio_DeclarationsList[] =
-  "stdio.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzHpux10_Stdio_DeclarationsMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux10_Stdio_DeclarationsSelect0[] =
-       "^#[ \t]*define _iob[ \t]*__iob";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zHpux10_Stdio_DeclarationsBypass0[] =
-       "^[ \t]*extern[ \t]*int[ \t]*vsnprintf[ \t]*\\(";
-
-#define    HPUX10_STDIO_DECLARATIONS_TEST_CT  2
-static tTestDesc aHpux10_Stdio_DeclarationsTests[] = {
-  { TT_NEGREP,   zHpux10_Stdio_DeclarationsBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zHpux10_Stdio_DeclarationsSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux10_Stdio_Declarations
- */
-static const char* apzHpux10_Stdio_DeclarationsPatch[] = {
-    "format",
-    "%0\n\n\
-#  if defined(__STDC__) || defined(__cplusplus)\n\
-     extern int snprintf(char *, size_t, const char *, ...);\n\
-     extern int vsnprintf(char *, size_t, const char *, __va_list);\n\
-#  else /* not __STDC__) || __cplusplus */\n\
-     extern int snprintf();\n\
-     extern int vsnprintf();\n\
-#  endif /* __STDC__) || __cplusplus */\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hppa_Hpux11_Alloca fix
- */
-tSCC zHppa_Hpux11_AllocaName[] =
-     "hppa_hpux11_alloca";
-
-/*
- *  File name selection pattern
- */
-tSCC zHppa_Hpux11_AllocaList[] =
-  "alloca.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHppa_Hpux11_AllocaMachs[] = {
-        "hppa*-*-hpux11*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHppa_Hpux11_AllocaSelect0[] =
-       "#ifndef _STDDEF_INCLUDED";
-
-#define    HPPA_HPUX11_ALLOCA_TEST_CT  1
-static tTestDesc aHppa_Hpux11_AllocaTests[] = {
-  { TT_EGREP,    zHppa_Hpux11_AllocaSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hppa_Hpux11_Alloca
- */
-static const char* apzHppa_Hpux11_AllocaPatch[] = {
-    "format",
-    "#ifndef _SYS_STDSYMS_INCLUDED\n\
-#  include <sys/stdsyms.h>\n\
-#endif /* _SYS_STDSYMS_INCLUDED */\n\n\
-%0",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux11_Abs fix
- */
-tSCC zHpux11_AbsName[] =
-     "hpux11_abs";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux11_AbsList[] =
-  "stdlib.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux11_AbsMachs[] = {
-        "*-hp-hpux11*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux11_AbsSelect0[] =
-       "ifndef _MATH_INCLUDED";
-
-#define    HPUX11_ABS_TEST_CT  1
-static tTestDesc aHpux11_AbsTests[] = {
-  { TT_EGREP,    zHpux11_AbsSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux11_Abs
- */
-static const char* apzHpux11_AbsPatch[] = {
-    "format",
-    "if !defined(_MATH_INCLUDED) || defined(__GNUG__)",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux11_Lwp_Rwlock_Valid fix
- */
-tSCC zHpux11_Lwp_Rwlock_ValidName[] =
-     "hpux11_lwp_rwlock_valid";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux11_Lwp_Rwlock_ValidList[] =
-  "sys/pthread.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux11_Lwp_Rwlock_ValidMachs[] = {
-        "*-hp-hpux11*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux11_Lwp_Rwlock_ValidSelect0[] =
-       "#define __LWP_RWLOCK_VALID[ \t]*0x8c91";
-
-#define    HPUX11_LWP_RWLOCK_VALID_TEST_CT  1
-static tTestDesc aHpux11_Lwp_Rwlock_ValidTests[] = {
-  { TT_EGREP,    zHpux11_Lwp_Rwlock_ValidSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux11_Lwp_Rwlock_Valid
- */
-static const char* apzHpux11_Lwp_Rwlock_ValidPatch[] = {
-    "format",
-    "#define __LWP_RWLOCK_VALID              -29551",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux11_Extern_Sendfile fix
- */
-tSCC zHpux11_Extern_SendfileName[] =
-     "hpux11_extern_sendfile";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux11_Extern_SendfileList[] =
-  "sys/socket.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux11_Extern_SendfileMachs[] = {
-        "*-hp-hpux11.[12]*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux11_Extern_SendfileSelect0[] =
-       "^[ \t]*extern sbsize_t sendfile.*\n\
-.*, int\\)\\);\n";
-
-#define    HPUX11_EXTERN_SENDFILE_TEST_CT  1
-static tTestDesc aHpux11_Extern_SendfileTests[] = {
-  { TT_EGREP,    zHpux11_Extern_SendfileSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux11_Extern_Sendfile
- */
-static const char* apzHpux11_Extern_SendfilePatch[] = {
-    "format",
-    "#ifndef _APP32_64BIT_OFF_T\n\
-%0#endif\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux11_Extern_Sendpath fix
- */
-tSCC zHpux11_Extern_SendpathName[] =
-     "hpux11_extern_sendpath";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux11_Extern_SendpathList[] =
-  "sys/socket.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux11_Extern_SendpathMachs[] = {
-        "*-hp-hpux11.[12]*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux11_Extern_SendpathSelect0[] =
-       "^[ \t]*extern sbsize_t sendpath.*\n\
-.*, int\\)\\);\n";
-
-#define    HPUX11_EXTERN_SENDPATH_TEST_CT  1
-static tTestDesc aHpux11_Extern_SendpathTests[] = {
-  { TT_EGREP,    zHpux11_Extern_SendpathSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux11_Extern_Sendpath
- */
-static const char* apzHpux11_Extern_SendpathPatch[] = {
-    "format",
-    "#ifndef _APP32_64BIT_OFF_T\n\
-%0#endif\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux11_Fabsf fix
- */
-tSCC zHpux11_FabsfName[] =
-     "hpux11_fabsf";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux11_FabsfList[] =
-  "math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux11_FabsfMachs[] = {
-        "*-hp-hpux11*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux11_FabsfSelect0[] =
-       "^[ \t]*#[ \t]*define[ \t]+fabsf\\(.*";
-
-#define    HPUX11_FABSF_TEST_CT  1
-static tTestDesc aHpux11_FabsfTests[] = {
-  { TT_EGREP,    zHpux11_FabsfSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux11_Fabsf
- */
-static const char* apzHpux11_FabsfPatch[] = {
-    "format",
-    "#ifndef __cplusplus\n\
-%0\n\
-#endif",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux11_Pthread_Pointer fix
- */
-tSCC zHpux11_Pthread_PointerName[] =
-     "hpux11_pthread_pointer";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux11_Pthread_PointerList[] =
-  "sys/pthread.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux11_Pthread_PointerMachs[] = {
-        "*-hp-hpux11.[0-3]*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux11_Pthread_PointerSelect0[] =
-       "(void[ \t]*\\*)(m|c|rw)(_ptr)";
-
-#define    HPUX11_PTHREAD_POINTER_TEST_CT  1
-static tTestDesc aHpux11_Pthread_PointerTests[] = {
-  { TT_EGREP,    zHpux11_Pthread_PointerSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux11_Pthread_Pointer
- */
-static const char* apzHpux11_Pthread_PointerPatch[] = {
-    "format",
-    "long\t%2%3",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux11_Pthread_Const fix
- */
-tSCC zHpux11_Pthread_ConstName[] =
-     "hpux11_pthread_const";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux11_Pthread_ConstList[] =
-  "sys/pthread.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux11_Pthread_ConstMachs[] = {
-        "*-hp-hpux11.[0-3]*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux11_Pthread_ConstSelect0[] =
-       "^(#define[ \t]+__POINTER_SET[ \t0,]*)(.*\\))";
-
-#define    HPUX11_PTHREAD_CONST_TEST_CT  1
-static tTestDesc aHpux11_Pthread_ConstTests[] = {
-  { TT_EGREP,    zHpux11_Pthread_ConstSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux11_Pthread_Const
- */
-static const char* apzHpux11_Pthread_ConstPatch[] = {
-    "format",
-    "%11",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux11_Size_T fix
- */
-tSCC zHpux11_Size_TName[] =
-     "hpux11_size_t";
-
-/*
- *  File name selection pattern
- */
-#define zHpux11_Size_TList (char*)NULL
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux11_Size_TMachs[] = {
-        "*-hp-hpux11*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux11_Size_TSelect0[] =
-       "__size_t";
-
-#define    HPUX11_SIZE_T_TEST_CT  1
-static tTestDesc aHpux11_Size_TTests[] = {
-  { TT_EGREP,    zHpux11_Size_TSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux11_Size_T
- */
-static const char* apzHpux11_Size_TPatch[] = {
-    "format",
-    "_hpux_size_t",
+    "-e", "/define[ \t]\\{1,\\}PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\/N;s/^[ \t]*#[ \t]*\\(define[ \t]\\{1,\\}PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\\\)\\n[ \t]*{ { 0, } }/# if __WORDSIZE == 64\\\n\
+#  \\1\\\n\
+  { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }\\\n\
+# else\\\n\
+#  \\1\\\n\
+  { { 0, 0, 0, 0, 0, 0, 0, 0 } }\\\n\
+# endif/",
+    "-e", "s/{ \\(0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP\\) }/{ \\1, 0 }/",
+    "-e", "/define[ \t]\\{1,\\}PTHREAD_COND_INITIALIZER/s/{ { 0, } }/{ { 0, 0, 0, 0, 0, (void *) 0, 0, 0 } }/",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux11_Snprintf fix
+ *  Description of Glibc_Stdint fix
  */
-tSCC zHpux11_SnprintfName[] =
-     "hpux11_snprintf";
+tSCC zGlibc_StdintName[] =
+     "glibc_stdint";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux11_SnprintfList[] =
-  "stdio.h\0";
+tSCC zGlibc_StdintList[] =
+  "stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzHpux11_SnprintfMachs (const char**)NULL
+#define apzGlibc_StdintMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux11_SnprintfSelect0[] =
-       "(extern int snprintf *\\(char *\\*, *(|__|_hpux_)size_t,) *(char *\\*, *\\.\\.\\.\\);)";
+tSCC zGlibc_StdintSelect0[] =
+       "GNU C Library";
 
-#define    HPUX11_SNPRINTF_TEST_CT  1
-static tTestDesc aHpux11_SnprintfTests[] = {
-  { TT_EGREP,    zHpux11_SnprintfSelect0, (regex_t*)NULL }, };
+#define    GLIBC_STDINT_TEST_CT  1
+static tTestDesc aGlibc_StdintTests[] = {
+  { TT_EGREP,    zGlibc_StdintSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux11_Snprintf
+ *  Fix Command Arguments for Glibc_Stdint
  */
-static const char* apzHpux11_SnprintfPatch[] = {
+static const char* apzGlibc_StdintPatch[] = {
     "format",
-    "%1 const %3",
+    "# define UINT8_C(c)\tc\n\
+# define UINT16_C(c)\tc",
+    "# define UINT8_C\\(c\\)\tc ## U\n\
+# define UINT16_C\\(c\\)\tc ## U",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux11_Vsnprintf fix
+ *  Description of Glibc_Strncpy fix
  */
-tSCC zHpux11_VsnprintfName[] =
-     "hpux11_vsnprintf";
+tSCC zGlibc_StrncpyName[] =
+     "glibc_strncpy";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux11_VsnprintfList[] =
-  "stdio.h\0";
+tSCC zGlibc_StrncpyList[] =
+  "bits/string2.h\0*/bits/string2.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzHpux11_VsnprintfMachs (const char**)NULL
+#define apzGlibc_StrncpyMachs (const char**)NULL
 
 /*
- *  content selection pattern - do fix if pattern found
+ *  content bypass pattern - skip fix if pattern found
  */
-tSCC zHpux11_VsnprintfSelect0[] =
-       "(extern int vsnprintf\\(char \\*, _[hpux]*_size_t, const char \\*,) __va__list\\);";
+tSCC zGlibc_StrncpyBypass0[] =
+       "__builtin_strncpy";
 
-#define    HPUX11_VSNPRINTF_TEST_CT  1
-static tTestDesc aHpux11_VsnprintfTests[] = {
-  { TT_EGREP,    zHpux11_VsnprintfSelect0, (regex_t*)NULL }, };
+#define    GLIBC_STRNCPY_TEST_CT  1
+static tTestDesc aGlibc_StrncpyTests[] = {
+  { TT_NEGREP,   zGlibc_StrncpyBypass0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux11_Vsnprintf
+ *  Fix Command Arguments for Glibc_Strncpy
  */
-static const char* apzHpux11_VsnprintfPatch[] = {
+static const char* apzGlibc_StrncpyPatch[] = {
     "format",
-    "%1 __va_list);",
+    "#  define strncpy(dest, src, n) __builtin_strncpy (dest, src, n)",
+    "#  define strncpy([^\n\
+]*\\\\\n\
+)*[^\n\
+]*",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Vsscanf fix
+ *  Description of Glibc_Tgmath fix
  */
-tSCC zHpux_VsscanfName[] =
-     "hpux_vsscanf";
+tSCC zGlibc_TgmathName[] =
+     "glibc_tgmath";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_VsscanfList[] =
-  "stdio.h\0";
+tSCC zGlibc_TgmathList[] =
+  "tgmath.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_VsscanfMachs[] = {
-        "*-*-hpux*",
-        (const char*)NULL };
+#define apzGlibc_TgmathMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_VsscanfSelect0[] =
-       "(extern int vsscanf\\()char";
+tSCC zGlibc_TgmathSelect0[] =
+       "\\(\\(\\(type\\) 0.25\\) && \\(\\(type\\) 0.25 - 1\\)\\)";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zGlibc_TgmathBypass0[] =
+       "__floating_type\\(type\\) \\\\\n\
+.*__builtin_classify_type";
 
-#define    HPUX_VSSCANF_TEST_CT  1
-static tTestDesc aHpux_VsscanfTests[] = {
-  { TT_EGREP,    zHpux_VsscanfSelect0, (regex_t*)NULL }, };
+#define    GLIBC_TGMATH_TEST_CT  2
+static tTestDesc aGlibc_TgmathTests[] = {
+  { TT_NEGREP,   zGlibc_TgmathBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zGlibc_TgmathSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_Vsscanf
+ *  Fix Command Arguments for Glibc_Tgmath
  */
-static const char* apzHpux_VsscanfPatch[] = {
+static const char* apzGlibc_TgmathPatch[] = {
     "format",
-    "%1const char",
+    "(__builtin_classify_type ((type) 0) == 8 || (__builtin_classify_type ((type) 0) == 9 && __builtin_classify_type (__real__ ((type) 0)) == 8))",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux8_Bogus_Inlines fix
+ *  Description of Gnu_Types fix
  */
-tSCC zHpux8_Bogus_InlinesName[] =
-     "hpux8_bogus_inlines";
+tSCC zGnu_TypesName[] =
+     "gnu_types";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux8_Bogus_InlinesList[] =
-  "math.h\0";
+tSCC zGnu_TypesList[] =
+  "sys/types.h\0stdlib.h\0sys/stdtypes.h\0stddef.h\0memory.h\0unistd.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzHpux8_Bogus_InlinesMachs (const char**)NULL
+tSCC* apzGnu_TypesMachs[] = {
+        "*-*-solaris2.1[0-9]*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux8_Bogus_InlinesSelect0[] =
-       "inline";
+tSCC zGnu_TypesSelect0[] =
+       "^[ \t]*typedef[ \t]+.*[ \t](ptrdiff|size|wchar)_t;";
 
 /*
  *  content bypass pattern - skip fix if pattern found
  */
-tSCC zHpux8_Bogus_InlinesBypass0[] =
-       "__GNUG__";
+tSCC zGnu_TypesBypass0[] =
+       "_GCC_(PTRDIFF|SIZE|WCHAR)_T";
 
-#define    HPUX8_BOGUS_INLINES_TEST_CT  2
-static tTestDesc aHpux8_Bogus_InlinesTests[] = {
-  { TT_NEGREP,   zHpux8_Bogus_InlinesBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zHpux8_Bogus_InlinesSelect0, (regex_t*)NULL }, };
+#define    GNU_TYPES_TEST_CT  2
+static tTestDesc aGnu_TypesTests[] = {
+  { TT_NEGREP,   zGnu_TypesBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zGnu_TypesSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux8_Bogus_Inlines
+ *  Fix Command Arguments for Gnu_Types
  */
-static const char* apzHpux8_Bogus_InlinesPatch[] = { sed_cmd_z,
-    "-e", "s@inline int abs(int [a-z][a-z]*) {.*}@extern \"C\" int abs(int);@",
-    "-e", "s@inline double abs(double [a-z][a-z]*) {.*}@@",
-    "-e", "s@inline int sqr(int [a-z][a-z]*) {.*}@@",
-    "-e", "s@inline double sqr(double [a-z][a-z]*) {.*}@@",
+static const char* apzGnu_TypesPatch[] = {
+    "gnu_type",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_C99_Intptr fix
+ *  Description of Hp_Inline fix
  */
-tSCC zHpux_C99_IntptrName[] =
-     "hpux_c99_intptr";
+tSCC zHp_InlineName[] =
+     "hp_inline";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_C99_IntptrList[] =
-  "stdint-hpux11.h\0stdint.h\0";
+tSCC zHp_InlineList[] =
+  "sys/spinlock.h\0machine/machparam.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_C99_IntptrMachs[] = {
-        "*-hp-hpux11.3*",
-        (const char*)NULL };
-#define HPUX_C99_INTPTR_TEST_CT  0
-#define aHpux_C99_IntptrTests   (tTestDesc*)NULL
+#define apzHp_InlineMachs (const char**)NULL
 
 /*
- *  Fix Command Arguments for Hpux_C99_Intptr
- */
-static const char* apzHpux_C99_IntptrPatch[] = { sed_cmd_z,
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MAX[ \t]*INT32_MAX[ \t]*$@#define PTRDIFF_MAX (2147483647l)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MIN[ \t]*INT32_MIN[ \t]*$@#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MAX[ \t]*INT32_MAX[ \t]*$@#define INTPTR_MAX (2147483647l)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MIN[ \t]*INT32_MIN[ \t]*$@#define INTPTR_MIN (-INTPTR_MAX - 1)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINTPTR_MAX[ \t]*UINT32_MAX[ \t]*$@#define UINTPTR_MAX (4294967295ul)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*SIZE_MAX[ \t]*UINT32_MAX[ \t]*$@#define SIZE_MAX (4294967295ul)@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux_C99_Inttypes fix
+ *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_C99_InttypesName[] =
-     "hpux_c99_inttypes";
+tSCC zHp_InlineSelect0[] =
+       "[ \t]*#[ \t]*include[ \t]+\"\\.\\./machine/";
 
-/*
- *  File name selection pattern
- */
-tSCC zHpux_C99_InttypesList[] =
-  "inttypes.h\0stdint-hpux11.h\0stdint.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux_C99_InttypesMachs[] = {
-        "*-hp-hpux11.[23]*",
-        (const char*)NULL };
-#define HPUX_C99_INTTYPES_TEST_CT  0
-#define aHpux_C99_InttypesTests   (tTestDesc*)NULL
+#define    HP_INLINE_TEST_CT  1
+static tTestDesc aHp_InlineTests[] = {
+  { TT_EGREP,    zHp_InlineSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_C99_Inttypes
+ *  Fix Command Arguments for Hp_Inline
  */
-static const char* apzHpux_C99_InttypesPatch[] = { sed_cmd_z,
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT8_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT16_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT32_C(__c)[ \t]*__CONCAT__(__c,l)[ \t]*$@#define INT32_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT32_C(__c)[ \t].*$@#define UINT32_C(__c) __CONCAT__(__c,u)@",
+static const char* apzHp_InlinePatch[] = {
+    "format",
+    "%1<machine/%2.h>",
+    "([ \t]*#[ \t]*include[ \t]+)\"\\.\\./machine/([a-z]+)\\.h\"",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_C99_Inttypes2 fix
+ *  Description of Hp_Sysfile fix
  */
-tSCC zHpux_C99_Inttypes2Name[] =
-     "hpux_c99_inttypes2";
+tSCC zHp_SysfileName[] =
+     "hp_sysfile";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_C99_Inttypes2List[] =
-  "stdint-hpux11.h\0stdint.h\0";
+tSCC zHp_SysfileList[] =
+  "sys/file.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_C99_Inttypes2Machs[] = {
-        "*-hp-hpux11.2*",
-        (const char*)NULL };
-#define HPUX_C99_INTTYPES2_TEST_CT  0
-#define aHpux_C99_Inttypes2Tests   (tTestDesc*)NULL
+#define apzHp_SysfileMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHp_SysfileSelect0[] =
+       "HPUX_SOURCE";
+
+#define    HP_SYSFILE_TEST_CT  1
+static tTestDesc aHp_SysfileTests[] = {
+  { TT_EGREP,    zHp_SysfileSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_C99_Inttypes2
+ *  Fix Command Arguments for Hp_Sysfile
  */
-static const char* apzHpux_C99_Inttypes2Patch[] = { sed_cmd_z,
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT8_C(__c)[ \t]*((signed char)(__c))[ \t]*$@#define INT8_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*((unsigned char)(__c))[ \t]*$@#define UINT8_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT16_C(__c)[ \t]*((short)(__c))[ \t]*$@#define INT16_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*((unsigned short)(__c))[ \t]*$@#define UINT16_C(__c) (__c)@",
+static const char* apzHp_SysfilePatch[] = {
+    "format",
+    "(struct file *, ...)",
+    "\\(\\.\\.\\.\\)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_C99_Inttypes3 fix
+ *  Description of Hppa_Hpux_Fp_Macros fix
  */
-tSCC zHpux_C99_Inttypes3Name[] =
-     "hpux_c99_inttypes3";
+tSCC zHppa_Hpux_Fp_MacrosName[] =
+     "hppa_hpux_fp_macros";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_C99_Inttypes3List[] =
-  "inttypes.h\0";
+tSCC zHppa_Hpux_Fp_MacrosList[] =
+  "math.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_C99_Inttypes3Machs[] = {
+tSCC* apzHppa_Hpux_Fp_MacrosMachs[] = {
         "hppa*-hp-hpux11*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_C99_Inttypes3Select0[] =
-       "#define[ \t]INTPTR_MAX[ \t]*\n\
-#define[ \t]UINTPTR_MAX[ \t]*\n";
+tSCC zHppa_Hpux_Fp_MacrosSelect0[] =
+       "#[ \t]*define[ \t]*FP_NORMAL.*\n\
+#[ \t]*define[ \t]*FP_ZERO.*\n\
+#[ \t]*define[ \t]*FP_INFINITE.*\n\
+#[ \t]*define[ \t]*FP_SUBNORMAL.*\n\
+#[ \t]*define[ \t]*FP_NAN.*\n";
 
-#define    HPUX_C99_INTTYPES3_TEST_CT  1
-static tTestDesc aHpux_C99_Inttypes3Tests[] = {
-  { TT_EGREP,    zHpux_C99_Inttypes3Select0, (regex_t*)NULL }, };
+#define    HPPA_HPUX_FP_MACROS_TEST_CT  1
+static tTestDesc aHppa_Hpux_Fp_MacrosTests[] = {
+  { TT_EGREP,    zHppa_Hpux_Fp_MacrosSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_C99_Inttypes3
+ *  Fix Command Arguments for Hppa_Hpux_Fp_Macros
  */
-static const char* apzHpux_C99_Inttypes3Patch[] = {
+static const char* apzHppa_Hpux_Fp_MacrosPatch[] = {
     "format",
-    "#undef SIZE_MAX\n\
-#define SIZE_MAX __SIZE_MAX__\n\
-#ifdef __INTPTR_MAX__\n\
-# undef INTPTR_MAX\n\
-# define INTPTR_MAX __INTPTR_MAX__\n\
-# undef INTPTR_MIN\n\
-# define INTPTR_MIN (-INTPTR_MAX - 1)\n\
-#endif\n\
-#ifdef __UINTPTR_MAX__\n\
-# undef UINTPTR_MAX\n\
-# define UINTPTR_MAX __UINTPTR_MAX__\n\
-#endif\n",
+    "#endif /* _INCLUDE_HPUX_SOURCE */\n\n\
+#if defined(_INCLUDE_HPUX_SOURCE) || \\\n\
+   (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))\n\
+%0#endif\n\n\
+#ifdef _INCLUDE_HPUX_SOURCE\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_C99_Inttypes4 fix
+ *  Description of Hpux11_Cpp_Pow_Inline fix
  */
-tSCC zHpux_C99_Inttypes4Name[] =
-     "hpux_c99_inttypes4";
+tSCC zHpux11_Cpp_Pow_InlineName[] =
+     "hpux11_cpp_pow_inline";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_C99_Inttypes4List[] =
-  "inttypes.h\0";
+tSCC zHpux11_Cpp_Pow_InlineList[] =
+  "fixinc-test-limits.h\0math.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_C99_Inttypes4Machs[] = {
-        "hppa*-hp-hpux11.[01]*",
-        (const char*)NULL };
-#define HPUX_C99_INTTYPES4_TEST_CT  0
-#define aHpux_C99_Inttypes4Tests   (tTestDesc*)NULL
+#define apzHpux11_Cpp_Pow_InlineMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_Cpp_Pow_InlineSelect0[] =
+       "^# +ifdef +__cplusplus\n\
+ +\\}\n\
+ +inline +double +pow\\(double +__d,int +__expon\\) +\\{\n\
+[ \t]+return +pow\\(__d,\\(double\\)__expon\\);\n\
+ +\\}\n\
+ +extern +\"C\" +\\{\n\
+#else\n\
+# +endif";
+
+#define    HPUX11_CPP_POW_INLINE_TEST_CT  1
+static tTestDesc aHpux11_Cpp_Pow_InlineTests[] = {
+  { TT_EGREP,    zHpux11_Cpp_Pow_InlineSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_C99_Inttypes4
+ *  Fix Command Arguments for Hpux11_Cpp_Pow_Inline
  */
-static const char* apzHpux_C99_Inttypes4Patch[] = { sed_cmd_z,
-    "-e", "/^[ \t]*#[ \t]*define[ \t]*SCNxMAX[ \t]*SCNx64/a\\\n\
-#define SCNuMAX \t SCNu64\n",
-    "-e", "/^[ \t]*#[ \t]*define[ \t]*SCNxMAX[ \t]*SCNx32/a\\\n\
-#define SCNuMAX \t SCNu32\n",
+static const char* apzHpux11_Cpp_Pow_InlinePatch[] = {
+    "format",
+    "",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_C99_Inttypes5 fix
+ *  Description of Hpux11_2_Cpp_Pow_Inline fix
  */
-tSCC zHpux_C99_Inttypes5Name[] =
-     "hpux_c99_inttypes5";
+tSCC zHpux11_2_Cpp_Pow_InlineName[] =
+     "hpux11_2_cpp_pow_inline";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_C99_Inttypes5List[] =
-  "inttypes.h\0";
+tSCC zHpux11_2_Cpp_Pow_InlineList[] =
+  "math.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_C99_Inttypes5Machs[] = {
-        "hppa*-hp-hpux11.[01]*",
-        (const char*)NULL };
+#define apzHpux11_2_Cpp_Pow_InlineMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_C99_Inttypes5Select0[] =
-       "#ifndef[ \t]_KERNEL[ \t]*\n";
+tSCC zHpux11_2_Cpp_Pow_InlineSelect0[] =
+       " +inline double pow\\(double d,int expon\\) \\{\n\
+ +return pow\\(d, \\(double\\)expon\\);\n\
+ +\\}\n";
 
-#define    HPUX_C99_INTTYPES5_TEST_CT  1
-static tTestDesc aHpux_C99_Inttypes5Tests[] = {
-  { TT_EGREP,    zHpux_C99_Inttypes5Select0, (regex_t*)NULL }, };
+#define    HPUX11_2_CPP_POW_INLINE_TEST_CT  1
+static tTestDesc aHpux11_2_Cpp_Pow_InlineTests[] = {
+  { TT_EGREP,    zHpux11_2_Cpp_Pow_InlineSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_C99_Inttypes5
+ *  Fix Command Arguments for Hpux11_2_Cpp_Pow_Inline
  */
-static const char* apzHpux_C99_Inttypes5Patch[] = {
+static const char* apzHpux11_2_Cpp_Pow_InlinePatch[] = {
     "format",
-    "#ifndef __LP64__\n\
-#define PRIdPTR\t\tPRId32\n\
-#define PRIiPTR\t\tPRIi32\n\
-#define PRIoPTR\t\tPRIo32\n\
-#define PRIuPTR\t\tPRIu32\n\
-#define PRIxPTR\t\tPRIx32\n\
-#define PRIXPTR\t\tPRIX32\n\
-#else\n\
-#define PRIdPTR\t\tPRId64\n\
-#define PRIiPTR\t\tPRIi64\n\
-#define PRIoPTR\t\tPRIo64\n\
-#define PRIuPTR\t\tPRIu64\n\
-#define PRIxPTR\t\tPRIx64\n\
-#define PRIXPTR\t\tPRIX64\n\
-#endif\n\n\
-#ifndef _KERNEL\n",
+    "",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Ctype_Macros fix
+ *  Description of Hpux_Math_Constexpr fix
  */
-tSCC zHpux_Ctype_MacrosName[] =
-     "hpux_ctype_macros";
+tSCC zHpux_Math_ConstexprName[] =
+     "hpux_math_constexpr";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_Ctype_MacrosList[] =
-  "ctype.h\0";
+tSCC zHpux_Math_ConstexprList[] =
+  "math.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzHpux_Ctype_MacrosMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux_Ctype_MacrosSelect0[] =
-       "((: |\\()__SB_masks \\? )(__SB_masks\\[__(alnum|c)\\] & _IS)";
-
-#define    HPUX_CTYPE_MACROS_TEST_CT  1
-static tTestDesc aHpux_Ctype_MacrosTests[] = {
-  { TT_EGREP,    zHpux_Ctype_MacrosSelect0, (regex_t*)NULL }, };
+tSCC* apzHpux_Math_ConstexprMachs[] = {
+        "*-hp-hpux11*",
+        (const char*)NULL };
+#define HPUX_MATH_CONSTEXPR_TEST_CT  0
+#define aHpux_Math_ConstexprTests   (tTestDesc*)NULL
 
 /*
- *  Fix Command Arguments for Hpux_Ctype_Macros
+ *  Fix Command Arguments for Hpux_Math_Constexpr
  */
-static const char* apzHpux_Ctype_MacrosPatch[] = {
-    "format",
-    "%1(int)%3",
+static const char* apzHpux_Math_ConstexprPatch[] = { sed_cmd_z,
+    "-e", "s@^[ \t]*extern[ \t]*const[ \t]*double[ \t]*_DINFINITY;[ \t]*$@#  define _DINFINITY (__builtin_inf ())@",
+    "-e", "s@^[ \t]*extern[ \t]*const[ \t]*float[ \t]*_SINFINITY;[ \t]*$@#    define _SINFINITY (__builtin_inff ())@",
+    "-e", "s@^[ \t]*extern[ \t]*const[ \t]*float[ \t]*_SQNAN;[ \t]*$@#    define _SQNAN (__builtin_nanf (\\\"\\\"))@",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -5481,7 +4527,6 @@  tSCC zHpux_Extern_ErrnoList[] =
  *  Machine/OS name selection pattern
  */
 tSCC* apzHpux_Extern_ErrnoMachs[] = {
-        "*-hp-hpux10.*",
         "*-hp-hpux11.[0-2]*",
         (const char*)NULL };
 
@@ -5639,7 +4684,6 @@  tSCC zHpux_Long_DoubleList[] =
  *  Machine/OS name selection pattern
  */
 tSCC* apzHpux_Long_DoubleMachs[] = {
-        "*-*-hpux10*",
         "*-*-hpux11.[012]*",
         (const char*)NULL };
 
@@ -5858,41 +4902,6 @@  static const char* apzHpux_LongjmpPatch[] = {
     "%0 __attribute__ ((__noreturn__))",
     (char*)NULL };
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux_Systime fix
- */
-tSCC zHpux_SystimeName[] =
-     "hpux_systime";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux_SystimeList[] =
-  "sys/time.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzHpux_SystimeMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux_SystimeSelect0[] =
-       "^extern struct sigevent;";
-
-#define    HPUX_SYSTIME_TEST_CT  1
-static tTestDesc aHpux_SystimeTests[] = {
-  { TT_EGREP,    zHpux_SystimeSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux_Systime
- */
-static const char* apzHpux_SystimePatch[] = {
-    "format",
-    "struct sigevent;",
-    (char*)NULL };
-
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Huge_Val_Hex fix
@@ -10872,9 +9881,9 @@  static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          305
+#define REGEX_COUNT          280
 #define MACH_LIST_SIZE_LIMIT 187
-#define FIX_COUNT            267
+#define FIX_COUNT            242
 
 /*
  *  Enumerate the fixes
@@ -10934,7 +9943,6 @@  typedef enum {
     AVOID_BOOL_DEFINE_FIXIDX,
     AVOID_BOOL_TYPE_FIXIDX,
     AVOID_WCHAR_T_TYPE_FIXIDX,
-    BAD_STRUCT_TERM_FIXIDX,
     BADQUOTE_FIXIDX,
     BROKEN_ASSERT_STDIO_FIXIDX,
     BROKEN_ASSERT_STDLIB_FIXIDX,
@@ -10985,32 +9993,9 @@  typedef enum {
     HP_INLINE_FIXIDX,
     HP_SYSFILE_FIXIDX,
     HPPA_HPUX_FP_MACROS_FIXIDX,
-    HPUX10_CPP_POW_INLINE_FIXIDX,
     HPUX11_CPP_POW_INLINE_FIXIDX,
+    HPUX11_2_CPP_POW_INLINE_FIXIDX,
     HPUX_MATH_CONSTEXPR_FIXIDX,
-    HPUX10_CTYPE_DECLARATIONS1_FIXIDX,
-    HPUX10_CTYPE_DECLARATIONS2_FIXIDX,
-    HPUX10_STDIO_DECLARATIONS_FIXIDX,
-    HPPA_HPUX11_ALLOCA_FIXIDX,
-    HPUX11_ABS_FIXIDX,
-    HPUX11_LWP_RWLOCK_VALID_FIXIDX,
-    HPUX11_EXTERN_SENDFILE_FIXIDX,
-    HPUX11_EXTERN_SENDPATH_FIXIDX,
-    HPUX11_FABSF_FIXIDX,
-    HPUX11_PTHREAD_POINTER_FIXIDX,
-    HPUX11_PTHREAD_CONST_FIXIDX,
-    HPUX11_SIZE_T_FIXIDX,
-    HPUX11_SNPRINTF_FIXIDX,
-    HPUX11_VSNPRINTF_FIXIDX,
-    HPUX_VSSCANF_FIXIDX,
-    HPUX8_BOGUS_INLINES_FIXIDX,
-    HPUX_C99_INTPTR_FIXIDX,
-    HPUX_C99_INTTYPES_FIXIDX,
-    HPUX_C99_INTTYPES2_FIXIDX,
-    HPUX_C99_INTTYPES3_FIXIDX,
-    HPUX_C99_INTTYPES4_FIXIDX,
-    HPUX_C99_INTTYPES5_FIXIDX,
-    HPUX_CTYPE_MACROS_FIXIDX,
     HPUX_EXTERN_ERRNO_FIXIDX,
     HPUX_HTONL_FIXIDX,
     HPUX_IMAGINARY_I_FIXIDX,
@@ -11021,7 +10006,6 @@  typedef enum {
     HPUX_SPU_INFO_FIXIDX,
     HPUX_STDINT_LEAST_FAST_FIXIDX,
     HPUX_LONGJMP_FIXIDX,
-    HPUX_SYSTIME_FIXIDX,
     HUGE_VAL_HEX_FIXIDX,
     HUGE_VALF_HEX_FIXIDX,
     HUGE_VALL_HEX_FIXIDX,
@@ -11420,11 +10404,6 @@  tFixDesc fixDescList[ FIX_COUNT ] = {
      AVOID_WCHAR_T_TYPE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAvoid_Wchar_T_TypeTests,   apzAvoid_Wchar_T_TypePatch, 0 },
 
-  {  zBad_Struct_TermName,    zBad_Struct_TermList,
-     apzBad_Struct_TermMachs,
-     BAD_STRUCT_TERM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aBad_Struct_TermTests,   apzBad_Struct_TermPatch, 0 },
-
   {  zBadquoteName,    zBadquoteList,
      apzBadquoteMachs,
      BADQUOTE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -11675,136 +10654,21 @@  tFixDesc fixDescList[ FIX_COUNT ] = {
      HPPA_HPUX_FP_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHppa_Hpux_Fp_MacrosTests,   apzHppa_Hpux_Fp_MacrosPatch, 0 },
 
-  {  zHpux10_Cpp_Pow_InlineName,    zHpux10_Cpp_Pow_InlineList,
-     apzHpux10_Cpp_Pow_InlineMachs,
-     HPUX10_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux10_Cpp_Pow_InlineTests,   apzHpux10_Cpp_Pow_InlinePatch, 0 },
-
   {  zHpux11_Cpp_Pow_InlineName,    zHpux11_Cpp_Pow_InlineList,
      apzHpux11_Cpp_Pow_InlineMachs,
      HPUX11_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux11_Cpp_Pow_InlineTests,   apzHpux11_Cpp_Pow_InlinePatch, 0 },
 
+  {  zHpux11_2_Cpp_Pow_InlineName,    zHpux11_2_Cpp_Pow_InlineList,
+     apzHpux11_2_Cpp_Pow_InlineMachs,
+     HPUX11_2_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux11_2_Cpp_Pow_InlineTests,   apzHpux11_2_Cpp_Pow_InlinePatch, 0 },
+
   {  zHpux_Math_ConstexprName,    zHpux_Math_ConstexprList,
      apzHpux_Math_ConstexprMachs,
      HPUX_MATH_CONSTEXPR_TEST_CT, FD_MACH_ONLY,
      aHpux_Math_ConstexprTests,   apzHpux_Math_ConstexprPatch, 0 },
 
-  {  zHpux10_Ctype_Declarations1Name,    zHpux10_Ctype_Declarations1List,
-     apzHpux10_Ctype_Declarations1Machs,
-     HPUX10_CTYPE_DECLARATIONS1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux10_Ctype_Declarations1Tests,   apzHpux10_Ctype_Declarations1Patch, 0 },
-
-  {  zHpux10_Ctype_Declarations2Name,    zHpux10_Ctype_Declarations2List,
-     apzHpux10_Ctype_Declarations2Machs,
-     HPUX10_CTYPE_DECLARATIONS2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux10_Ctype_Declarations2Tests,   apzHpux10_Ctype_Declarations2Patch, 0 },
-
-  {  zHpux10_Stdio_DeclarationsName,    zHpux10_Stdio_DeclarationsList,
-     apzHpux10_Stdio_DeclarationsMachs,
-     HPUX10_STDIO_DECLARATIONS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux10_Stdio_DeclarationsTests,   apzHpux10_Stdio_DeclarationsPatch, 0 },
-
-  {  zHppa_Hpux11_AllocaName,    zHppa_Hpux11_AllocaList,
-     apzHppa_Hpux11_AllocaMachs,
-     HPPA_HPUX11_ALLOCA_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHppa_Hpux11_AllocaTests,   apzHppa_Hpux11_AllocaPatch, 0 },
-
-  {  zHpux11_AbsName,    zHpux11_AbsList,
-     apzHpux11_AbsMachs,
-     HPUX11_ABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_AbsTests,   apzHpux11_AbsPatch, 0 },
-
-  {  zHpux11_Lwp_Rwlock_ValidName,    zHpux11_Lwp_Rwlock_ValidList,
-     apzHpux11_Lwp_Rwlock_ValidMachs,
-     HPUX11_LWP_RWLOCK_VALID_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_Lwp_Rwlock_ValidTests,   apzHpux11_Lwp_Rwlock_ValidPatch, 0 },
-
-  {  zHpux11_Extern_SendfileName,    zHpux11_Extern_SendfileList,
-     apzHpux11_Extern_SendfileMachs,
-     HPUX11_EXTERN_SENDFILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_Extern_SendfileTests,   apzHpux11_Extern_SendfilePatch, 0 },
-
-  {  zHpux11_Extern_SendpathName,    zHpux11_Extern_SendpathList,
-     apzHpux11_Extern_SendpathMachs,
-     HPUX11_EXTERN_SENDPATH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_Extern_SendpathTests,   apzHpux11_Extern_SendpathPatch, 0 },
-
-  {  zHpux11_FabsfName,    zHpux11_FabsfList,
-     apzHpux11_FabsfMachs,
-     HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_FabsfTests,   apzHpux11_FabsfPatch, 0 },
-
-  {  zHpux11_Pthread_PointerName,    zHpux11_Pthread_PointerList,
-     apzHpux11_Pthread_PointerMachs,
-     HPUX11_PTHREAD_POINTER_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_Pthread_PointerTests,   apzHpux11_Pthread_PointerPatch, 0 },
-
-  {  zHpux11_Pthread_ConstName,    zHpux11_Pthread_ConstList,
-     apzHpux11_Pthread_ConstMachs,
-     HPUX11_PTHREAD_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_Pthread_ConstTests,   apzHpux11_Pthread_ConstPatch, 0 },
-
-  {  zHpux11_Size_TName,    zHpux11_Size_TList,
-     apzHpux11_Size_TMachs,
-     HPUX11_SIZE_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_Size_TTests,   apzHpux11_Size_TPatch, 0 },
-
-  {  zHpux11_SnprintfName,    zHpux11_SnprintfList,
-     apzHpux11_SnprintfMachs,
-     HPUX11_SNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_SnprintfTests,   apzHpux11_SnprintfPatch, 0 },
-
-  {  zHpux11_VsnprintfName,    zHpux11_VsnprintfList,
-     apzHpux11_VsnprintfMachs,
-     HPUX11_VSNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_VsnprintfTests,   apzHpux11_VsnprintfPatch, 0 },
-
-  {  zHpux_VsscanfName,    zHpux_VsscanfList,
-     apzHpux_VsscanfMachs,
-     HPUX_VSSCANF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_VsscanfTests,   apzHpux_VsscanfPatch, 0 },
-
-  {  zHpux8_Bogus_InlinesName,    zHpux8_Bogus_InlinesList,
-     apzHpux8_Bogus_InlinesMachs,
-     HPUX8_BOGUS_INLINES_TEST_CT, FD_MACH_ONLY,
-     aHpux8_Bogus_InlinesTests,   apzHpux8_Bogus_InlinesPatch, 0 },
-
-  {  zHpux_C99_IntptrName,    zHpux_C99_IntptrList,
-     apzHpux_C99_IntptrMachs,
-     HPUX_C99_INTPTR_TEST_CT, FD_MACH_ONLY,
-     aHpux_C99_IntptrTests,   apzHpux_C99_IntptrPatch, 0 },
-
-  {  zHpux_C99_InttypesName,    zHpux_C99_InttypesList,
-     apzHpux_C99_InttypesMachs,
-     HPUX_C99_INTTYPES_TEST_CT, FD_MACH_ONLY,
-     aHpux_C99_InttypesTests,   apzHpux_C99_InttypesPatch, 0 },
-
-  {  zHpux_C99_Inttypes2Name,    zHpux_C99_Inttypes2List,
-     apzHpux_C99_Inttypes2Machs,
-     HPUX_C99_INTTYPES2_TEST_CT, FD_MACH_ONLY,
-     aHpux_C99_Inttypes2Tests,   apzHpux_C99_Inttypes2Patch, 0 },
-
-  {  zHpux_C99_Inttypes3Name,    zHpux_C99_Inttypes3List,
-     apzHpux_C99_Inttypes3Machs,
-     HPUX_C99_INTTYPES3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_C99_Inttypes3Tests,   apzHpux_C99_Inttypes3Patch, 0 },
-
-  {  zHpux_C99_Inttypes4Name,    zHpux_C99_Inttypes4List,
-     apzHpux_C99_Inttypes4Machs,
-     HPUX_C99_INTTYPES4_TEST_CT, FD_MACH_ONLY,
-     aHpux_C99_Inttypes4Tests,   apzHpux_C99_Inttypes4Patch, 0 },
-
-  {  zHpux_C99_Inttypes5Name,    zHpux_C99_Inttypes5List,
-     apzHpux_C99_Inttypes5Machs,
-     HPUX_C99_INTTYPES5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_C99_Inttypes5Tests,   apzHpux_C99_Inttypes5Patch, 0 },
-
-  {  zHpux_Ctype_MacrosName,    zHpux_Ctype_MacrosList,
-     apzHpux_Ctype_MacrosMachs,
-     HPUX_CTYPE_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_Ctype_MacrosTests,   apzHpux_Ctype_MacrosPatch, 0 },
-
   {  zHpux_Extern_ErrnoName,    zHpux_Extern_ErrnoList,
      apzHpux_Extern_ErrnoMachs,
      HPUX_EXTERN_ERRNO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -11855,11 +10719,6 @@  tFixDesc fixDescList[ FIX_COUNT ] = {
      HPUX_LONGJMP_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux_LongjmpTests,   apzHpux_LongjmpPatch, 0 },
 
-  {  zHpux_SystimeName,    zHpux_SystimeList,
-     apzHpux_SystimeMachs,
-     HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_SystimeTests,   apzHpux_SystimePatch, 0 },
-
   {  zHuge_Val_HexName,    zHuge_Val_HexList,
      apzHuge_Val_HexMachs,
      HUGE_VAL_HEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 7605ac89aa2..efd757ecc21 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -1154,19 +1154,6 @@  fix = {
     test_text = "typedef unsigned short\twchar_t \t; /* wchar_t\n type */";
 };
 
-/*
- *  Fix `typedef struct term;' on hppa1.1-hp-hpux9.
- */
-fix = {
-    hackname  = bad_struct_term;
-    files     = curses.h;
-    select    = "^[ \t]*typedef[ \t]+struct[ \t]+term[ \t]*;";
-    c_fix     = format;
-    c_fix_arg = "struct term;";
-
-    test_text = 'typedef struct term;';
-};
-
 /*
  *  Fix one other error in this file:
  *  a mismatched quote not inside a C comment.
@@ -2236,11 +2223,11 @@  fix = {
 };
 
 /*
- * Delete C++ double pow (double, int) inline function from HP-UX 10 & 11
+ * Delete C++ double pow (double, int) inline function from HP-UX 11
  * math.h to prevent clash with define in c_std/bits/std_cmath.h.
  */
 fix = {
-    hackname  = hpux10_cpp_pow_inline;
+    hackname  = hpux11_cpp_pow_inline;
     files     = fixinc-test-limits.h, math.h;
     select    = <<-	END_POW_INLINE
 	^# +ifdef +__cplusplus
@@ -2268,7 +2255,7 @@  fix = {
 };
 
 fix = {
-     hackname  = hpux11_cpp_pow_inline;
+     hackname  = hpux11_2_cpp_pow_inline;
      files     = math.h;
      select    = " +inline double pow\\(double d,int expon\\) \\{\n"
                  " +return pow\\(d, \\(double\\)expon\\);\n"
@@ -2300,452 +2287,11 @@  fix = {
 		"  extern const float _SQNAN;";
 };
 
-/*
- *  Fix hpux 10.X missing ctype declarations 1
- */
-fix = {
-    hackname = hpux10_ctype_declarations1;
-    files    = ctype.h;
-    select   = "^#[ \t]*define _toupper\\(__c\\)[ \t]*__toupper\\(__c\\)";
-    bypass   = "^[ \t]*extern[ \t]*int[ \t]*__tolower[ \t]*\\(";
-    c_fix     = format;
-    c_fix_arg = "#ifdef _PROTOTYPES\n"
-		"extern int __tolower(int);\n"
-		"extern int __toupper(int);\n"
-		"#else /* NOT _PROTOTYPES */\n"
-		"extern int __tolower();\n"
-		"extern int __toupper();\n"
-		"#endif /* _PROTOTYPES */\n\n"
-		"%0\n";
-
-    test_text = "#  define _toupper(__c)         __toupper(__c)\n";
-};
-
-/*
- *  Fix hpux 10.X missing ctype declarations 2
- */
-fix = {
-    hackname = hpux10_ctype_declarations2;
-    files    = ctype.h;
-    select   = "^#  if defined\\(_SB_CTYPE_MACROS\\) && \\!defined\\(__lint\\)";
-    bypass   = "^[ \t]*extern[ \t]*int[ \t]*_isalnum[ \t]*\\(";
-    c_fix     = format;
-    c_fix_arg = "%0\n\n"
-		"#ifdef _PROTOTYPES\n"
-		"     extern int _isalnum(int);\n"
-		"     extern int _isalpha(int);\n"
-		"     extern int _iscntrl(int);\n"
-		"     extern int _isdigit(int);\n"
-		"     extern int _isgraph(int);\n"
-		"     extern int _islower(int);\n"
-		"     extern int _isprint(int);\n"
-		"     extern int _ispunct(int);\n"
-		"     extern int _isspace(int);\n"
-		"     extern int _isupper(int);\n"
-		"     extern int _isxdigit(int);\n"
-		"#  else /* not _PROTOTYPES */\n"
-		"     extern int _isalnum();\n"
-		"     extern int _isalpha();\n"
-		"     extern int _iscntrl();\n"
-		"     extern int _isdigit();\n"
-		"     extern int _isgraph();\n"
-		"     extern int _islower();\n"
-		"     extern int _isprint();\n"
-		"     extern int _ispunct();\n"
-		"     extern int _isspace();\n"
-		"     extern int _isupper();\n"
-		"     extern int _isxdigit();\n"
-		"#endif /* _PROTOTYPES */\n";
-
-    test_text = "#  if defined(_SB_CTYPE_MACROS) && !defined(__lint)\n"
-		"     extern unsigned int *__SB_masks;\n";
-};
-
-/*
- *  Fix hpux 10.X missing stdio declarations
- */
-fix = {
-    hackname = hpux10_stdio_declarations;
-    files    = stdio.h;
-    select   = "^#[ \t]*define _iob[ \t]*__iob";
-    bypass   = "^[ \t]*extern[ \t]*int[ \t]*vsnprintf[ \t]*\\(";
-    c_fix     = format;
-    c_fix_arg = "%0\n\n"
-	"#  if defined(__STDC__) || defined(__cplusplus)\n"
-	"     extern int snprintf(char *, size_t, const char *, ...);\n"
-	"     extern int vsnprintf(char *, size_t, const char *, __va_list);\n"
-	"#  else /* not __STDC__) || __cplusplus */\n"
-	"     extern int snprintf();\n"
-	"     extern int vsnprintf();\n"
-	"#  endif /* __STDC__) || __cplusplus */\n";
-
-    test_text = "#  define _iob __iob\n";
-};
-
-/*
- *  The HP-UX stddef.h is replaced by gcc's. It doesn't include sys/stdsyms.h.
- *  As a result, we need to include sys/stdsyms.h in alloca.h.
- */
-fix = {
-    hackname  = hppa_hpux11_alloca;
-    mach      = "hppa*-*-hpux11*";
-    files     = alloca.h;
-    select    = "#ifndef _STDDEF_INCLUDED";
-    c_fix     = format;
-    c_fix_arg = "#ifndef _SYS_STDSYMS_INCLUDED\n"
-		"#  include <sys/stdsyms.h>\n"
-		"#endif /* _SYS_STDSYMS_INCLUDED */\n\n"
-		"%0";
-
-    test_text = "#ifndef _STDDEF_INCLUDED";
-};
-
-/*
- *  Make sure hpux defines abs in header.
- */
-fix = {
-    hackname  = hpux11_abs;
-    mach      = "*-hp-hpux11*";
-    files     = stdlib.h;
-    select    = "ifndef _MATH_INCLUDED";
-    c_fix     = format;
-    c_fix_arg = "if !defined(_MATH_INCLUDED) || defined(__GNUG__)";
-    test_text = "#ifndef _MATH_INCLUDED";
-};
-
-/*
- *  Fix hpux11 __LWP_RWLOCK_VALID define
- */
-fix = {
-    hackname  = hpux11_lwp_rwlock_valid;
-    mach      = "*-hp-hpux11*";
-    files     = sys/pthread.h;
-    select    = "#define __LWP_RWLOCK_VALID[ \t]*0x8c91";
-    c_fix     = format;
-    c_fix_arg = "#define __LWP_RWLOCK_VALID              -29551";
-    test_text = "#define __LWP_RWLOCK_VALID 0x8c91";
-};
-
-/*
- * hpux sendfile()
- */
-fix = {
-    hackname  = hpux11_extern_sendfile;
-    mach      = "*-hp-hpux11.[12]*";
-    files     = sys/socket.h;
-    select    = "^[ \t]*extern sbsize_t sendfile.*\n.*, int\\)\\);\n";
-    c_fix     = format;
-    c_fix_arg = "#ifndef _APP32_64BIT_OFF_T\n%0#endif\n";
-    test_text = "   extern sbsize_t sendfile __((int, int, off_t, bsize_t,\n"
-        "                               const struct iovec *, int));\n";
-};
-
-/*
- * hpux sendpath()
- */
-fix = {
-    hackname  = hpux11_extern_sendpath;
-    mach      = "*-hp-hpux11.[12]*";
-    files     = sys/socket.h;
-    select    = "^[ \t]*extern sbsize_t sendpath.*\n.*, int\\)\\);\n";
-    c_fix     = format;
-    c_fix_arg = "#ifndef _APP32_64BIT_OFF_T\n%0#endif\n";
-    test_text = "   extern sbsize_t sendpath __((int, int, off_t, bsize_t,\n"
-        "                               const struct iovec *, int));\n";
-};
-
-/*
- *  Keep HP-UX 11 from stomping on C++ math namespace
- *  with defines for fabsf.
- */
-fix = {
-    hackname  = hpux11_fabsf;
-    mach      = "*-hp-hpux11*";
-    files     = math.h;
-    select    = "^[ \t]*#[ \t]*define[ \t]+fabsf\\(.*";
-
-    c_fix     = format;
-    c_fix_arg = "#ifndef __cplusplus\n%0\n#endif";
-
-    test_text =
-    "#ifdef _PA_RISC\n"
-    "#  define fabsf(x) ((float)fabs((double)(float)(x)))\n"
-    "#endif";
-};
-
-/*
- *  The definitions for PTHREAD_MUTEX_INITIALIZER and similar initializers
- *  in pthread.h need to be constant expressions to be standard complient.
- *  As a result, we need to remove the void * casts in the initializers
- *  (see hpux11_pthread_const) and to change the __(M|C|RW)POINTER defines
- *  to use the long type.
- */
-fix = {
-    hackname  = hpux11_pthread_pointer;
-    mach      = "*-hp-hpux11.[0-3]*";
-    files     = sys/pthread.h;
-    select    = "(void[ \t]*\\*)(m|c|rw)(_ptr)";
-
-    c_fix     = format;
-    c_fix_arg = "long\t%2%3";
-    test_text = "#define __MPOINTER\t\tvoid\t *m_ptr";
-};
-
-/*
- *  Remove void pointer cast and fix C99 constant in __POINTER_SET defines.
- */
-fix = {
-    hackname  = hpux11_pthread_const;
-    mach      = "*-hp-hpux11.[0-3]*";
-    files     = sys/pthread.h;
-    select    = "^(#define[ \t]+__POINTER_SET[ \t0,]*)(.*\\))";
-
-    c_fix     = format;
-    c_fix_arg = "%11";
-    test_text = "#define __POINTER_SET\t\t((void *) 1LL)";
-};
-
-/*
- * Prevent HP-UX 11 from defining __size_t and preventing size_t from
- * being defined by having it define _hpux_size_t instead.
- */
-fix = {
-    hackname  = hpux11_size_t;
-    mach      = "*-hp-hpux11*";
-    select    = "__size_t";
-
-    c_fix     = format;
-    c_fix_arg = "_hpux_size_t";
-
-    test_text =
-    "#define __size_t size_t\n"
-    "       extern int getpwuid_r( char *, __size_t, struct passwd **);\n";
-};
-
-/*
- *  Fix hpux 11.00 broken snprintf declaration
- *  (third argument is char *, needs to be const char * to prevent
- *  spurious warnings with -Wwrite-strings or in C++).
- */
-fix = {
-    hackname = hpux11_snprintf;
-    files    = stdio.h;
-    select   = '(extern int snprintf *\(char *\*, *(|__|_hpux_)size_t,)'
-                                    ' *(char *\*, *\.\.\.\);)';
-    c_fix     = format;
-    c_fix_arg = '%1 const %3';
-
-    test_text = "extern int snprintf(char *, size_t, char *, ...);\n"
-                "extern int snprintf(char *, __size_t, char *, ...);\n"
-                "extern int snprintf(char *, _hpux_size_t, char *, ...);";
-};
-
-/*
- *  Fix hpux 11.00 broken vsnprintf declaration
- */
-fix = {
-    hackname = hpux11_vsnprintf;
-    files    = stdio.h;
-    select   = '(extern int vsnprintf\(char \*, _[hpux]*_size_t, '
-                                     'const char \*,) __va__list\);';
-    c_fix     = format;
-    c_fix_arg = "%1 __va_list);";
-
-    test_text = 'extern int vsnprintf(char *, _hpux_size_t, const char *,'
-                                     ' __va__list);';
-};
-
-/*
- *  Fix missing const in hpux vsscanf declaration
- */
-fix = {
-    hackname = hpux_vsscanf;
-    mach    = "*-*-hpux*";
-    files   = stdio.h;
-    select  = '(extern int vsscanf\()char';
-    c_fix   = format;
-    c_fix_arg = "%1const char";
-
-    test_text = 'extern int vsscanf(char *, const char *, __va_list);';
-};
-
-/*
- *  get rid of bogus inline definitions in HP-UX 8.0
- */
-fix = {
-    hackname = hpux8_bogus_inlines;
-    files    = math.h;
-    select   = inline;
-    bypass   = "__GNUG__";
-    sed = "s@inline int abs(int [a-z][a-z]*) {.*}"
-           "@extern \"C\" int abs(int);@";
-    sed = "s@inline double abs(double [a-z][a-z]*) {.*}@@";
-    sed = "s@inline int sqr(int [a-z][a-z]*) {.*}@@";
-    sed = "s@inline double sqr(double [a-z][a-z]*) {.*}@@";
-    test_text = "inline int abs(int v) { return (v>=0)?v:-v; }\n"
-                "inline double sqr(double v) { return v**0.5; }";
-};
-
-/*
- * hpux intptr
- */
-fix = {
-    hackname  = hpux_c99_intptr;
-    mach      = "*-hp-hpux11.3*";
-    files     = stdint-hpux11.h, stdint.h;
-    sed       = "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MAX[ \t]*"
-        "INT32_MAX[ \t]*$@#define PTRDIFF_MAX (2147483647l)@";
-    sed       = "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MIN[ \t]*"
-        "INT32_MIN[ \t]*$@#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)@";
-    sed       = "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MAX[ \t]*"
-        "INT32_MAX[ \t]*$@#define INTPTR_MAX (2147483647l)@";
-    sed       = "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MIN[ \t]*"
-        "INT32_MIN[ \t]*$@#define INTPTR_MIN (-INTPTR_MAX - 1)@";
-    sed       = "s@^[ \t]*#[ \t]*define[ \t]*UINTPTR_MAX[ \t]*"
-        "UINT32_MAX[ \t]*$@#define UINTPTR_MAX (4294967295ul)@";
-    sed       = "s@^[ \t]*#[ \t]*define[ \t]*SIZE_MAX[ \t]*"
-        "UINT32_MAX[ \t]*$@#define SIZE_MAX (4294967295ul)@";
-    test_text = "#define PTRDIFF_MAX	INT32_MAX\n"
-		"#define PTRDIFF_MIN	INT32_MIN\n"
-		"#define INTPTR_MAX	INT32_MAX\n"
-		"#define INTPTR_MIN	INT32_MIN\n"
-		"#define UINTPTR_MAX	UINT32_MAX\n"
-		"#define SIZE_MAX	UINT32_MAX\n";
-};
-
-/*
- * These hacks are need in inttypes.h on 11.23 and in stdint.h on 11.31.
- */
-fix = {
-    hackname  = hpux_c99_inttypes;
-    mach      = "*-hp-hpux11.[23]*";
-    files     = inttypes.h;
-    files     = stdint-hpux11.h, stdint.h;
-    sed       = "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*"
-        "__CONCAT_U__(__c)[ \t]*$@#define UINT8_C(__c) (__c)@";
-    sed       = "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*"
-        "__CONCAT_U__(__c)[ \t]*$@#define UINT16_C(__c) (__c)@";
-    sed       = "s@^[ \t]*#[ \t]*define[ \t]*INT32_C(__c)[ \t]*"
-        "__CONCAT__(__c,l)[ \t]*$@#define INT32_C(__c) (__c)@";
-    sed       = "s@^[ \t]*#[ \t]*define[ \t]*UINT32_C(__c)[ \t].*$@"
-        "#define UINT32_C(__c) __CONCAT__(__c,u)@";
-    test_text = "#define UINT8_C(__c)     __CONCAT_U__(__c)\n"
-                "#define UINT16_C(__c)    __CONCAT_U__(__c)\n"
-		"#define INT32_C(__c)     __CONCAT__(__c,l)\n"
-		"#define UINT32_C(__c)     __CONCAT__(__c,ul)\n";
-};
-
-/*
- * These hacks are need in inttypes.h on 11.23 and in stdint.h on 11.31.
- */
-fix = {
-    hackname  = hpux_c99_inttypes2;
-    mach      = "*-hp-hpux11.2*";
-    files     = stdint-hpux11.h, stdint.h;
-    sed       = "s@^[ \t]*#[ \t]*define[ \t]*INT8_C(__c)[ \t]*"
-        "((signed char)(__c))[ \t]*$@#define INT8_C(__c) (__c)@";
-    sed       = "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*"
-        "((unsigned char)(__c))[ \t]*$@#define UINT8_C(__c) (__c)@";
-    sed       = "s@^[ \t]*#[ \t]*define[ \t]*INT16_C(__c)[ \t]*"
-        "((short)(__c))[ \t]*$@#define INT16_C(__c) (__c)@";
-    sed       = "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*"
-        "((unsigned short)(__c))[ \t]*$@#define UINT16_C(__c) (__c)@";
-    test_text = "#  define	INT8_C(__c)	((signed char)(__c))\n"
-                "#  define      UINT8_C(__c)    ((unsigned char)(__c))\n"
-		"#  define      INT16_C(__c)    ((short)(__c))\n"
-		"#  define	UINT16_C(__c)	((unsigned short)(__c))\n";
-};
-
-/*
- * Fix broken and missing defines in inttypes.h
- */
-fix = {
-    hackname  = hpux_c99_inttypes3;
-    mach      = "hppa*-hp-hpux11*";
-    files     = inttypes.h;
-    select    = "#define[ \t]INTPTR_MAX[ \t]*\n"
-		"#define[ \t]UINTPTR_MAX[ \t]*\n";
-    c_fix     = format;
-    c_fix_arg = "#undef SIZE_MAX\n"
-		"#define SIZE_MAX __SIZE_MAX__\n"
-		"#ifdef __INTPTR_MAX__\n"
-		"# undef INTPTR_MAX\n"
-		"# define INTPTR_MAX __INTPTR_MAX__\n"
-		"# undef INTPTR_MIN\n"
-		"# define INTPTR_MIN (-INTPTR_MAX - 1)\n"
-		"#endif\n"
-		"#ifdef __UINTPTR_MAX__\n"
-		"# undef UINTPTR_MAX\n"
-		"# define UINTPTR_MAX __UINTPTR_MAX__\n"
-		"#endif\n";
-    test_text = "#define INTPTR_MAX\n"
-		"#define UINTPTR_MAX\n";
-};
-
-/*
- * Fix missing SCNuMAX defines in inttypes.h
- */
-fix = {
-    hackname  = hpux_c99_inttypes4;
-    mach      = "hppa*-hp-hpux11.[01]*";
-    files     = inttypes.h;
-    sed       = "/^[ \t]*#[ \t]*define[ \t]*SCNxMAX[ \t]*SCNx64/a\\\n"
-		"#define SCNuMAX \t SCNu64\n";
-    sed       = "/^[ \t]*#[ \t]*define[ \t]*SCNxMAX[ \t]*SCNx32/a\\\n"
-		"#define SCNuMAX \t SCNu32\n";
-    test_text = "#define SCNxMAX SCNx64\n"
-		"#define SCNxMAX SCNx32\n";
-};
-
-/*
- * Fix missing PRIdPTR defines in inttypes.h
- */
-fix = {
-    hackname  = hpux_c99_inttypes5;
-    mach      = "hppa*-hp-hpux11.[01]*";
-    files     = inttypes.h;
-    select    = "#ifndef[ \t]_KERNEL[ \t]*\n";
-    c_fix     = format;
-    c_fix_arg = "#ifndef __LP64__\n"
-		"#define PRIdPTR\t\tPRId32\n"
-		"#define PRIiPTR\t\tPRIi32\n"
-		"#define PRIoPTR\t\tPRIo32\n"
-		"#define PRIuPTR\t\tPRIu32\n"
-		"#define PRIxPTR\t\tPRIx32\n"
-		"#define PRIXPTR\t\tPRIX32\n"
-		"#else\n"
-		"#define PRIdPTR\t\tPRId64\n"
-		"#define PRIiPTR\t\tPRIi64\n"
-		"#define PRIoPTR\t\tPRIo64\n"
-		"#define PRIuPTR\t\tPRIu64\n"
-		"#define PRIxPTR\t\tPRIx64\n"
-		"#define PRIXPTR\t\tPRIX64\n"
-		"#endif\n\n"
-		"#ifndef _KERNEL\n";
-    test_text = "#ifndef _KERNEL\n";
-};
-
-/*
- *  Fix hpux broken ctype macros
- */
-fix = {
-    hackname = hpux_ctype_macros;
-    files    = ctype.h;
-    select   = '((: |\()__SB_masks \? )'
-	       '(__SB_masks\[__(alnum|c)\] & _IS)';
-    c_fix     = format;
-    c_fix_arg = "%1(int)%3";
-
-    test_text = ": __SB_masks ? __SB_masks[__alnum] & _ISCNTRL\n"
-		"# define isalpha(__c) (__SB_masks ? __SB_masks[__c] & _IS\n";
-};
-
 /*
  * hpux errno()
  */
 fix = {
     hackname  = hpux_extern_errno;
-    mach      = "*-hp-hpux10.*";
     mach      = "*-hp-hpux11.[0-2]*";
     files     = errno.h;
     select    = "^[ \t]*extern int errno;$";
@@ -2819,7 +2365,6 @@  fix = {
  */
 fix = {
     hackname  = hpux_long_double;
-    mach      = "*-*-hpux10*";
     mach      = "*-*-hpux11.[012]*";
     files     = stdlib.h;
     select    = "extern[ \t]long_double[ \t]strtold";
@@ -2950,20 +2495,6 @@  fix = {
     test_text = 'extern void	longjmp __((jmp_buf, int));';
 };
 
-/*
- *  Fix hpux10.20 <sys/time.h> to avoid invalid forward decl
- */
-fix = {
-    hackname = hpux_systime;
-    files    = sys/time.h;
-    select   = "^extern struct sigevent;";
-
-    c_fix     = format;
-    c_fix_arg = "struct sigevent;";
-
-    test_text = 'extern struct sigevent;';
-};
-
 /*
  *  Fix glibc definition of HUGE_VAL in terms of hex floating point constant
  */
diff --git a/gcc/config.build b/gcc/config.build
index 30559b95738..eb3bfbf92e8 100644
--- a/gcc/config.build
+++ b/gcc/config.build
@@ -50,10 +50,7 @@  build_file_translate=
 
 # System-specific settings.
 case $build in
-  hppa1.0-*-hpux1[01]* | \
-  hppa*64*-*-hpux11* | \
-  hppa1.1-*-hpux11* | \
-  hppa2*-*-hpux11* )
+  hppa*64*-*-hpux11* )
     build_install_headers_dir=install-headers-cpio
     ;;
   i[34567]86-*-cygwin* | x86_64-*-cygwin* )
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 02f58970db0..f3212f30cdf 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -249,8 +249,6 @@  md_file=
 # Obsolete configurations.
 case ${target} in
  cr16-*-*				\
- | hppa[12]*-*-hpux10*			\
- | hppa[12]*-*-hpux11*			\
  | m32c-*-rtems*			\
  )
     if test "x$enable_obsolete" != xyes; then
@@ -1747,42 +1745,6 @@  hppa*-*-netbsd*)
 	tm_defines="${tm_defines} CHAR_FAST8=1 SHORT_FAST16=1"
 	extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
 	;;
-hppa[12]*-*-hpux10*)
-	case ${target} in
-	hppa1.1-*-* | hppa2*-*-*)
-		target_cpu_default="MASK_PA_11"
-		;;
-	esac
-	tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h \
-		 pa/pa-hpux.h pa/pa-hpux10.h"
-	extra_options="${extra_options} pa/pa-hpux.opt pa/pa-hpux10.opt"
-	case ${target} in
-	*-*-hpux10.[1-9]*)
-		tm_file="${tm_file} pa/pa-hpux1010.h"
-		extra_options="${extra_options} pa/pa-hpux1010.opt"
-		;;
-	esac
-	use_gcc_stdint=provide
-	tm_file="${tm_file} hpux-stdint.h"
-	tmake_file="pa/t-pa t-slibgcc"
-	d_target_objs="${d_target_objs} pa-d.o"
-	case ${enable_threads} in
-	  "")
-	    if test x$have_pthread_h = xyes ; then
-	      tmake_file="${tmake_file} pa/t-dce-thr"
-	    fi
-	    ;;
-	  yes | dce)
-	    tmake_file="${tmake_file} pa/t-dce-thr"
-	    ;;
-	esac
-	use_collect2=yes
-	gas=yes
-	if test "x$with_dwarf2" != x; then
-		echo "Warning: dwarf2 debug format is not supported for this target, --with-dwarf2 ignored" 1>&2
-		dwarf2=no
-	fi
-	;;
 hppa*64*-*-hpux11*)
 	target_cpu_default="MASK_PA_11|MASK_PA_20"
 	if test x$gnu_ld = xyes
@@ -1826,50 +1788,6 @@  hppa*64*-*-hpux11*)
 		;;
 	esac
 	;;
-hppa[12]*-*-hpux11*)
-	case ${target} in
-	hppa1.1-*-* | hppa2*-*-*)
-		target_cpu_default="MASK_PA_11"
-		;;
-	esac
-	tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h \
-		 pa/pa-hpux.h pa/pa-hpux1010.h pa/pa-hpux11.h"
-	extra_options="${extra_options} pa/pa-hpux.opt pa/pa-hpux1010.opt \
-		       hpux11.opt"
-	case ${target} in
-	*-*-hpux11.[12]*)
-		tm_file="${tm_file} pa/pa-hpux1111.h"
-		extra_options="${extra_options} pa/pa-hpux1111.opt"
-		;;
-	*-*-hpux11.[3-9]*)
-		tm_file="${tm_file} pa/pa-hpux1131.h"
-		extra_options="${extra_options} pa/pa-hpux1131.opt"
-		;;
-	esac
-	tmake_file="pa/t-pa t-slibgcc"
-	d_target_objs="${d_target_objs} pa-d.o"
-	case x${enable_threads} in
-	x | xyes | xposix )
-		thread_file=posix
-		;;
-	esac
-	use_collect2=yes
-	gas=yes
-	case ${target} in
-	  *-*-hpux11.[01]*)
-		use_gcc_stdint=provide
-		tm_file="${tm_file} hpux-stdint.h"
-		;;
-	  *-*-hpux11.[23]*)
-		use_gcc_stdint=wrap
-		tm_file="${tm_file} hpux-stdint.h"
-		;;
-	esac
-	if test "x$with_dwarf2" != x; then
-		echo "Warning: dwarf2 debug format is not supported for this target, --with-dwarf2 ignored" 1>&2
-		dwarf2=no
-	fi
-	;;
 i[34567]86-*-darwin1[89]* | i[34567]86-*-darwin2*)
 	echo "Error: 32bit target is not supported after Darwin17" 1>&2
 	;;
diff --git a/gcc/config.host b/gcc/config.host
index 4ca300f1142..992638df385 100644
--- a/gcc/config.host
+++ b/gcc/config.host
@@ -201,11 +201,6 @@  esac
 
 # Machine-specific settings.
 case ${host} in
-  hppa1.0-*-hpux10* | hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
-    out_host_hook_obj=host-hpux.o
-    host_xmake_file="${host_xmake_file} x-hpux"
-    ;;
-  hppa1.0-*-hpux11* | hppa1.1-*-hpux11* | hppa2*-*-hpux11* | \
   hppa*64*-*-hpux11*)
     out_host_hook_obj=host-hpux.o
     host_xmake_file="${host_xmake_file} x-hpux"
diff --git a/gcc/config/pa/pa-hpux10.h b/gcc/config/pa/pa-hpux10.h
deleted file mode 100644
index 92977685790..00000000000
--- a/gcc/config/pa/pa-hpux10.h
+++ /dev/null
@@ -1,157 +0,0 @@ 
-/* Definitions of target machine for GNU compiler, for HP PA-RISC
-   Copyright (C) 1995-2022 Free Software Foundation, Inc.
-   Contributed by Tim Moore (moore@defmacro.cs.utah.edu)
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING3.  If not see
-<http://www.gnu.org/licenses/>.  */
-
-/* GCC always defines __STDC__.  HP C++ compilers don't define it.  This
-   causes trouble when sys/stdsyms.h is included.  As a work around,
-   we define __STDC_EXT__.  A similar situation exists with respect to
-   the definition of __cplusplus.  We define _INCLUDE_LONGLONG
-   to prevent nlist.h from defining __STDC_32_MODE__ (no longlong
-   support).  We define __STDCPP__ to get certain system headers
-   (notably assert.h) to assume standard preprocessor behavior in C++.
-   We define _XOPEN_SOURCE_EXTENDED when we define _HPUX_SOURCE to avoid
-   non standard hpux variants in _INCLUDE_XOPEN_SOURCE_EXTENDED.  */
-#undef TARGET_OS_CPP_BUILTINS
-#define TARGET_OS_CPP_BUILTINS()					\
-  do									\
-    {									\
-	builtin_assert ("system=hpux");					\
-	builtin_assert ("system=unix");					\
-	builtin_define ("__hp9000s800");				\
-	builtin_define ("__hp9000s800__");				\
-	builtin_define ("__hpux");					\
-	builtin_define ("__hpux__");					\
-	builtin_define ("__unix");					\
-	builtin_define ("__unix__");					\
-	builtin_define ("__STDC_EXT__");				\
-	if (c_dialect_cxx ())						\
-	  {								\
-	    builtin_define ("_HPUX_SOURCE");				\
-	    builtin_define ("_REENTRANT");				\
-	    builtin_define ("_INCLUDE_LONGLONG");			\
-	    builtin_define ("__STDCPP__");				\
-	    builtin_define ("_LARGEFILE_SOURCE");			\
-	    builtin_define ("_LARGEFILE64_SOURCE");			\
-	    if (flag_pa_unix >= 1995)					\
-	      {								\
-		builtin_define ("_XOPEN_UNIX");				\
-		builtin_define ("_XOPEN_SOURCE_EXTENDED");		\
-	      }								\
-	  }								\
-	else if (flag_iso)						\
-	  {								\
-	    if (flag_isoc94)						\
-	      builtin_define ("_INCLUDE__STDC_A1_SOURCE");		\
-	  }								\
-	else								\
-	  {								\
-	    builtin_define ("_HPUX_SOURCE");				\
-	    builtin_define ("_REENTRANT");				\
-	    if (preprocessing_trad_p ())				\
-	      {								\
-		builtin_define ("hp9000s800");				\
-		builtin_define ("hppa");				\
-		builtin_define ("hpux");				\
-		builtin_define ("unix");				\
-		builtin_define ("__CLASSIC_C__");			\
-		builtin_define ("_PWB");				\
-		builtin_define ("PWB");					\
-	      }								\
-	    if (flag_pa_unix >= 1995)					\
-	      {								\
-		builtin_define ("_XOPEN_UNIX");				\
-		builtin_define ("_XOPEN_SOURCE_EXTENDED");		\
-	      }								\
-	  }								\
-	if (TARGET_SIO)							\
-	  builtin_define ("_SIO");					\
-	else								\
-	  {								\
-	    builtin_define ("__hp9000s700");				\
-	    builtin_define ("__hp9000s700__");				\
-	    builtin_define ("_WSIO");					\
-	  }								\
-    }									\
-  while (0)
-
-#define CPP_SPEC "%{threads: -D_REENTRANT -D_DCE_THREADS}"
-
-/* We can debug dynamically linked executables on hpux9; we also want
-   dereferencing of a NULL pointer to cause a SEGV.  */
-#undef LINK_SPEC
-#if ((TARGET_DEFAULT | TARGET_CPU_DEFAULT) & MASK_PA_11)
-#define LINK_SPEC \
-  "%{!mpa-risc-1-0:%{!march=1.0:%{static:-L/lib/pa1.1 -L/usr/lib/pa1.1 }}}\
-   %{!shared:%{p:-L/lib/libp %{!static:\
-     %nwarning: consider linking with '-static' as system libraries with\n\
-     %n  profiling support are only provided in archive format}}}\
-   %{!shared:%{pg:-L/lib/libp %{!static:\
-     %nwarning: consider linking with '-static' as system libraries with\n\
-     %n  profiling support are only provided in archive format}}}\
-   %{!shared:%{!static:%{rdynamic:-E}}}\
-   -z %{mlinker-opt:-O} %{!shared:-u main}\
-   %{static:-a archive} %{shared:-b}"
-#else
-#define LINK_SPEC \
-  "%{!shared:%{p:-L/lib/libp %{!static:\
-     %nwarning: consider linking with '-static' as system libraries with\n\
-     %n  profiling support are only provided in archive format}}}\
-   %{!shared:%{pg:-L/lib/libp %{!static:\
-     %nwarning: consider linking with '-static' as system libraries with\n\
-     %n  profiling support are only provided in archive format}}}\
-   %{!shared:%{!static:%{rdynamic:-E}}}\
-   -z %{mlinker-opt:-O} %{!shared:-u main}\
-   %{static:-a archive} %{shared:-b}"
-#endif
-
-/* Like the default, except no -lg.  */
-#undef LIB_SPEC
-#define LIB_SPEC \
-  "%{!shared:\
-     %{!p:%{!pg:\
-       %{!threads:-lc %{static:%{!nolibdld:-a shared -ldld -a archive -lc}}}\
-       %{threads:-lcma -lc}}}\
-     %{p:%{!pg:-lc %{static:%{!nolibdld:-a shared -ldld -a archive -lc}}}}\
-     %{pg:-lc %{static:%{!nolibdld:-a shared -ldld -a archive -lc}}}}"
-
-#undef THREAD_MODEL_SPEC
-#define THREAD_MODEL_SPEC "%{!threads:single}%{threads:dce}"
-
-/* Under hpux10, the normal location of the `ld' and `as' programs is the
-   /usr/ccs/bin directory.  */
-
-#ifndef CROSS_DIRECTORY_STRUCTURE
-#undef MD_EXEC_PREFIX
-#define MD_EXEC_PREFIX "/usr/ccs/bin/"
-#endif
-
-/* Under hpux10, the normal location of the various *crt*.o files is
-   the /usr/ccs/lib directory.  However, the profiling files are in
-   /opt/langtools/lib.  */
-
-#ifndef CROSS_DIRECTORY_STRUCTURE
-#undef MD_STARTFILE_PREFIX
-#define MD_STARTFILE_PREFIX "/usr/ccs/lib/"
-#define MD_STARTFILE_PREFIX_1 "/opt/langtools/lib/"
-#endif
-
-/* hpux10 has the new HP assembler.  It's still lousy, but it's a whole lot
-   better than the assembler shipped with older versions of hpux.  */
-#undef NEW_HP_ASSEMBLER
-#define NEW_HP_ASSEMBLER 1
diff --git a/gcc/config/pa/pa-hpux10.opt b/gcc/config/pa/pa-hpux10.opt
deleted file mode 100644
index d7e639a018d..00000000000
--- a/gcc/config/pa/pa-hpux10.opt
+++ /dev/null
@@ -1,22 +0,0 @@ 
-; Options specific to HP-UX 10.
-
-; Copyright (C) 2011-2022 Free Software Foundation, Inc.
-;
-; This file is part of GCC.
-;
-; GCC is free software; you can redistribute it and/or modify it under
-; the terms of the GNU General Public License as published by the Free
-; Software Foundation; either version 3, or (at your option) any later
-; version.
-;
-; GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-; WARRANTY; without even the implied warranty of MERCHANTABILITY or
-; FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-; for more details.
-;
-; You should have received a copy of the GNU General Public License
-; along with GCC; see the file COPYING3.  If not see
-; <http://www.gnu.org/licenses/>.
-
-threads
-Driver
diff --git a/gcc/config/pa/t-dce-thr b/gcc/config/pa/t-dce-thr
deleted file mode 100644
index 51b3abcf607..00000000000
--- a/gcc/config/pa/t-dce-thr
+++ /dev/null
@@ -1,2 +0,0 @@ 
-MULTILIB_OPTIONS = threads
-MULTILIB_DIRNAMES = threads
diff --git a/gcc/configure b/gcc/configure
index 80498e68e36..dc2224a24be 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -10759,7 +10759,7 @@  else
    # Systems known to be in this category are Windows (all variants),
    # VMS, and Darwin.
    case "$host_os" in
-     *vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00)
+     *vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux11.00)
         gcc_cv_func_mmap_dev_zero=no ;;
      *)
         gcc_cv_func_mmap_dev_zero=yes;;
@@ -12680,21 +12680,6 @@  objext='.o'
 # Check whether --enable-sjlj-exceptions was given.
 if test "${enable_sjlj_exceptions+set}" = set; then :
   enableval=$enable_sjlj_exceptions; case $target in
-  *-*-hpux10*)
-    if test $enableval != yes; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dwarf2 exceptions not supported, sjlj exceptions forced" >&5
-$as_echo "$as_me: WARNING: dwarf2 exceptions not supported, sjlj exceptions forced" >&2;}
-      enableval=yes
-    fi
-    ;;
-esac
-force_sjlj_exceptions=yes
-else
-  case $target in
-  *-*-hpux10*)
-    force_sjlj_exceptions=yes
-    enableval=yes
-    ;;
   lm32*-*-*)
      force_sjlj_exceptions=yes
      enableval=yes
@@ -14641,7 +14626,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -16871,7 +16856,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -17958,41 +17943,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -18906,7 +18856,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -19703,7 +19653,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 19706 "configure"
+#line 19656 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19809,7 +19759,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 19812 "configure"
+#line 19762 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -20759,44 +20709,7 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         link_all_deplibs_CXX=yes
         ;;
 
-      hpux9*)
-        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator_CXX=:
-        export_dynamic_flag_spec_CXX='${wl}-E'
-        hardcode_direct_CXX=yes
-        hardcode_minus_L_CXX=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            ld_shlibs_CXX=no
-            ;;
-          aCC*)
-            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              ld_shlibs_CXX=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
+      hpux11*)
         if test $with_gnu_ld = no; then
 	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_separator_CXX=:
@@ -21713,7 +21626,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
-      hpux9* | hpux10* | hpux11*)
+      hpux11*)
 	case $cc_basename in
 	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
@@ -22561,7 +22474,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 819b490d1b6..652036c5f05 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1802,19 +1802,6 @@  AC_ARG_ENABLE(sjlj-exceptions,
 [AS_HELP_STRING([--enable-sjlj-exceptions],
                 [arrange to use setjmp/longjmp exception handling])],
 [case $target in
-  *-*-hpux10*)
-    if test $enableval != yes; then
-      AC_MSG_WARN([dwarf2 exceptions not supported, sjlj exceptions forced])
-      enableval=yes
-    fi
-    ;;
-esac
-force_sjlj_exceptions=yes],
-[case $target in
-  *-*-hpux10*)
-    force_sjlj_exceptions=yes
-    enableval=yes
-    ;;
   lm32*-*-*)
      force_sjlj_exceptions=yes
      enableval=yes
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C
index 417c1859db2..9f1b89aaccc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C
@@ -1,7 +1,7 @@ 
 // Test for conversion from stateless lambda to function pointer.
 
 // { dg-do compile { target c++11_only } }
-// { dg-final { scan-assembler "weak\[^\n\r\]*_?_ZZ1fvENKUlvE_cvPFvvEEv" { target { ! { *-*-darwin* *-*-mingw* *-*-cygwin *-*-hpux10* } } } } }
+// { dg-final { scan-assembler "weak\[^\n\r\]*_?_ZZ1fvENKUlvE_cvPFvvEEv" { target { ! { *-*-darwin* *-*-mingw* *-*-cygwin } } } } }
 
 inline void f()
 {
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/hugeval.x b/gcc/testsuite/gcc.c-torture/execute/ieee/hugeval.x
index c66de1c0648..a6dad81f78a 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/hugeval.x
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/hugeval.x
@@ -2,9 +2,6 @@ 
 # instead of +Infinity.
 
 global target_triplet
-if { [istarget "hppa*-*-hpux9*"] || [istarget "hppa*-*-hpux10*"] } {
-      set torture_execute_xfail "$target_triplet"
-}
 
 # VxWorks kernel mode has the same problem.
 if {[istarget "*-*-vxworks*"]} {
diff --git a/gcc/testsuite/gcc.dg/torture/pr47917.c b/gcc/testsuite/gcc.dg/torture/pr47917.c
index 0b45e064e36..5724907ba1c 100644
--- a/gcc/testsuite/gcc.dg/torture/pr47917.c
+++ b/gcc/testsuite/gcc.dg/torture/pr47917.c
@@ -2,7 +2,6 @@ 
 /* { dg-options "-std=c99" } */
 /* { dg-options "-std=gnu99" { target *-*-hpux* } } */
 /* { dg-additional-options "-D__USE_MINGW_ANSI_STDIO=1" { target *-*-mingw* } } */
-/* { dg-xfail-run-if "no C99 snprintf function" { *-*-hpux10* } } */
 /* { dg-xfail-run-if "non-conforming C99 snprintf" { *-*-hpux11.[012]* } } */
 
 /* PR middle-end/47917 */
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 2f243cd8c07..7b650dbf79d 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -310,12 +310,6 @@  proc check_weak_available { } {
 	return 1
     }
 
-    # HP-UX 10.X doesn't support it
-
-    if { [istarget hppa*-*-hpux10*] } {
-	return 0
-    }
-
     # nvptx (nearly) supports it
 
     if { [istarget nvptx-*-*] } {
@@ -353,9 +347,6 @@  proc check_weak_available { } {
 # return 1 if weak undefined symbols are supported.
 
 proc check_effective_target_weak_undefined { } {
-    if { [istarget hppa*-*-hpux*] } {
-	return 0
-    }
     return [check_runtime weak_undefined {
 	extern void foo () __attribute__((weak));
 	int main (void) { if (foo) return 1; return 0; }
@@ -562,7 +553,6 @@  proc check_effective_target_trampolines { } {
     if { [istarget avr-*-*]
 	 || [istarget msp430-*-*]
 	 || [istarget nvptx-*-*]
-	 || [istarget hppa2.0w-hp-hpux11.23]
 	 || [istarget hppa64-hp-hpux11.23]
 	 || [istarget pru-*-*]
 	 || [istarget bpf-*-*] } {
@@ -2827,10 +2817,7 @@  proc check_mkfifo_available {} {
 
 proc check_cxa_atexit_available { } {
     return [check_cached_effective_target cxa_atexit_available {
-	if { [istarget hppa*-*-hpux10*] } {
-	    # HP-UX 10 doesn't have __cxa_atexit but subsequent test passes.
-	    expr 0
-	} elseif { [istarget *-*-vxworks] } {
+	if { [istarget *-*-vxworks] } {
 	    # vxworks doesn't have __cxa_atexit but subsequent test passes.
 	    expr 0
 	} else {
diff --git a/gnattools/configure b/gnattools/configure
index c2d755b723a..423527da1b6 100755
--- a/gnattools/configure
+++ b/gnattools/configure
@@ -2092,8 +2092,6 @@  case "${target}" in
     mlib-tgt-specific.adb<mlib-tgt-specific-vxworks.adb \
     indepsw.adb<indepsw-gnu.adb"
     ;;
-  hppa*-hp-hpux10*)
-    ;;
   hppa*-hp-hpux11*)
     TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-hpux.adb"
     ;;
diff --git a/gnattools/configure.ac b/gnattools/configure.ac
index 40d015ce8b0..5b6f34ed9f4 100644
--- a/gnattools/configure.ac
+++ b/gnattools/configure.ac
@@ -93,8 +93,6 @@  case "${target}" in
     mlib-tgt-specific.adb<mlib-tgt-specific-vxworks.adb \
     indepsw.adb<indepsw-gnu.adb"
     ;;
-  hppa*-hp-hpux10*)
-    ;;
   hppa*-hp-hpux11*)
     TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-hpux.adb"
     ;;
diff --git a/libatomic/configure b/libatomic/configure
index 92853dd8a45..e1d92ec0557 100755
--- a/libatomic/configure
+++ b/libatomic/configure
@@ -6051,7 +6051,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -8550,7 +8550,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -9637,41 +9637,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -10585,7 +10550,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -11382,7 +11347,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11385 "configure"
+#line 11350 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11488,7 +11453,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11491 "configure"
+#line 11456 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/libbacktrace/configure b/libbacktrace/configure
index 705b71bd8cd..b754d5ad749 100755
--- a/libbacktrace/configure
+++ b/libbacktrace/configure
@@ -6448,7 +6448,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -8679,7 +8679,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -9766,41 +9766,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -10714,7 +10679,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -11511,7 +11476,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11514 "configure"
+#line 11479 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11617,7 +11582,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11620 "configure"
+#line 11585 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/libcc1/configure b/libcc1/configure
index 6dd91a086e6..73ba22728d2 100755
--- a/libcc1/configure
+++ b/libcc1/configure
@@ -5715,7 +5715,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -7945,7 +7945,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -9032,41 +9032,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -9980,7 +9945,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -10777,7 +10742,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10780 "configure"
+#line 10745 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10883,7 +10848,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10886 "configure"
+#line 10851 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12239,44 +12204,7 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         link_all_deplibs_CXX=yes
         ;;
 
-      hpux9*)
-        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator_CXX=:
-        export_dynamic_flag_spec_CXX='${wl}-E'
-        hardcode_direct_CXX=yes
-        hardcode_minus_L_CXX=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            ld_shlibs_CXX=no
-            ;;
-          aCC*)
-            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              ld_shlibs_CXX=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
+      hpux11*)
         if test $with_gnu_ld = no; then
 	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_separator_CXX=:
@@ -13193,7 +13121,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
-      hpux9* | hpux10* | hpux11*)
+      hpux11*)
 	case $cc_basename in
 	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
@@ -14041,7 +13969,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
diff --git a/libffi/acinclude.m4 b/libffi/acinclude.m4
index 1a70efb010d..afe5a1a093a 100644
--- a/libffi/acinclude.m4
+++ b/libffi/acinclude.m4
@@ -37,7 +37,7 @@  else
    # Systems known to be in this category are Windows (all variants),
    # VMS, and Darwin.
    case "$host_os" in
-     vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00)
+     vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux11.00)
 	ac_cv_func_mmap_dev_zero=no ;;
      *)
 	ac_cv_func_mmap_dev_zero=yes;;
diff --git a/libffi/configure b/libffi/configure
index 575641cca1d..731610a5ff4 100755
--- a/libffi/configure
+++ b/libffi/configure
@@ -6241,7 +6241,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -8740,7 +8740,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -9827,41 +9827,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -10775,7 +10740,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -11572,7 +11537,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11575 "configure"
+#line 11540 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11678,7 +11643,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11681 "configure"
+#line 11646 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12628,44 +12593,7 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         link_all_deplibs_CXX=yes
         ;;
 
-      hpux9*)
-        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator_CXX=:
-        export_dynamic_flag_spec_CXX='${wl}-E'
-        hardcode_direct_CXX=yes
-        hardcode_minus_L_CXX=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            ld_shlibs_CXX=no
-            ;;
-          aCC*)
-            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              ld_shlibs_CXX=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
+      hpux11*)
         if test $with_gnu_ld = no; then
 	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_separator_CXX=:
@@ -13582,7 +13510,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
-      hpux9* | hpux10* | hpux11*)
+      hpux11*)
 	case $cc_basename in
 	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
@@ -14430,7 +14358,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -15190,7 +15118,7 @@  else
    # Systems known to be in this category are Windows (all variants),
    # VMS, and Darwin.
    case "$host_os" in
-     vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00)
+     vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux11.00)
 	ac_cv_func_mmap_dev_zero=no ;;
      *)
 	ac_cv_func_mmap_dev_zero=yes;;
diff --git a/libgcc/config.host b/libgcc/config.host
index 9a28b10ac7f..95be2f4d221 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -648,17 +648,6 @@  hppa*-*-linux*)
 	extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
 	md_unwind_header=pa/linux-unwind.h
 	;;
-hppa[12]*-*-hpux10*)
-	tmake_file="$tmake_file pa/t-hpux pa/t-hpux10 t-libgcc-pic t-slibgcc"
-	# Set the libgcc version number
-	if test x$ac_cv_sjlj_exceptions = xyes; then
-	    tmake_file="$tmake_file pa/t-slibgcc-sjlj-ver"
-	else
-	    tmake_file="$tmake_file pa/t-slibgcc-dwarf-ver"
-	fi
-	tmake_file="$tmake_file pa/t-slibgcc-hpux t-slibgcc-hpux"
-	md_unwind_header=pa/hpux-unwind.h
-	;;
 hppa*64*-*-hpux11*)
 	tmake_file="$tmake_file pa/t-hpux pa/t-pa64 pa/t-dimode"
 	tmake_file="$tmake_file pa/t-stublib t-libgcc-pic t-slibgcc"
@@ -675,17 +664,6 @@  hppa*64*-*-hpux11*)
 		     libgcc_stub.a"
 	md_unwind_header=pa/hpux-unwind.h
 	;;
-hppa[12]*-*-hpux11*)
-	tmake_file="$tmake_file pa/t-hpux pa/t-stublib t-libgcc-pic t-slibgcc"
-	# Set the libgcc version number
-	if test x$ac_cv_sjlj_exceptions = xyes; then
-	    tmake_file="$tmake_file pa/t-slibgcc-sjlj-ver"
-	else
-	    tmake_file="$tmake_file pa/t-slibgcc-dwarf-ver"
-	fi
-	tmake_file="$tmake_file pa/t-slibgcc-hpux t-slibgcc-hpux"
-	md_unwind_header=pa/hpux-unwind.h
-	;;
 hppa*-*-openbsd*)
 	tmake_file="$tmake_file pa/t-openbsd"
 	;;
diff --git a/libgfortran/configure b/libgfortran/configure
index beb0ec49eb1..114809d3f61 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -7673,7 +7673,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -9908,7 +9908,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -11001,41 +11001,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -11952,7 +11917,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -12767,7 +12732,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12770 "configure"
+#line 12735 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12873,7 +12838,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12876 "configure"
+#line 12841 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13913,7 +13878,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic_FC='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl_FC='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -14979,41 +14944,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var_FC=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_FC='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_FC='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_FC=:
-      hardcode_direct_FC=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_FC=yes
-      export_dynamic_flag_spec_FC='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds_FC='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_FC='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld_FC='+b $libdir'
-	hardcode_libdir_separator_FC=:
-	hardcode_direct_FC=yes
-	hardcode_direct_absolute_FC=yes
-	export_dynamic_flag_spec_FC='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L_FC=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -15722,7 +15652,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
diff --git a/libgo/config/libtool.m4 b/libgo/config/libtool.m4
index 4ca90ee71bc..74094437ffb 100644
--- a/libgo/config/libtool.m4
+++ b/libgo/config/libtool.m4
@@ -2341,7 +2341,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -2356,11 +2356,7 @@  hpux9* | hpux10* | hpux11*)
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
     soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
+    sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
@@ -3050,24 +3046,6 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
 interix[[3-9]]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
@@ -3689,7 +3667,7 @@  m4_if([$1], [CXX], [
       freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
-      hpux9* | hpux10* | hpux11*)
+      hpux11*)
 	case $cc_basename in
 	  CC*)
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -3701,14 +3679,6 @@  m4_if([$1], [CXX], [
 	  aCC*)
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
 	    ;;
 	  *)
 	    ;;
@@ -3936,20 +3906,6 @@  m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_static, $1)=
       ;;
 
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
     interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -4005,7 +3961,7 @@  m4_if([$1], [CXX], [
 	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -4829,41 +4785,6 @@  _LT_EOF
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -5785,44 +5706,7 @@  if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(link_all_deplibs, $1)=yes
         ;;
 
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
+      hpux11*)
         if test $with_gnu_ld = no; then
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
diff --git a/libgo/configure b/libgo/configure
index 61a49947eb9..8340e713075 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -6129,24 +6129,6 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
 interix[3-9]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
@@ -8649,20 +8631,6 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_static=
       ;;
 
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
     interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -8717,7 +8685,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -9804,41 +9772,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -10752,7 +10685,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -10767,11 +10700,7 @@  hpux9* | hpux10* | hpux11*)
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
     soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
+    sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
@@ -11544,7 +11473,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11547 "configure"
+#line 11476 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11650,7 +11579,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11653 "configure"
+#line 11582 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12071,20 +12000,6 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_static_GO=
       ;;
 
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_GO='-fPIC'
-	;;
-      esac
-      ;;
-
     interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -12139,7 +12054,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic_GO='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl_GO='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -13211,41 +13126,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var_GO=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_GO='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_GO='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_GO='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_GO=:
-      hardcode_direct_GO=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_GO=yes
-      export_dynamic_flag_spec_GO='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds_GO='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GO='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_GO='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld_GO='+b $libdir'
-	hardcode_libdir_separator_GO=:
-	hardcode_direct_GO=yes
-	hardcode_direct_absolute_GO=yes
-	export_dynamic_flag_spec_GO='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L_GO=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
diff --git a/libgomp/configure b/libgomp/configure
index b11170e6a7c..dbbb356f0ef 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -6063,7 +6063,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -8562,7 +8562,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -9649,41 +9649,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -10597,7 +10562,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -11394,7 +11359,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11397 "configure"
+#line 11362 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11500,7 +11465,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11503 "configure"
+#line 11468 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12437,7 +12402,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic_FC='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl_FC='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -13497,41 +13462,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var_FC=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_FC='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_FC='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_FC=:
-      hardcode_direct_FC=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_FC=yes
-      export_dynamic_flag_spec_FC='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds_FC='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_FC='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld_FC='+b $libdir'
-	hardcode_libdir_separator_FC=:
-	hardcode_direct_FC=yes
-	hardcode_direct_absolute_FC=yes
-	export_dynamic_flag_spec_FC='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L_FC=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -14237,7 +14167,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
diff --git a/libitm/configure b/libitm/configure
index 18fc2d3a10a..a34a9180eea 100755
--- a/libitm/configure
+++ b/libitm/configure
@@ -6726,7 +6726,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -9226,7 +9226,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -10313,41 +10313,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -11261,7 +11226,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -12058,7 +12023,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12061 "configure"
+#line 12026 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12164,7 +12129,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12167 "configure"
+#line 12132 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13114,44 +13079,7 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         link_all_deplibs_CXX=yes
         ;;
 
-      hpux9*)
-        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator_CXX=:
-        export_dynamic_flag_spec_CXX='${wl}-E'
-        hardcode_direct_CXX=yes
-        hardcode_minus_L_CXX=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            ld_shlibs_CXX=no
-            ;;
-          aCC*)
-            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              ld_shlibs_CXX=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
+      hpux11*)
         if test $with_gnu_ld = no; then
 	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_separator_CXX=:
@@ -14068,7 +13996,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
-      hpux9* | hpux10* | hpux11*)
+      hpux11*)
 	case $cc_basename in
 	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
@@ -14916,7 +14844,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -16096,7 +16024,7 @@  else
    # Systems known to be in this category are Windows (all variants),
    # VMS, and Darwin.
    case "$host_os" in
-     *vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00)
+     *vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux11.00)
         gcc_cv_func_mmap_dev_zero=no ;;
      *)
         gcc_cv_func_mmap_dev_zero=yes;;
diff --git a/libobjc/configure b/libobjc/configure
index 2dcc9cd32f6..dd1fe965af6 100755
--- a/libobjc/configure
+++ b/libobjc/configure
@@ -5368,7 +5368,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -7912,7 +7912,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -9005,41 +9005,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -9956,7 +9921,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -10771,7 +10736,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10774 "configure"
+#line 10739 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10877,7 +10842,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10880 "configure"
+#line 10845 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/liboffloadmic/configure b/liboffloadmic/configure
index f8da8fabb6f..4d39ef631a7 100755
--- a/liboffloadmic/configure
+++ b/liboffloadmic/configure
@@ -6360,7 +6360,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -8590,7 +8590,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -9677,41 +9677,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -10625,7 +10590,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -11422,7 +11387,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11425 "configure"
+#line 11390 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11528,7 +11493,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11531 "configure"
+#line 11496 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12478,44 +12443,7 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         link_all_deplibs_CXX=yes
         ;;
 
-      hpux9*)
-        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator_CXX=:
-        export_dynamic_flag_spec_CXX='${wl}-E'
-        hardcode_direct_CXX=yes
-        hardcode_minus_L_CXX=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            ld_shlibs_CXX=no
-            ;;
-          aCC*)
-            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              ld_shlibs_CXX=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
+      hpux11*)
         if test $with_gnu_ld = no; then
 	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_separator_CXX=:
@@ -13432,7 +13360,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
-      hpux9* | hpux10* | hpux11*)
+      hpux11*)
 	case $cc_basename in
 	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
@@ -14280,7 +14208,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
diff --git a/liboffloadmic/plugin/configure b/liboffloadmic/plugin/configure
index ce0a5511fc3..97f0a82035b 100755
--- a/liboffloadmic/plugin/configure
+++ b/liboffloadmic/plugin/configure
@@ -5739,7 +5739,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -8237,7 +8237,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -9324,41 +9324,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -10272,7 +10237,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -11069,7 +11034,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11072 "configure"
+#line 11037 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11175,7 +11140,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11178 "configure"
+#line 11143 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12125,44 +12090,7 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         link_all_deplibs_CXX=yes
         ;;
 
-      hpux9*)
-        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator_CXX=:
-        export_dynamic_flag_spec_CXX='${wl}-E'
-        hardcode_direct_CXX=yes
-        hardcode_minus_L_CXX=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            ld_shlibs_CXX=no
-            ;;
-          aCC*)
-            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              ld_shlibs_CXX=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
+      hpux11*)
         if test $with_gnu_ld = no; then
 	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_separator_CXX=:
@@ -13079,7 +13007,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
-      hpux9* | hpux10* | hpux11*)
+      hpux11*)
 	case $cc_basename in
 	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
@@ -13927,7 +13855,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
diff --git a/libphobos/configure b/libphobos/configure
index 69d2d440d69..ad2cfb5451a 100755
--- a/libphobos/configure
+++ b/libphobos/configure
@@ -6688,7 +6688,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -8918,7 +8918,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -10005,41 +10005,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -10953,7 +10918,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -11750,7 +11715,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11753 "configure"
+#line 11718 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11856,7 +11821,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11859 "configure"
+#line 11824 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12370,7 +12335,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic_D='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl_D='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -13442,41 +13407,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var_D=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_D='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_D='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_D='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_D=:
-      hardcode_direct_D=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_D=yes
-      export_dynamic_flag_spec_D='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds_D='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_D='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_D='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld_D='+b $libdir'
-	hardcode_libdir_separator_D=:
-	hardcode_direct_D=yes
-	hardcode_direct_absolute_D=yes
-	export_dynamic_flag_spec_D='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L_D=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
diff --git a/libquadmath/configure b/libquadmath/configure
index 603f2f13140..8f0f65fc3f9 100755
--- a/libquadmath/configure
+++ b/libquadmath/configure
@@ -5710,7 +5710,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -7947,7 +7947,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -9040,41 +9040,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -9991,7 +9956,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -10806,7 +10771,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10809 "configure"
+#line 10774 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10912,7 +10877,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10915 "configure"
+#line 10880 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/libsanitizer/configure b/libsanitizer/configure
index 771b135573a..bfd4dd35a7a 100755
--- a/libsanitizer/configure
+++ b/libsanitizer/configure
@@ -7297,7 +7297,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -9527,7 +9527,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -10614,41 +10614,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -11562,7 +11527,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -12359,7 +12324,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12362 "configure"
+#line 12327 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12465,7 +12430,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12468 "configure"
+#line 12433 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13415,44 +13380,7 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         link_all_deplibs_CXX=yes
         ;;
 
-      hpux9*)
-        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator_CXX=:
-        export_dynamic_flag_spec_CXX='${wl}-E'
-        hardcode_direct_CXX=yes
-        hardcode_minus_L_CXX=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            ld_shlibs_CXX=no
-            ;;
-          aCC*)
-            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              ld_shlibs_CXX=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
+      hpux11*)
         if test $with_gnu_ld = no; then
 	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_separator_CXX=:
@@ -14369,7 +14297,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
-      hpux9* | hpux10* | hpux11*)
+      hpux11*)
 	case $cc_basename in
 	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
@@ -15217,7 +15145,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
diff --git a/libssp/configure b/libssp/configure
index b27ae22a976..cbf3f822236 100755
--- a/libssp/configure
+++ b/libssp/configure
@@ -5896,7 +5896,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -8133,7 +8133,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -9226,41 +9226,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -10177,7 +10142,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -10992,7 +10957,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10995 "configure"
+#line 10960 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11098,7 +11063,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11101 "configure"
+#line 11066 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 9e2ee865481..503aed9bb4f 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -6967,7 +6967,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -9332,7 +9332,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -10425,41 +10425,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -11376,7 +11341,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -12191,7 +12156,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12194 "configure"
+#line 12159 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12297,7 +12262,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12300 "configure"
+#line 12265 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13253,44 +13218,7 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         link_all_deplibs_CXX=yes
         ;;
 
-      hpux9*)
-        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator_CXX=:
-        export_dynamic_flag_spec_CXX='${wl}-E'
-        hardcode_direct_CXX=yes
-        hardcode_minus_L_CXX=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            ld_shlibs_CXX=no
-            ;;
-          aCC*)
-            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              ld_shlibs_CXX=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
+      hpux11*)
         if test $with_gnu_ld = no; then
 	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_separator_CXX=:
@@ -14207,7 +14135,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
-      hpux9* | hpux10* | hpux11*)
+      hpux11*)
 	case $cc_basename in
 	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
@@ -15055,7 +14983,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -15981,7 +15909,7 @@  $as_echo "$glibcxx_cv_atomic_long_long" >&6; }
   # Fake what AC_TRY_COMPILE does.
 
     cat > conftest.$ac_ext << EOF
-#line 15984 "configure"
+#line 15912 "configure"
 int main()
 {
   typedef bool atomic_type;
@@ -16016,7 +15944,7 @@  $as_echo "$glibcxx_cv_atomic_bool" >&6; }
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 16019 "configure"
+#line 15947 "configure"
 int main()
 {
   typedef short atomic_type;
@@ -16051,7 +15979,7 @@  $as_echo "$glibcxx_cv_atomic_short" >&6; }
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 16054 "configure"
+#line 15982 "configure"
 int main()
 {
   // NB: _Atomic_word not necessarily int.
@@ -16087,7 +16015,7 @@  $as_echo "$glibcxx_cv_atomic_int" >&6; }
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 16090 "configure"
+#line 16018 "configure"
 int main()
 {
   typedef long long atomic_type;
@@ -16243,7 +16171,7 @@  $as_echo "mutex" >&6; }
   # unnecessary for this test.
 
     cat > conftest.$ac_ext << EOF
-#line 16246 "configure"
+#line 16174 "configure"
 int main()
 {
   _Decimal32 d1;
@@ -16285,7 +16213,7 @@  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
   # unnecessary for this test.
 
   cat > conftest.$ac_ext << EOF
-#line 16288 "configure"
+#line 16216 "configure"
 template<typename T1, typename T2>
   struct same
   { typedef T2 type; };
@@ -47955,20 +47883,6 @@  $as_echo "$gcc_cv_have_tls" >&6; }
 $as_echo "#define HAVE_TLS 1" >>confdefs.h
 
   fi
-    case "$target" in
-      *-hpux10*)
-	$as_echo "#define HAVE_ISINF 1" >>confdefs.h
-
-	$as_echo "#define HAVE_ISINFF 1" >>confdefs.h
-
-	$as_echo "#define HAVE_ISNANF 1" >>confdefs.h
-
-	$as_echo "#define HAVE_FINITE 1" >>confdefs.h
-
-	$as_echo "#define HAVE_FINITEF 1" >>confdefs.h
-
-	;;
-    esac
     ;;
   *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-cygwin* | *-solaris*)
 
diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4
index e8ff89fe658..130f47fb1d4 100644
--- a/libstdc++-v3/crossconfig.m4
+++ b/libstdc++-v3/crossconfig.m4
@@ -173,15 +173,6 @@  case "${host}" in
     AC_DEFINE(HAVE_STRTOLD)
 
     GCC_CHECK_TLS
-    case "$target" in
-      *-hpux10*)
-	AC_DEFINE(HAVE_ISINF)
-	AC_DEFINE(HAVE_ISINFF)
-	AC_DEFINE(HAVE_ISNANF)
-	AC_DEFINE(HAVE_FINITE)
-	AC_DEFINE(HAVE_FINITEF)
-	;;
-    esac
     ;;
   *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-cygwin* | *-solaris*)
     GLIBCXX_CHECK_COMPILER_FEATURES
diff --git a/libtool.m4 b/libtool.m4
index 17f8e5f3074..ca9849de5a6 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -2338,7 +2338,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -3052,7 +3052,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -3691,7 +3691,7 @@  m4_if([$1], [CXX], [
       freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
-      hpux9* | hpux10* | hpux11*)
+      hpux11*)
 	case $cc_basename in
 	  CC*)
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4007,7 +4007,7 @@  m4_if([$1], [CXX], [
 	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -4831,41 +4831,6 @@  _LT_EOF
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -5787,44 +5752,7 @@  if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(link_all_deplibs, $1)=yes
         ;;
 
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
+      hpux11*)
         if test $with_gnu_ld = no; then
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
diff --git a/libvtv/configure b/libvtv/configure
index 897b069b613..8f2e94c6532 100755
--- a/libvtv/configure
+++ b/libvtv/configure
@@ -7192,7 +7192,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -9422,7 +9422,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -10509,41 +10509,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -11457,7 +11422,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -12254,7 +12219,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12257 "configure"
+#line 12222 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12360,7 +12325,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12363 "configure"
+#line 12328 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13310,44 +13275,7 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         link_all_deplibs_CXX=yes
         ;;
 
-      hpux9*)
-        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator_CXX=:
-        export_dynamic_flag_spec_CXX='${wl}-E'
-        hardcode_direct_CXX=yes
-        hardcode_minus_L_CXX=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            ld_shlibs_CXX=no
-            ;;
-          aCC*)
-            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              ld_shlibs_CXX=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
+      hpux11*)
         if test $with_gnu_ld = no; then
 	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_separator_CXX=:
@@ -14264,7 +14192,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
-      hpux9* | hpux10* | hpux11*)
+      hpux11*)
 	case $cc_basename in
 	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
@@ -15112,7 +15040,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
diff --git a/lto-plugin/configure b/lto-plugin/configure
index f165eaeb194..98b36bfaa1e 100755
--- a/lto-plugin/configure
+++ b/lto-plugin/configure
@@ -7047,7 +7047,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -9278,7 +9278,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -10365,41 +10365,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -11313,7 +11278,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -12110,7 +12075,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12113 "configure"
+#line 12078 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12216,7 +12181,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12219 "configure"
+#line 12184 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/zlib/configure b/zlib/configure
index 05c41b7e12d..014b7c519be 100755
--- a/zlib/configure
+++ b/zlib/configure
@@ -5372,7 +5372,7 @@  haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20* | hpux11*)
+hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
@@ -7876,7 +7876,7 @@  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
-    hpux9* | hpux10* | hpux11*)
+    hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
@@ -8969,41 +8969,6 @@  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
     hpux11*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
@@ -9920,7 +9885,7 @@  haiku*)
   hardcode_into_libs=yes
   ;;
 
-hpux9* | hpux10* | hpux11*)
+hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
@@ -10735,7 +10700,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10738 "configure"
+#line 10703 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10841,7 +10806,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10844 "configure"
+#line 10809 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H