diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4908f5c6137695b572a7b2b82425dd74546848b8..e8a26efe66d64786a4581b612175af1930600436 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2006-02-05  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* pa/x-ada-hpux10, pa/t-pa-hpux10, pa/t-pa-hpux11: New files.
+	* config.gcc (hppa[12]*-*-hpux10*): Use pa/t-pa-hpux10 instead of
+	pa/t-pa.
+	* config.gcc (hppa[12]*-*-hpux11*): Use pa/t-pa-hpux11 instead of
+	pa/t-pa.
+	* config.host (hppa*-*-hpux10*): Use pa/x-ada-hpux10 instead of
+	pa/x-ada.
+	* pa/t-pa-hpux: Add lib2funcs.asm and quadlib.c rules.
+	* pa/t-pa64: Delete quadlib.c rule.
+	* pa/x-ada: Revert last change.
+	* pa/t-pa: Revert last change.  Delete quadlib.c rule.
+
 2006-02-04  Zdenek Dvorak <dvorakz@suse.cz>
 
 	PR rtl-optimization/26087
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 0ac27c342a5979716da8bd19a7c52c8e3c866439..d4fdac31518a5996139c436a4b3d4d8f92b2d7b7 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -890,7 +890,7 @@ hppa[12]*-*-hpux10*)
 		extra_options="${extra_options} pa/pa-hpux1010.opt"
 		;;
 	esac
-	tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
+	tmake_file="pa/t-pa-hpux10 pa/t-pa-hpux pa/t-hpux-shlib"
 	case ${enable_threads} in
 	  "")
 	    if test x$have_pthread_h = xyes ; then
@@ -967,7 +967,7 @@ hppa[12]*-*-hpux11*)
 		extra_options="${extra_options} pa/pa-hpux1111.opt"
 		;;
 	esac
-	tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
+	tmake_file="pa/t-pa-hpux11 pa/t-pa-hpux pa/t-hpux-shlib"
 	# Set the libgcc version number
 	if test x$sjlj = x1; then
 	    tmake_file="$tmake_file pa/t-slibgcc-sjlj-ver"
diff --git a/gcc/config.host b/gcc/config.host
index 8d227dd68f6f89561a682a4e88fe421d21c0881e..f9b39e682f2bdd77b304a0046078de108571cc84 100644
--- a/gcc/config.host
+++ b/gcc/config.host
@@ -119,7 +119,10 @@ case ${host} in
   hppa1.1-*-bsd*)
     host_xmake_file="pa/x-ada"
     ;;
-  hppa1.0-*-hpux10* | hppa1.1-*-hpux10* | hppa2*-*-hpux10* | \
+  hppa1.0-*-hpux10* | hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
+    out_host_hook_obj=host-hpux.o
+    host_xmake_file="pa/x-ada-hpux10 x-hpux"
+    ;;
   hppa1.0-*-hpux11* | hppa1.1-*-hpux11* | hppa2*-*-hpux11* | \
   hppa*64*-*-hpux11*)
     out_host_hook_obj=host-hpux.o
diff --git a/gcc/config/pa/t-pa b/gcc/config/pa/t-pa
index 5b1a0f911b31912c4b596443a3af4a4dd9459dbd..cad060da0665e4b3e04c4b6e94b44c526ee4d7d6 100644
--- a/gcc/config/pa/t-pa
+++ b/gcc/config/pa/t-pa
@@ -1,15 +1,7 @@
-LIB2FUNCS_EXTRA=lib2funcs.asm quadlib.c
+TARGET_LIBGCC2_CFLAGS = -fPIC
+
+LIB2FUNCS_EXTRA=lib2funcs.asm
 
 lib2funcs.asm: $(srcdir)/config/pa/lib2funcs.asm
 	rm -f lib2funcs.asm
 	cp $(srcdir)/config/pa/lib2funcs.asm .
-
-quadlib.c: $(srcdir)/config/pa/quadlib.c
-	rm -f quadlib.c
-	cp $(srcdir)/config/pa/quadlib.c .
-
-ifeq ($(strip $(filter-out hppa% hp hpux10%,$(targ))),)
-  TARGET_LIBGCC2_CFLAGS = -fPIC -D_T_HPUX10
-else
-  TARGET_LIBGCC2_CFLAGS = -fPIC
-endif
diff --git a/gcc/config/pa/t-pa-hpux b/gcc/config/pa/t-pa-hpux
index 11c28466e76cc09d407d599e7cb5df6a2c6029e3..1c62f4ee237a1444c4933fcb1e1386b51fde2601 100644
--- a/gcc/config/pa/t-pa-hpux
+++ b/gcc/config/pa/t-pa-hpux
@@ -1,2 +1,10 @@
 # So putenv and other functions get seen by fixproto.
 FIXPROTO_DEFINES = -D_HPUX_SOURCE -D_HIUX_SOURCE
+
+lib2funcs.asm: $(srcdir)/config/pa/lib2funcs.asm
+	rm -f lib2funcs.asm
+	cp $(srcdir)/config/pa/lib2funcs.asm .
+
+quadlib.c: $(srcdir)/config/pa/quadlib.c
+	rm -f quadlib.c
+	cp $(srcdir)/config/pa/quadlib.c .
diff --git a/gcc/config/pa/t-pa-hpux10 b/gcc/config/pa/t-pa-hpux10
new file mode 100644
index 0000000000000000000000000000000000000000..105ef19f365a8886c3299bbfaf86e298115aaaa2
--- /dev/null
+++ b/gcc/config/pa/t-pa-hpux10
@@ -0,0 +1,2 @@
+TARGET_LIBGCC2_CFLAGS = -fPIC -D_T_HPUX10
+LIB2FUNCS_EXTRA=lib2funcs.asm quadlib.c
diff --git a/gcc/config/pa/t-pa-hpux11 b/gcc/config/pa/t-pa-hpux11
new file mode 100644
index 0000000000000000000000000000000000000000..f36a75cb9c5e56e6eec3976cbd9ea9d1b8096165
--- /dev/null
+++ b/gcc/config/pa/t-pa-hpux11
@@ -0,0 +1,2 @@
+TARGET_LIBGCC2_CFLAGS = -fPIC
+LIB2FUNCS_EXTRA=lib2funcs.asm quadlib.c
diff --git a/gcc/config/pa/t-pa64 b/gcc/config/pa/t-pa64
index e80406009a654b688192392e4575ff4d705fcde8..b302cffca3ffb0e5e6250a4212a7ce0e15d957dd 100644
--- a/gcc/config/pa/t-pa64
+++ b/gcc/config/pa/t-pa64
@@ -1,10 +1,2 @@
 TARGET_LIBGCC2_CFLAGS = -fPIC -Dpa64=1 -DELF=1 -mlong-calls
-
 LIB2FUNCS_EXTRA=quadlib.c
-
-# We'll need this once .init sections are enabled on PA64.
-#EXTRA_PARTS = crtbegin.o crtend.o
-
-quadlib.c: $(srcdir)/config/pa/quadlib.c
-	rm -f quadlib.c
-	cp $(srcdir)/config/pa/quadlib.c .
diff --git a/gcc/config/pa/x-ada b/gcc/config/pa/x-ada
index 1e1ba698ec0e67f214ac272777de2c17481f472a..b60b3d7925bfb6337e9b8d3867ead1bccf585741 100644
--- a/gcc/config/pa/x-ada
+++ b/gcc/config/pa/x-ada
@@ -1,10 +1,4 @@
 # 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.
-# On HP-UX 10 hosts, we define _X_HPUX10 to cause __main () to be called at
-# startup.
-ifeq ($(strip $(filter-out hppa% hp hpux10%,$(targ))),)
-  X_ADA_CFLAGS = -mdisable-indexing -D_X_HPUX10
-else
-  X_ADA_CFLAGS = -mdisable-indexing
-endif
+X_ADA_CFLAGS=-mdisable-indexing
diff --git a/gcc/config/pa/x-ada-hpux10 b/gcc/config/pa/x-ada-hpux10
new file mode 100644
index 0000000000000000000000000000000000000000..d2b70753088d678b85478e31e8c2c37f4173dc1a
--- /dev/null
+++ b/gcc/config/pa/x-ada-hpux10
@@ -0,0 +1,4 @@
+# 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.
+X_ADA_CFLAGS = -mdisable-indexing -D_X_HPUX10