diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 833078d8990b8c1c7a96ba927083d5e90bc0df66..1d01bd5c484afa40ca0dc7c7a2a0e4dd8e066248 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-07  Steve Ellcey  <sje@cup.hp.com>
+
+	PR other/25028
+	* config/ia64/t-hpux (LIB1ASMFUNCS):  Filter out _fixtfdi,
+	_fixunstfdi, and  _floatditf
+
 2006-11-06  Anatoly Sokolov <aesok@post.ru>
 
 	* config/avr/avr-protos.h (mask_one_bit_p, const_int_pow2_p): Remove 
diff --git a/gcc/config/ia64/t-hpux b/gcc/config/ia64/t-hpux
index 7d294d17457c6f4ca7adfee2e5af0b1a07265b3d..b925c73a51274cbff018038a23cd81c5808ddb9d 100644
--- a/gcc/config/ia64/t-hpux
+++ b/gcc/config/ia64/t-hpux
@@ -7,6 +7,12 @@ MULTILIB_OPTIONS = milp32/mlp64
 MULTILIB_DIRNAMES = hpux32 hpux64
 MULTILIB_MATCHES =
 
+# On HP-UX we do not want _fixtfdi, _fixunstfdi, or _floatditf from
+# LIB1ASMSRC.  These functions map the 128 bit conversion function names
+# to 80 bit conversions and were done for Linux backwards compatibility.
+
+LIB1ASMFUNCS := $(filter-out _fixtfdi _fixunstfdi _floatditf,$(LIB1ASMFUNCS))
+
 # Support routines for HP-UX 128 bit floats.
 
 LIB2FUNCS_EXTRA=quadlib.c $(srcdir)/config/floatunsitf.c
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 74f54970121eacf336a2cf4e7d070406f2499350..22e43d0f23ace6436211c9f733f07f381f7e319c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-07  Steve Ellcey  <sje@cup.hp.com>
+
+	PR other/25028
+	* gcc.dg/torture/fp-int-convert-float128-timode.c:  Do not XFAIL
+	on HP-UX.
+
 2006-11-07 Paul Thomas <pault@gcc.gnu.org>
 
 	PR fortran/29539
diff --git a/gcc/testsuite/gcc.dg/torture/fp-int-convert-float128-timode.c b/gcc/testsuite/gcc.dg/torture/fp-int-convert-float128-timode.c
index 7d090e16861c4dbd2969fd264bd8e6bb0e8fe02b..7693d17d31682cc321c9382846819e539209c607 100644
--- a/gcc/testsuite/gcc.dg/torture/fp-int-convert-float128-timode.c
+++ b/gcc/testsuite/gcc.dg/torture/fp-int-convert-float128-timode.c
@@ -2,7 +2,7 @@
 /* Origin: Joseph Myers <joseph@codesourcery.com> */
 /* { dg-do run { target { ia64-*-* || { { i?86-*-* x86_64-*-*} && lp64 } } } } */
 /* { dg-xfail-if "" { i?86-*-* x86_64-*-* } { "*" } { "" } } */
-/* { dg-xfail-if "" { ia64-*-* && lp64 } { "*" } { "" } } */
+/* { dg-xfail-if "" { ia64-*-linux* } { "*" } { "" } } */
 /* { dg-options "" } */
 
 #include "fp-int-convert.h"