* dw2gencfi.c (TC_DWARF2_EMIT_OFFSET): Provide default.

[binutils-gdb.git] / gas / macro.c

diff --git a/gas/macro.c b/gas/macro.c
index f77be59ad7b6e4a0ac6251e72af4936b796f160b..e39288355cbb7fbb63997262fad81264feb060be 100644 (file)
--- a/gas/macro.c
+++ b/gas/macro.c
@@ -75,14 +75,14 @@ static int macro_number;
 
 void
 macro_init (int alternate, int mri, int strip_at,
-           int (*expr) (const char *, int, sb *, int *))
+           int (*exp) (const char *, int, sb *, int *))
 {
   macro_hash = hash_new ();
   macro_defined = 0;
   macro_alternate = alternate;
   macro_mri = mri;
   macro_strip_at = strip_at;
-  macro_expr = expr;
+  macro_expr = exp;
 }
 
 /* Switch in and out of alternate mode on the fly.  */
@@ -748,6 +748,8 @@ sub_actual (int start, sb *in, sb *t, struct hash_control *formal_hash,
       /* Doing this permits people to use & in macro bodies.  */
       sb_add_char (out, '&');
       sb_add_sb (out, t);
+      if (src != start && in->ptr[src - 1] == '&')
+       sb_add_char (out, '&');
     }
   else if (copyifnotthere)
     {
@@ -788,9 +790,8 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
            }
          else
            {
-             /* FIXME: Why do we do this?  */
-             /* At least in alternate mode this seems correct; without this
-                one can't append a literal to a parameter.  */
+             /* Permit macro parameter substition delineated with
+                an '&' prefix and optional '&' suffix.  */
              src = sub_actual (src + 1, in, &t, formal_hash, '&', out, 0);
            }
        }
@@ -868,7 +869,9 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
          if (! macro
              || src + 5 >= in->len
              || strncasecmp (in->ptr + src, "LOCAL", 5) != 0
-             || ! ISWHITE (in->ptr[src + 5]))
+             || ! ISWHITE (in->ptr[src + 5])
+             /* PR 11507: Skip keyword LOCAL if it is found inside a quoted string.  */
+             || inquote)
            {
              sb_reset (&t);
              src = sub_actual (src, in, &t, formal_hash,
@@ -1070,9 +1073,13 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out)
          /* Lookup the formal in the macro's list.  */
          ptr = (formal_entry *) hash_find (m->formal_hash, sb_terminate (&t));
          if (!ptr)
-           as_bad (_("Parameter named `%s' does not exist for macro `%s'"),
-                   t.ptr,
-                   m->name);
+           {
+             as_bad (_("Parameter named `%s' does not exist for macro `%s'"),
+                     t.ptr,
+                     m->name);
+             sb_reset (&t);
+             idx = get_any_string (idx + 1, in, &t);
+           }
          else
            {
              /* Insert this value into the right place.  */
@@ -1204,7 +1211,7 @@ check_macro (const char *line, sb *expand,
             const char **error, macro_entry **info)
 {
   const char *s;
-  char *copy, *cs;
+  char *copy, *cls;
   macro_entry *macro;
   sb line_sb;
 
@@ -1221,8 +1228,8 @@ check_macro (const char *line, sb *expand,
   copy = (char *) alloca (s - line + 1);
   memcpy (copy, line, s - line);
   copy[s - line] = '\0';
-  for (cs = copy; *cs != '\0'; cs++)
-    *cs = TOLOWER (*cs);
+  for (cls = copy; *cls != '\0'; cls ++)
+    *cls = TOLOWER (*cls);
 
   macro = (macro_entry *) hash_find (macro_hash, copy);