diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e4bb5c71b3a4c0cc2df75077b34337b38e6a709c..8e90a9d3d4f12f496001749ad5b06e297ad66125 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-20  Steve Ellcey  <sje@cup.hp.com>
+
+	PR target/30687
+	* doc/extend.texi (syscall_linkage): New.
+	(version_id): Modify.
+
 2009-01-20  Andrew Pinski  <andrew_pinski@playstation.sony.com>
 	Richard Guenther  <rguenther@suse.de>
 
diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
index 5a7e2d83e29030b1016376a3acc1908e170d186c..264e88a862d8254e606f16d1b228bb220eb40d49 100644
--- a/gcc/doc/extend.texi
+++ b/gcc/doc/extend.texi
@@ -2885,6 +2885,14 @@ On the Intel 386, the @code{stdcall} attribute causes the compiler to
 assume that the called function will pop off the stack space used to
 pass arguments, unless it takes a variable number of arguments.
 
+@item syscall_linkage
+@cindex @code{syscall_linkage} attribute
+This attribute is used to modify the IA64 calling convention by marking
+all input registers as live at all function exits.  This makes it possible
+to restart a system call after an interrupt without having to save/restore
+the input registers.  This also prevents kernel data from leaking into
+application code.
+
 @item target
 @cindex @code{target} function attribute
 The @code{target} attribute is used to specify that a function is to
@@ -3085,8 +3093,8 @@ This is useful, for example, when the function is referenced only in
 inline assembly.
 
 @item version_id
-@cindex @code{version_id} attribute on IA64 HP-UX
-This attribute, attached to a global variable or function, renames a
+@cindex @code{version_id} attribute
+This IA64 HP-UX attribute, attached to a global variable or function, renames a
 symbol to contain a version string, thus allowing for function level
 versioning.  HP-UX system header files may use version level functioning
 for some system calls.