diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8bd945a25b1..3dd474df0e1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+Mon Nov  1 14:35:50 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* output.h (assemble_end_function, assemble_destructor,
+	assemble_constructor, assemble_gc_entry, assemble_global,
+	assemble_label, output_constant_pool) Constify a char*.
+
+	* varasm.c (assemble_destructor, assemble_constructor,
+	assemble_gc_entry, assemble_end_function, assemble_global,
+	assemble_label, output_constant_pool): Likewise.
+
 Mon Nov  1 14:22:51 1999  Nick Clifton  <nickc@cygnus.com>
 
 	* config/arm/thumb.c (thumb_expand_prologue): Add comments
diff --git a/gcc/output.h b/gcc/output.h
index d6c9076790b..8894da0efda 100644
--- a/gcc/output.h
+++ b/gcc/output.h
@@ -237,7 +237,7 @@ extern void assemble_start_function	PROTO((tree, char *));
 
 /* Output assembler code associated with defining the size of the
    function.  DECL describes the function.  NAME is the function's name.  */
-extern void assemble_end_function	PROTO((tree, char *));
+extern void assemble_end_function	PROTO((tree, const char *));
 
 /* Assemble everything that is needed for a variable or function declaration.
    Not used for automatic variables, and not used for function definitions.
@@ -262,14 +262,14 @@ extern void assemble_external		PROTO((tree));
 
    NAME should be the name of a global function to be called
    at exit time.  This name is output using assemble_name.  */
-extern void assemble_destructor		PROTO((char *));
+extern void assemble_destructor		PROTO((const char *));
 
 /* Likewise for global constructors.  */
-extern void assemble_constructor	PROTO((char *));
+extern void assemble_constructor	PROTO((const char *));
 
 /* Likewise for entries we want to record for garbage collection.
    Garbage collection is still under development.  */
-extern void assemble_gc_entry		PROTO((char *));
+extern void assemble_gc_entry		PROTO((const char *));
 
 /* Assemble code to leave SIZE bytes of zeros.  */
 extern void assemble_zeros		PROTO((int));
@@ -286,10 +286,10 @@ extern void assemble_external_libcall	PROTO((rtx));
 #endif
 
 /* Declare the label NAME global.  */
-extern void assemble_global		PROTO((char *));
+extern void assemble_global		PROTO((const char *));
 
 /* Assemble a label named NAME.  */
-extern void assemble_label		PROTO((char *));
+extern void assemble_label		PROTO((const char *));
 
 /* Output to FILE a reference to the assembler name of a C-level name NAME.
    If NAME starts with a *, the rest of NAME is output verbatim.
@@ -334,7 +334,7 @@ extern rtx peephole			PROTO((rtx));
 
 #ifdef TREE_CODE
 /* Write all the constants in the constant pool.  */
-extern void output_constant_pool	PROTO((char *, tree));
+extern void output_constant_pool	PROTO((const char *, tree));
 
 /* Return nonzero if VALUE is a valid constant-valued expression
    for use in initializing a static variable; one that can be an
diff --git a/gcc/varasm.c b/gcc/varasm.c
index e88f0cbd79c..5d342de5035 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -923,7 +923,7 @@ assemble_asm (string)
 
 void
 assemble_destructor (name)
-     char *name;
+     const char *name;
 {
 #ifdef ASM_OUTPUT_DESTRUCTOR
   ASM_OUTPUT_DESTRUCTOR (asm_out_file, name);
@@ -943,7 +943,7 @@ assemble_destructor (name)
 
 void
 assemble_constructor (name)
-     char *name;
+     const char *name;
 {
 #ifdef ASM_OUTPUT_CONSTRUCTOR
   ASM_OUTPUT_CONSTRUCTOR (asm_out_file, name);
@@ -964,7 +964,7 @@ assemble_constructor (name)
 
 void
 assemble_gc_entry (name)
-     char *name;
+     const char *name;
 {
 #ifdef ASM_OUTPUT_GC_ENTRY
   ASM_OUTPUT_GC_ENTRY (asm_out_file, name);
@@ -1101,7 +1101,7 @@ assemble_start_function (decl, fnname)
 void
 assemble_end_function (decl, fnname)
      tree decl;
-     char *fnname;
+     const char *fnname;
 {
 #ifdef ASM_DECLARE_FUNCTION_SIZE
   ASM_DECLARE_FUNCTION_SIZE (asm_out_file, fnname, decl);
@@ -1759,7 +1759,7 @@ assemble_external_libcall (fun)
 
 void
 assemble_global (name)
-     char *name;
+     const char *name;
 {
   ASM_GLOBALIZE_LABEL (asm_out_file, name);
 }
@@ -1768,7 +1768,7 @@ assemble_global (name)
 
 void
 assemble_label (name)
-     char *name;
+     const char *name;
 {
   ASM_OUTPUT_LABEL (asm_out_file, name);
 }
@@ -3744,7 +3744,7 @@ get_pool_size ()
 
 void
 output_constant_pool (fnname, fndecl)
-  char *fnname ATTRIBUTE_UNUSED;
+  const char *fnname ATTRIBUTE_UNUSED;
   tree fndecl ATTRIBUTE_UNUSED;
 {
   struct pool_constant *pool;