* symtab.h (struct symbol): Make "aux_value" member a void pointer

	instead of a union.
	(SYMBOL_LOCATION_BATON): Update.

2 files changed, 21 insertions, 20 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index de0dd0a..0cf9e53 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 2008-05-22  Ulrich Weigand  <uweigand@de.ibm.com>
 
+	* symtab.h (struct symbol): Make "aux_value" member a void pointer
+	instead of a union.
+	(SYMBOL_LOCATION_BATON): Update.
+
+2008-05-22  Ulrich Weigand  <uweigand@de.ibm.com>
+
 	* symtab.h (enum address_class): Remove LOC_BASEREG and
 	LOC_BASEREG_ARG.
 	(struct symbol): Remove "basereg" member of "aux_value" union.
diff --git a/gdb/symtab.h b/gdb/symtab.h
index 5b28d10..cd9936a 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -587,25 +587,20 @@ struct symbol
 
   const struct symbol_ops *ops;
 
-  /* Some symbols require additional information to be recorded on a
-     per-symbol basis.  Stash those values here.  */
-
-  union
-  {
-    /* An arbitrary data pointer.  Note that this data must be
-       allocated using the same obstack as the symbol itself.  */
-    /* So far it is only used by LOC_COMPUTED and LOC_COMPUTED_ARG to
-       find the location information.  For a LOC_BLOCK symbol
-       for a function in a compilation unit compiled with DWARF 2
-       information, this is information used internally by the DWARF 2
-       code --- specifically, the location expression for the frame
-       base for this function.  */
-    /* FIXME drow/2003-02-21: For the LOC_BLOCK case, it might be better
-       to add a magic symbol to the block containing this information,
-       or to have a generic debug info annotation slot for symbols.  */
-    void *ptr;
-  }
-  aux_value;
+  /* An arbitrary data pointer, allowing symbol readers to record
+     additional information on a per-symbol basis.  Note that this data
+     must be allocated using the same obstack as the symbol itself.  */
+  /* So far it is only used by LOC_COMPUTED and LOC_COMPUTED_ARG to
+     find the location information.  For a LOC_BLOCK symbol
+     for a function in a compilation unit compiled with DWARF 2
+     information, this is information used internally by the DWARF 2
+     code --- specifically, the location expression for the frame
+     base for this function.  */
+  /* FIXME drow/2003-02-21: For the LOC_BLOCK case, it might be better
+     to add a magic symbol to the block containing this information,
+     or to have a generic debug info annotation slot for symbols.  */
+
+  void *aux_value;
 
   struct symbol *hash_next;
 };
@@ -617,7 +612,7 @@ struct symbol
 #define SYMBOL_LINE(symbol)		(symbol)->line
 #define SYMBOL_SYMTAB(symbol)		(symbol)->symtab
 #define SYMBOL_OPS(symbol)              (symbol)->ops
-#define SYMBOL_LOCATION_BATON(symbol)   (symbol)->aux_value.ptr
+#define SYMBOL_LOCATION_BATON(symbol)   (symbol)->aux_value
 
 /* A partial_symbol records the name, domain, and address class of
    symbols whose types we have not parsed yet.  For functions, it also