From 86cf98f3456b103c93fda54f0970d454c0a2f744 Mon Sep 17 00:00:00 2001
From: Richard Henderson <rth@redhat.com>
Date: Tue, 1 Jan 2002 01:16:44 +0000
Subject: [PATCH]         * config/tc-ia64.c (errata_nop_necessary_p):
 Prototype.         (make_unw_section_name): Constify local variables.

---
 gas/ChangeLog        | 5 +++++
 gas/config/tc-ia64.c | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index e343dc18097..d3d8e43740e 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-31  Richard Henderson  <rth@redhat.com>
+
+	* config/tc-ia64.c (errata_nop_necessary_p): Prototype.
+	(make_unw_section_name): Constify local variables.
+
 Mon Dec 31 16:48:07 2001  Jeffrey A Law  (law@redhat.com)
 
         * config/tc-hppa.c (pa_ip): Handle new 'c' mode completers,
diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index 8c98cc2c00a..4056dc264d6 100644
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -719,6 +719,7 @@ static enum operand_match_result operand_match PARAMS ((const struct ia64_opcode
 							expressionS *e));
 static int parse_operand PARAMS ((expressionS *e));
 static struct ia64_opcode * parse_operands PARAMS ((struct ia64_opcode *));
+static int errata_nop_necessary_p PARAMS ((struct slot *, enum ia64_unit));
 static void build_insn PARAMS ((struct slot *, bfd_vma *));
 static void emit_one_bundle PARAMS ((void));
 static void fix_insn PARAMS ((fixS *, const struct ia64_operand *, valueT));
@@ -867,8 +868,8 @@ static int generate_unwind_image PARAMS ((const char *));
    stack, so this must be a macro... */
 #define make_unw_section_name(special, text_name, result)		   \
   {									   \
-    char *_prefix = special_section_name[special];			   \
-    char *_suffix = text_name;						   \
+    const char *_prefix = special_section_name[special];		   \
+    const char *_suffix = text_name;					   \
     size_t _prefix_len, _suffix_len;					   \
     char *_result;							   \
     if (strncmp (text_name, ".gnu.linkonce.t.",				   \