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

        * 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.

From-SVN: r28644

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7a2ef1549b0aa2cb65b7a34834d4de9708155033..a1913076ddfe217b83d782191adffb42eb98d7c3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,49 @@
+Tue Aug 10 09:21:46 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * 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.
+
 Mon Aug  9 19:54:05 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * real.c (GET_REAL, PUT_REAL): Use memcpy instead of bcopy.

diff --git a/gcc/config/arm/pe.c b/gcc/config/arm/pe.c
index 60d6c4b104535317d782ec665fdfd3fe0f298443..563605aae207d0b17579387f11994425479f03b8 100644 (file)
--- 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 dbea466bc863d053d175c7a1836a1790d73452cc..11518ff49bb17b87e634e009bd89137a07c30a4e 100644 (file)
--- 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 8e9f44393ccf43088c8f038f6d070a47da3a39e7..1b5a6232c47ff5e4d27544d8dc7e6568124f7bab 100644 (file)
--- 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 40062c70e15e932c19f7c8db4d8526745084ec56..5a2b8b6ab41d3ac8de1d5afbd66b3a5e533fcab4 100644 (file)
--- 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 d62abbf16d8bb390bb2197b8312afbdaf58473c7..36f3ec74331bd7971f8de1b4976ff7ec9c141794 100644 (file)
--- 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 24d8617f8dfa01c83207358c1c229045c24cfd76..de66f4ed0551acf8da7a11906da6c287d57adaad 100644 (file)
--- 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 c0df79fd2d6b87ab0d65928a2cc056130ef2ff96..903745f328f3b48defed4336d778f723fded9209 100644 (file)
--- 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 c1e87609c5e0fe9a51814b45645e04f938f4945e..34b43225182205196031276d10c59ecd3c851778 100644 (file)
--- 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 548ce8294332f5c0971714e5e63dd7f31c0118af..b426413c4226b07793a6c0f1b064bcdbe82c5a91 100644 (file)
--- 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 cdf1a4bfd3cb203686d2aa1b5985c671076c6240..b49e6b67ba76c1ac6e8b7e49f937caaf67be7779 100644 (file)
--- 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 c27fbf09d26b5077ddc992e0d18c6d0d0ef6a72e..171153829386f86be061751ff82bf39e001ca1c3 100644 (file)
--- 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 6f3d779a1dbce07db7e46731d87116a1b24f47ca..a4406de032ae7699843985e344e35c98f28fc09e 100644 (file)
--- 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 b3b6fa21015dafab4db65ee568b9aa5f86a0833b..60a29b5f1350e7d5be38c03faff58139eaa13c75 100644 (file)
--- 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 3a86ec194e60123424ec1da184da179c621ea3b2..22cf7f2572d95179529b4d4f2aad7100e3eb612e 100644 (file)
--- 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 0f1b13b313b20f5f56ca3ae732ddb9d77e7a788b..91e5b42101868b5585e7bf0546e76f79e11e1288 100644 (file)
--- 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 27b7168bb98f06cd8096e938e4c9c72d67ce1df5..165d59ee622afc182b3db9739157db8eada81ad7 100644 (file)
--- 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 efffa918089d30edeb1a5bc1a011d35f8da879c1..588e3fe92d438833a0a4d4b339fb820b194f5940 100644 (file)
--- 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)           

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 33f7d97e4c5fc2c0eb3f0aded97dd6f396e068ee..33f60da3244b831759d5546b1de4004979be501f 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -2744,7 +2744,7 @@ static char debug_line_section_label[MAX_ARTIFICIAL_LABEL_BYTES];
        dyn_string_append (STR, NAME + 1);              \
       else                                             \
        {                                               \
-         char *newstr;                                 \
+         const char *newstr;                           \
          STRIP_NAME_ENCODING (newstr, NAME);           \
          dyn_string_append (STR, user_label_prefix);   \
          dyn_string_append (STR, newstr);              \

diff --git a/gcc/output.h b/gcc/output.h
index 1e88be55a846ec6ad677912338b6cbf8a534e693..f3375e5b5b53adbc4e267f59462bb0170f46a627 100644 (file)
--- a/gcc/output.h
+++ b/gcc/output.h
@@ -279,7 +279,7 @@ extern void assemble_label          PROTO((char *));
    Otherwise NAME is transformed in an implementation-defined way
    (usually by the addition of an underscore).
    Many macros in the tm file are defined to call this function.  */
-extern void assemble_name              PROTO((FILE *, char *));
+extern void assemble_name              PROTO((FILE *, const char *));
 
 #ifdef RTX_CODE
 /* Assemble the integer constant X into an object of SIZE bytes.

diff --git a/gcc/varasm.c b/gcc/varasm.c
index e429cd285fc41fd323507939bb435dec9e2aa028..44c44d9598e91880dfb3b85e3a84079d4e74ed61 100644 (file)
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -286,7 +286,8 @@ named_section (decl, name, reloc)
 #define UNIQUE_SECTION(DECL,RELOC)                             \
 do {                                                           \
   int len;                                                     \
-  char *name, *string;                                         \
+  const char *name;                                            \
+  char *string;                                                        \
                                                                \
   name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (DECL));      \
   /* Strip off any encoding in name.  */                       \
@@ -1000,7 +1001,7 @@ assemble_start_function (decl, fnname)
     {
       if (! first_global_object_name)
        {
-         char *p;
+         const char *p;
          char **name;
 
          if (! DECL_WEAK (decl) && ! DECL_ONE_ONLY (decl))
@@ -1279,7 +1280,7 @@ assemble_variable (decl, top_level, at_end, dont_output_data)
       && ! DECL_WEAK (decl)
       && ! DECL_ONE_ONLY (decl))
     {
-      char *p;
+      const char *p;
 
       STRIP_NAME_ENCODING (p, name);
       first_global_object_name = permalloc (strlen (p) + 1);
@@ -1680,9 +1681,9 @@ assemble_label (name)
 void
 assemble_name (file, name)
      FILE *file;
-     char *name;
+     const char *name;
 {
-  char *real_name;
+  const char *real_name;
   tree id;
 
   STRIP_NAME_ENCODING (real_name, name);