2010-03-15 Thomas Schwinge <thomas@codesourcery.com>

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

diff --git a/gas/read.c b/gas/read.c
index 614457068a1db2c8271cb82ac7f68c7e3720b2d0..9f75fee61ac22589df21b10abb92a194523fa27e 100644 (file)
--- a/gas/read.c
+++ b/gas/read.c
@@ -371,7 +371,7 @@ static const pseudo_typeS potable[] = {
   {"irpc", s_irp, 1},
   {"irepc", s_irp, 1},
   {"lcomm", s_lcomm, 0},
-  {"lflags", listing_flags, 0},        /* Listing flags.  */
+  {"lflags", s_ignore, 0},     /* Listing flags.  */
   {"linefile", s_app_line, 0},
   {"linkonce", s_linkonce, 0},
   {"list", listing_list, 1},   /* Turn listing on.  */
@@ -589,9 +589,9 @@ try_macro (char term, const char *line)
 void
 read_a_source_file (char *name)
 {
-  register char c;
-  register char *s;            /* String of symbol, '\0' appended.  */
-  register int temp;
+  char c;
+  char *s;             /* String of symbol, '\0' appended.  */
+  int temp;
   pseudo_typeS *pop;
 
 #ifdef WARN_COMMENTS
@@ -680,7 +680,6 @@ read_a_source_file (char *name)
                  if (is_name_beginner (*input_line_pointer))
                    {
                      char *line_start = input_line_pointer;
-                     char c;
                      int mri_line_macro;
 
                      HANDLE_CONDITIONAL_ASSEMBLY ();
@@ -3198,12 +3197,12 @@ s_space (int mult)
        }
       else if (mri_common_symbol != NULL)
        {
-         valueT val;
+         valueT mri_val;
 
-         val = S_GET_VALUE (mri_common_symbol);
-         if ((val & 1) != 0)
+         mri_val = S_GET_VALUE (mri_common_symbol);
+         if ((mri_val & 1) != 0)
            {
-             S_SET_VALUE (mri_common_symbol, val + 1);
+             S_SET_VALUE (mri_common_symbol, mri_val + 1);
              if (line_label != NULL)
                {
                  expressionS *symexp;
@@ -3750,6 +3749,7 @@ pseudo_set (symbolS *symbolP)
        }
       S_SET_SEGMENT (symbolP, undefined_section);
       symbol_set_value_expression (symbolP, &exp);
+      copy_symbol_attributes (symbolP, exp.X_add_symbol);
       set_zero_frag (symbolP);
       break;