diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dd8838c7ee9b..7c757a02c64f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-25  Steve Ellcey  <sje@cup.hp.com>
+
+	* config/ia64/hpux.h: Define _INCLUDE__STDC_A1_SOURCE in C++.
+	Add unix98.o to link line.
+
 2006-10-25  Richard Sandiford  <richard@codesourcery.com>
 	    David Daney  <ddaney@avtrex.com>
 
diff --git a/gcc/config/ia64/hpux.h b/gcc/config/ia64/hpux.h
index 1fba106bce8c..82463f1fe616 100644
--- a/gcc/config/ia64/hpux.h
+++ b/gcc/config/ia64/hpux.h
@@ -53,6 +53,7 @@ do {							\
 	    builtin_define("_HPUX_SOURCE");		\
 	    builtin_define("__STDC_EXT__");		\
 	    builtin_define("__STDCPP__");		\
+	    builtin_define("_INCLUDE__STDC_A1_SOURCE");	\
 	  }						\
 	if (TARGET_ILP32)				\
 	  builtin_define("_ILP32");			\
@@ -71,7 +72,9 @@ do {							\
 #undef ENDFILE_SPEC
 
 #undef STARTFILE_SPEC
-#define STARTFILE_SPEC "%{!shared:%{static:crt0%O%s}}"
+#define STARTFILE_SPEC "%{!shared:%{static:crt0%O%s} \
+			  %{mlp64:/usr/lib/hpux64/unix98%O%s} \
+			  %{!mlp64:/usr/lib/hpux32/unix98%O%s}}"
 
 #undef LINK_SPEC
 #define LINK_SPEC \