diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b8d5b07d6049..33553c337edd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-15  Steve Ellcey  <sje@cup.hp.com>
+
+	PR other/25028
+	* config/ia64/t-hpux (LIB1ASMFUNCS):  Filter out _fixtfdi,
+	_fixunstfdi, and  _floatditf
+
 2006-11-15  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/29581
diff --git a/gcc/config/ia64/t-hpux b/gcc/config/ia64/t-hpux
index 7d294d17457c..b925c73a5127 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