2012-01-12 Tristan Gingold <gingold@adacore.com>

	PR gas/13591
	* config/obj-coff.h (sy_obj): Rename macro to avoid a name conflict.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index f11e62e..d4f2e7a 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-12  Tristan Gingold  <gingold@adacore.com>
+
+       PR gas/13591
+       * config/obj-coff.h (sy_obj): Rename macro to avoid a name conflict.
+
 2012-01-10  Tristan Gingold  <gingold@adacore.com>
 
        * struc-symbol.h (struct symbol_flags): New struct, created from...

diff --git a/gas/config/obj-coff.h b/gas/config/obj-coff.h
index fb9c6be..ff5548e 100644 (file)
--- a/gas/config/obj-coff.h
+++ b/gas/config/obj-coff.h
@@ -181,7 +181,7 @@
 #endif
 
 #define OBJ_SYMFIELD_TYPE      unsigned long
-#define sy_obj                 sy_flags
+#define sy_obj                 sy_obj_flags
 
 /* We can't use the predefined section symbols in bfd/section.c, as
    COFF symbols have extra fields.  See bfd/libcoff.h:coff_symbol_type.  */