diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 51ed5b0eb29f0caf69a9f93fe9939cb9461f0d02..e1ce4ebc06aa6a5d44bde76fae2b76f92d05cf3c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2002-07-16  Stan Shebs  <shebs@apple.com>
+
+	* darwin.c (func_name_maybe_scoped): Remove unused decl.
+	(machopic_function_base_name): Declare result to be const.
+	(machopic_non_lazy_ptr_name): Ditto.
+	(machopic_stub_name): Ditto.
+	* darwin-protos.h: Ditto for the prototypes.
+
 Wed Jul 17 00:22:39 CEST 2002  Jan Hubicka  <jh@suse.cz>
 
 	* m68hc11.c (m68hc11_reorg): Do not rebuild CFG.
diff --git a/gcc/config/darwin-protos.h b/gcc/config/darwin-protos.h
index 19f83c62308725448e2a4cf67b5998e5457eb26d..96b614fd17a2568dd00f5413e9173c60e7cb300a 100644
--- a/gcc/config/darwin-protos.h
+++ b/gcc/config/darwin-protos.h
@@ -22,9 +22,9 @@ extern int name_needs_quotes PARAMS ((const char *));
 
 extern void machopic_validate_stub_or_non_lazy_ptr PARAMS ((const char *, int));
 
-extern char *machopic_function_base_name PARAMS ((void));
-extern char *machopic_non_lazy_ptr_name PARAMS ((const char*));
-extern char *machopic_stub_name PARAMS ((const char*));
+extern const char *machopic_function_base_name PARAMS ((void));
+extern const char *machopic_non_lazy_ptr_name PARAMS ((const char*));
+extern const char *machopic_stub_name PARAMS ((const char*));
 
 extern void machopic_picsymbol_stub_section PARAMS ((void));
 extern void machopic_symbol_stub_section PARAMS ((void));
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 82e320babe098655631ae7adfdb109eab2e0f354..e293abb7c77ecbc54a9b6dfdf0fa9054c1d7de3a 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -38,13 +38,11 @@ Boston, MA 02111-1307, USA.  */
 #include "function.h"
 #include "ggc.h"
 #include "langhooks.h"
-
 #include "darwin-protos.h"
 
 extern void machopic_output_stub PARAMS ((FILE *, const char *, const char *));
 
 static int machopic_data_defined_p PARAMS ((const char *));
-static int func_name_maybe_scoped PARAMS ((const char *));
 static void update_non_lazy_ptrs PARAMS ((const char *));
 static void update_stubs PARAMS ((const char *));
 
@@ -227,7 +225,7 @@ static char function_base[32];
 
 static int current_pic_label_num;
 
-char *
+const char *
 machopic_function_base_name ()
 {
   static const char *name = NULL;
@@ -263,7 +261,7 @@ static GTY(()) tree machopic_non_lazy_pointers;
    either by finding it in our list of pointer names, or by generating
    a new one.  */
 
-char * 
+const char * 
 machopic_non_lazy_ptr_name (name)
      const char *name;
 {
@@ -326,7 +324,7 @@ static GTY(()) tree machopic_stubs;
 /* Return the name of the stub corresponding to the given name,
    generating a new stub name if necessary.  */
 
-char * 
+const char * 
 machopic_stub_name (name)
      const char *name;
 {