* dw2gencfi.c (cfi_parse_arg): Only use tc_regname_to_dw2regnum if

	defined.
	(dot_cfi_endproc): Avoid C99 construct.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index e4293522cf8b2e34fce463f14cd2ebe0e0c51013..fc4d3f98f0f20e72f10093d993560eff8eb943f9 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-20  Alan Modra  <amodra@bigpond.net.au>
+
+       * dw2gencfi.c (cfi_parse_arg): Only use tc_regname_to_dw2regnum if
+       defined.
+       (dot_cfi_endproc): Avoid C99 construct.
+
 2003-05-20  Michal Ludvig  <mludvig@suse.cz>
 
        * dw2gencfi.c, dw2gencfi.h: New files.

diff --git a/gas/dw2gencfi.c b/gas/dw2gencfi.c
index f83610b376563da89421108803a45ba35d8b8249..36a5722eeecd832febd15b252542be99b9fe997d 100644 (file)
--- a/gas/dw2gencfi.c
+++ b/gas/dw2gencfi.c
@@ -125,7 +125,6 @@ alloc_cfi_info (void)
 static int
 cfi_parse_arg (long *param, int resolvereg)
 {
-  char *name, c, *p;
   long value;
   int retval = -1;
   int nchars;
@@ -138,8 +137,11 @@ cfi_parse_arg (long *param, int resolvereg)
       input_line_pointer += nchars;
       retval = 1;
     }
+#ifdef tc_regname_to_dw2regnum
   else if (resolvereg && (is_name_beginner (*input_line_pointer)))
     {
+      char *name, c, *p;
+
       name = input_line_pointer;
       c = get_symbol_end ();
       p = input_line_pointer;
@@ -149,6 +151,7 @@ cfi_parse_arg (long *param, int resolvereg)
 
       *p = c;
     }
+#endif
   else
     as_bad (resolvereg ?
            _("can't convert argument to a register number") :
@@ -539,6 +542,7 @@ dot_cfi_endproc (void)
   unsigned long  buf_size, cie_size, fde_size, last_cie_offset;
   unsigned long        fde_initloc_offset, fde_len_offset;
   void *saved_seg, *cfi_seg;
+  expressionS exp;
 
   if (! cfi_info)
     {
@@ -653,7 +657,6 @@ dot_cfi_endproc (void)
 
   /* Set relocation for initial address.  */
   buf_size = current_config.addr_length;
-  expressionS exp;
   memset (&exp, 0, sizeof (exp));
   exp.X_op = O_symbol;
   exp.X_add_symbol = symbol_find (cfi_info->labelname);