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

ChangeLog:

	* configure: Regenerate.
	* configure.ac: Delete hpux9 and hpux10.

config/ChangeLog:

	* mh-pa-hpux10: Removed.

contrib/ChangeLog:

	* config-list.mk: Remove deprecated ports.

contrib/header-tools/ChangeLog:

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

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.

libstdc++-v3/ChangeLog:

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

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.

libgcc/ChangeLog:

	* config.host: Remove hppa.

libitm/ChangeLog:

	* configure: Regenerate.

fixincludes/ChangeLog:

	* configure: Regenerate.

25 files changed, 12 insertions, 406 deletions

diff --git a/config/mh-pa-hpux10 b/config/mh-pa-hpux10
deleted file mode 100644
index 99a2278..0000000
--- 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/configure b/configure
index 81c034b..e90b8df 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 13f8c5f..3ecb532 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 c5c9b0f..2056a22 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 f4eee32..48381fe 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 8363736..7d236e3 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 b3bca66..52ec8db 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/gcc/config.build b/gcc/config.build
index 30559b9..eb3bfbf 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 1104508..75aacc3 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -248,8 +248,9 @@ md_file=
 
 # Obsolete configurations.
 case ${target} in
- hppa[12]*-*-hpux10*			\
- | hppa[12]*-*-hpux11*			\
+  *)
+  ;;
+  obsoleted-target \
  )
     if test "x$enable_obsolete" != xyes; then
       echo "*** Configuration ${target} is obsolete." >&2
@@ -1740,42 +1741,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
@@ -1819,50 +1784,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 4ca300f..992638d 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 9297768..0000000
--- 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 d7e639a..0000000
--- 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 51b3abc..0000000
--- 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 5c0367c..acd712f 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -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
@@ -19709,7 +19694,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 19712 "configure"
+#line 19697 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19815,7 +19800,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 19818 "configure"
+#line 19803 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 31ec7d9..73f3f12 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 417c185..9f1b89aa 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 c66de1c..a6dad81 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 0b45e06..5724907 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 3c1913b..236128b 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-*-*] } {
@@ -562,8 +556,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-*-*] } {
 	return 0;
@@ -2827,10 +2819,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 c2d755b..423527d 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 40d015c..5b6f34e 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/libgcc/config.host b/libgcc/config.host
index fe2cf78..9dcc253 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/libitm/configure b/libitm/configure
index 18fc2d3..f2a8038 100755
--- a/libitm/configure
+++ b/libitm/configure
@@ -16096,7 +16096,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/libstdc++-v3/configure b/libstdc++-v3/configure
index 9e2ee86..1772eef 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -47955,20 +47955,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 e8ff89f..130f47f 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