* output.h (assemble_name): Constify a char*.

        * varasm.c (UNIQUE_SECTION, assemble_start_function,
        assemble_variable, assemble_name): Likewise.

        * dwarf2out.c (ASM_NAME_TO_STRING): Likewise.

        * arm/pe.c (arm_pe_unique_section): Likewise.

        * i386/cygwin.h (STRIP_NAME_ENCODING): Likewise.

        * i386/i386-interix.h (STRIP_NAME_ENCODING): Likewise.

        * i386/interix.c (i386_pe_unique_section): Likewise.

        * i386/win32.h (STRIP_NAME_ENCODING): Likewise.

        * i386/winnt.c (i386_pe_unique_section): Likewise.

        * m32r/m32r.h (ASM_OUTPUT_LABELREF): Likewise.

        * mn10200/mn10200.h (ASM_OUTPUT_LABELREF): Likewise.

        * mn10300/mn10300.h (ASM_OUTPUT_LABELREF): Likewise.

        * pa/pa.c (output_call): Likewise.

        * pa/pa.h (ASM_OUTPUT_MI_THUNK): Likewise.

        * pa/som.h (ASM_OUTPUT_FUNCTION_PREFIX): Likewise.

        * rs6000/rs6000.c (rs6000_output_load_toc_table, output_toc):
        Likewise.

        * rs6000/rs6000.h (RS6000_OUTPUT_BASENAME, STRIP_NAME_ENCODING):
        Likewise.

        * rs6000/sol2.h (ASM_OUTPUT_SOURCE_LINE): Likewise.

        * rs6000/sysv4.h (ASM_DECLARE_FUNCTION_NAME, ASM_OUTPUT_INT,
        STRIP_NAME_ENCODING, ASM_OUTPUT_LABELREF): Likewise.

        * v850/v850.h (ASM_OUTPUT_LABELREF): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@28644 138bc75d-0d04-0410-961f-82ee72b054a4

17 files changed, 48 insertions, 40 deletions

diff --git a/gcc/config/arm/pe.c b/gcc/config/arm/pe.c
index 60d6c4b1045..563605aae20 100644
--- a/gcc/config/arm/pe.c
+++ b/gcc/config/arm/pe.c
@@ -411,7 +411,7 @@ arm_pe_unique_section (decl, reloc)
      int reloc;
 {
   int len;
-  char * name;
+  const char * name;
   char * string;
   char * prefix;
 
diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h
index dbea466bc86..11518ff49bb 100644
--- a/gcc/config/i386/cygwin.h
+++ b/gcc/config/i386/cygwin.h
@@ -299,16 +299,17 @@ extern void i386_pe_encode_section_info ();
 #undef  STRIP_NAME_ENCODING
 #define STRIP_NAME_ENCODING(VAR,SYMBOL_NAME)				\
 do {									\
-  char *_p;								\
-  char *_name = I386_PE_STRIP_ENCODING (SYMBOL_NAME);			\
+  const char *_p;							\
+  const char *_name = I386_PE_STRIP_ENCODING (SYMBOL_NAME);		\
   for (_p = _name; *_p && *_p != '@'; ++_p)				\
     ;									\
   if (*_p == '@')							\
     {									\
       int _len = _p - _name;						\
-      (VAR) = (char *) alloca (_len + 1);				\
-      strncpy ((VAR), _name, _len);					\
-      (VAR)[_len] = '\0';						\
+      char *_new_name = (char *) alloca (_len + 1);			\
+      strncpy (_new_name, _name, _len);					\
+      _new_name[_len] = '\0';						\
+      (VAR) = _new_name;						\
     }									\
   else									\
     (VAR) = _name;							\
diff --git a/gcc/config/i386/i386-interix.h b/gcc/config/i386/i386-interix.h
index 8e9f44393cc..1b5a6232c47 100644
--- a/gcc/config/i386/i386-interix.h
+++ b/gcc/config/i386/i386-interix.h
@@ -482,16 +482,17 @@ while (0)
 #undef  STRIP_NAME_ENCODING
 #define STRIP_NAME_ENCODING(VAR,SYMBOL_NAME)				\
 do {									\
-  char *_p;								\
-  char *_name = SYMBOL_NAME;						\
+  const char *_p;							\
+  const char *_name = SYMBOL_NAME;					\
   for (_p = _name; *_p && *_p != '@'; ++_p)				\
     ;									\
   if (*_p == '@')							\
     {									\
       int _len = _p - _name;						\
-      (VAR) = (char *) alloca (_len + 1);				\
-      strncpy ((VAR), _name, _len);					\
-      (VAR)[_len] = '\0';						\
+      _new_name = (char *) alloca (_len + 1);				\
+      strncpy (_new_name, _name, _len);					\
+      _new_name[_len] = '\0';						\
+      (VAR) = _new_name;						\
     }									\
   else									\
     (VAR) = _name;							\
diff --git a/gcc/config/i386/interix.c b/gcc/config/i386/interix.c
index 40062c70e15..5a2b8b6ab41 100644
--- a/gcc/config/i386/interix.c
+++ b/gcc/config/i386/interix.c
@@ -78,7 +78,8 @@ i386_pe_unique_section (decl, reloc)
      int reloc;
 {
   int len;
-  char *name,*string,*prefix;
+  const char *name;
+  char *string,*prefix;
 
   name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl));
   /* Strip off any encoding in fnname.  */
diff --git a/gcc/config/i386/win32.h b/gcc/config/i386/win32.h
index d62abbf16d8..36f3ec74331 100644
--- a/gcc/config/i386/win32.h
+++ b/gcc/config/i386/win32.h
@@ -186,16 +186,17 @@ while (0)
 #undef  STRIP_NAME_ENCODING
 #define STRIP_NAME_ENCODING(VAR,SYMBOL_NAME)				\
 do {									\
-  char *_p;								\
-  char *_name = ((SYMBOL_NAME) + ((SYMBOL_NAME)[0] == '*'));		\
+  const char *_p;							\
+  const char *_name = ((SYMBOL_NAME) + ((SYMBOL_NAME)[0] == '*'));	\
   for (_p = _name; *_p && *_p != '@'; ++_p)				\
     ;									\
   if (*_p == '@')							\
     {									\
       int _len = _p - _name;						\
-      (VAR) = (char *) alloca (_len + 1);				\
-      strncpy ((VAR), _name, _len);					\
-      (VAR)[_len] = '\0';						\
+      char *_new_name = (char *) alloca (_len + 1);			\
+      strncpy (_new_name, _name, _len);					\
+      _new_name[_len] = '\0';						\
+      (VAR) = _new_name;						\
     }									\
   else									\
     (VAR) = _name;							\
diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c
index 24d8617f8df..de66f4ed055 100644
--- a/gcc/config/i386/winnt.c
+++ b/gcc/config/i386/winnt.c
@@ -463,7 +463,8 @@ i386_pe_unique_section (decl, reloc)
      int reloc;
 {
   int len;
-  char *name,*string,*prefix;
+  const char *name;
+  char *string,*prefix;
 
   name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl));
   /* Strip off any encoding in fnname.  */
diff --git a/gcc/config/m32r/m32r.h b/gcc/config/m32r/m32r.h
index c0df79fd2d6..903745f328f 100644
--- a/gcc/config/m32r/m32r.h
+++ b/gcc/config/m32r/m32r.h
@@ -1649,7 +1649,7 @@ do {				\
 #undef ASM_OUTPUT_LABELREF
 #define ASM_OUTPUT_LABELREF(FILE, NAME) \
 do {							\
-  char * real_name;					\
+  const char * real_name;				\
   STRIP_NAME_ENCODING (real_name, (NAME));		\
   asm_fprintf (FILE, "%U%s", real_name);		\
 } while (0)           
diff --git a/gcc/config/mn10200/mn10200.h b/gcc/config/mn10200/mn10200.h
index c1e87609c5e..34b43225182 100644
--- a/gcc/config/mn10200/mn10200.h
+++ b/gcc/config/mn10200/mn10200.h
@@ -898,7 +898,7 @@ do { char dstr[30];					\
 #undef ASM_OUTPUT_LABELREF
 #define ASM_OUTPUT_LABELREF(FILE, NAME)	          \
   do {                                            \
-  char* real_name;                                \
+  const char* real_name;                          \
   STRIP_NAME_ENCODING (real_name, (NAME));        \
   fprintf (FILE, "_%s", real_name);               \
   } while (0)           
diff --git a/gcc/config/mn10300/mn10300.h b/gcc/config/mn10300/mn10300.h
index 548ce829433..b426413c422 100644
--- a/gcc/config/mn10300/mn10300.h
+++ b/gcc/config/mn10300/mn10300.h
@@ -897,7 +897,7 @@ do { char dstr[30];					\
 #undef ASM_OUTPUT_LABELREF
 #define ASM_OUTPUT_LABELREF(FILE, NAME)	          \
   do {                                            \
-  char* real_name;                                \
+  const char* real_name;                          \
   STRIP_NAME_ENCODING (real_name, (NAME));        \
   fprintf (FILE, "_%s", real_name);               \
   } while (0)           
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index cdf1a4bfd3c..b49e6b67ba7 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -5390,7 +5390,7 @@ output_call (insn, call_dest)
 	    {
 	      struct obstack *ambient_obstack = current_obstack;
 	      struct obstack *ambient_rtl_obstack = rtl_obstack;
-	      char *real_name;
+	      const char *real_name;
 
 	      /* Any RTL we create here needs to live until the end of
 		 the compilation unit and therefore must live on the
diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h
index c27fbf09d26..17115382938 100644
--- a/gcc/config/pa/pa.h
+++ b/gcc/config/pa/pa.h
@@ -1074,7 +1074,7 @@ extern struct rtx_def *hppa_compare_op0, *hppa_compare_op1;
 extern enum cmp_type hppa_branch_type;
 
 #define ASM_OUTPUT_MI_THUNK(FILE, THUNK_FNDECL, DELTA, FUNCTION) \
-{ char *target_name = XSTR (XEXP (DECL_RTL (FUNCTION), 0), 0); \
+{ const char *target_name = XSTR (XEXP (DECL_RTL (FUNCTION), 0), 0); \
   STRIP_NAME_ENCODING (target_name, target_name); \
   output_function_prologue (FILE, 0); \
   if (VAL_14_BITS_P (DELTA)) \
diff --git a/gcc/config/pa/som.h b/gcc/config/pa/som.h
index 6f3d779a1db..a4406de032a 100644
--- a/gcc/config/pa/som.h
+++ b/gcc/config/pa/som.h
@@ -121,7 +121,7 @@ do {								\
    that the section name will have a "." prefix.  */
 #define ASM_OUTPUT_FUNCTION_PREFIX(FILE, NAME) \
   {									\
-    char *name;								\
+    const char *name;							\
     STRIP_NAME_ENCODING (name, NAME);					\
     if (TARGET_GAS && in_section == in_text) 				\
       fputs ("\t.NSUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY\n", FILE); \
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index b3b6fa21015..60a29b5f135 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -4014,7 +4014,7 @@ rs6000_output_load_toc_table (file, reg)
       if (rs6000_pic_func_labelno != rs6000_pic_labelno)
 	{
 	  const char *init_ptr = TARGET_32BIT ? ".long" : ".quad";
-	  char *buf_ptr;
+	  const char *buf_ptr;
 
 	  ASM_OUTPUT_INTERNAL_LABEL (file, "LCL", rs6000_pic_labelno);
 
@@ -4949,7 +4949,7 @@ output_toc (file, x, labelno)
 {
   char buf[256];
   char *name = buf;
-  char *real_name;
+  const char *real_name;
   rtx base = x;
   int offset = 0;
 
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index 3a86ec194e6..22cf7f2572d 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -2755,7 +2755,7 @@ extern int toc_initialized;
 
 #define RS6000_OUTPUT_BASENAME(FILE, NAME)	\
   {						\
-    char *_p;					\
+    const char *_p;				\
 						\
     STRIP_NAME_ENCODING (_p, (NAME));		\
     assemble_name ((FILE), _p);			\
@@ -2766,7 +2766,7 @@ extern int toc_initialized;
 #define STRIP_NAME_ENCODING(VAR,NAME)					\
   do									\
     {									\
-      char *_name = (NAME);						\
+      const char *_name = (NAME);					\
       int _len;								\
       if (_name[0] == '*')						\
 	_name++;							\
@@ -2775,9 +2775,10 @@ extern int toc_initialized;
 	(VAR) = _name;							\
       else								\
 	{								\
-	  (VAR) = (char *) alloca (_len + 1);				\
-	  strcpy ((VAR), _name);					\
-	  (VAR)[_len - 4] = '\0';					\
+	  char *_new_name = (char *) alloca (_len + 1);			\
+	  strcpy (_new_name, _name);					\
+	  _new_name[_len - 4] = '\0';					\
+	  (VAR) = _new_name;						\
 	}								\
     }									\
   while (0)
diff --git a/gcc/config/rs6000/sol2.h b/gcc/config/rs6000/sol2.h
index 0f1b13b313b..91e5b421018 100644
--- a/gcc/config/rs6000/sol2.h
+++ b/gcc/config/rs6000/sol2.h
@@ -102,7 +102,7 @@ do {									\
 do									\
   {									\
     static int sym_lineno = 1;						\
-    char *_p;								\
+    const char *_p;							\
     fprintf (file, "\t.stabd 68,0,%d,.LM%d-",				\
 	     line, sym_lineno);						\
     STRIP_NAME_ENCODING (_p, XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0)); \
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index 27b7168bb98..165d59ee622 100644
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -627,13 +627,14 @@ extern int rs6000_pic_labelno;
 #undef	ASM_DECLARE_FUNCTION_NAME
 #define ASM_DECLARE_FUNCTION_NAME(FILE, NAME, DECL)			\
   do {									\
-    char *orig_name;							\
-    char *init_ptr = (TARGET_64BIT) ? ".quad" : ".long";		\
+    const char *orig_name;						\
+    const char *init_ptr = (TARGET_64BIT) ? ".quad" : ".long";		\
     STRIP_NAME_ENCODING (orig_name, NAME);				\
 									\
     if (TARGET_RELOCATABLE && (get_pool_size () != 0 || profile_flag))	\
       {									\
-	char buf[256], *buf_ptr;					\
+	char buf[256];							\
+	const char *buf_ptr;						\
 									\
 	ASM_OUTPUT_INTERNAL_LABEL (FILE, "LCL", rs6000_pic_labelno);	\
 									\
@@ -652,7 +653,7 @@ extern int rs6000_pic_labelno;
 									\
     if (DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_NT)		\
       {									\
-	char *desc_name = orig_name;					\
+	const char *desc_name = orig_name;				\
 									\
 	while (*desc_name == '.')					\
 	  desc_name++;							\
@@ -770,7 +771,8 @@ do {									\
       && CONSTANT_P (VALUE))						\
     {									\
       static int labelno = 0;						\
-      char buf[256], *p;						\
+      char buf[256];							\
+      const char *p;							\
 									\
       recurse = 1;							\
       ASM_GENERATE_INTERNAL_LABEL (buf, "LCP", labelno++);		\
@@ -835,7 +837,7 @@ extern void rs6000_encode_section_info ();
 #undef  STRIP_NAME_ENCODING
 #define STRIP_NAME_ENCODING(VAR,SYMBOL_NAME)				\
 do {									\
-  char *_name = SYMBOL_NAME;						\
+  const char *_name = SYMBOL_NAME;					\
   while (*_name == '*' || *_name == '@')				\
     _name++;								\
   (VAR) = _name;							\
@@ -847,7 +849,7 @@ do {									\
 #undef ASM_OUTPUT_LABELREF
 #define ASM_OUTPUT_LABELREF(FILE,NAME)	\
 do {									\
-  char *_name = NAME;							\
+  const char *_name = NAME;						\
   while (*_name == '*' || *_name == '@')				\
     _name++;								\
   fputs (_name, FILE);							\
diff --git a/gcc/config/v850/v850.h b/gcc/config/v850/v850.h
index efffa918089..588e3fe92d4 100644
--- a/gcc/config/v850/v850.h
+++ b/gcc/config/v850/v850.h
@@ -1342,7 +1342,7 @@ do { char dstr[30];					\
 #undef ASM_OUTPUT_LABELREF
 #define ASM_OUTPUT_LABELREF(FILE, NAME)	          \
   do {                                            \
-  char* real_name;                                \
+  const char* real_name;                          \
   STRIP_NAME_ENCODING (real_name, (NAME));        \
   fprintf (FILE, "_%s", real_name);               \
   } while (0)