diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 821accb63ef..51b568c3681 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* config/rs6000/rs6000.c (uses_TOC): Correct comment.  Make static.
+	(rs6000_elf_declare_function_name): Formatting.
+	* config/rs6000/rs6000-protos.h (uses_TOC): Remove declaration.
+
 2004-01-15  Jan Hubicka  <jh@suse.cz>
 
 	PR bootstrap/13692
diff --git a/gcc/config/rs6000/rs6000-protos.h b/gcc/config/rs6000/rs6000-protos.h
index 982de3e8c98..abf39c6ed96 100644
--- a/gcc/config/rs6000/rs6000-protos.h
+++ b/gcc/config/rs6000/rs6000-protos.h
@@ -184,7 +184,6 @@ extern void private_data_section (void);
 extern void read_only_data_section (void);
 extern void read_only_private_data_section (void);
 extern int get_TOC_alias_set (void);
-extern int uses_TOC (void);
 extern void rs6000_emit_prologue (void);
 extern void rs6000_emit_load_toc_table (int);
 extern void rs6000_aix_emit_builtin_unwind_init (void);
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 2abd380beca..8c8c54b87a0 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -11138,11 +11138,10 @@ get_TOC_alias_set (void)
 }   
 
 /* This returns nonzero if the current function uses the TOC.  This is
-   determined by the presence of (unspec ... UNSPEC_TOC) or
-   use (unspec ... UNSPEC_TOC), which are generated by the various
-   load_toc_* patterns.  */
+   determined by the presence of (use (unspec ... UNSPEC_TOC)), which
+   is generated by the ABI_V4 load_toc_* patterns.  */
 
-int
+static int
 uses_TOC (void) 
 {
   rtx insn;
@@ -15167,7 +15166,7 @@ rs6000_elf_declare_function_name (FILE *file, const char *name, tree decl)
 
   if (TARGET_RELOCATABLE
       && (get_pool_size () != 0 || current_function_profile)
-      && uses_TOC())
+      && uses_TOC ())
     {
       char buf[256];