* Changes to keep a full expression as the value of a symbol, not

	just a longword:
	* struc-symbol.h: New field sy_value.
	* as.h: Include expr.h before struc-symbol.h.
	* expr.h: Use struct symbol rather than symbolS.
	* symbols.c (S_GET_VALUE, S_SET_VALUE): Rewrote to retrieve value
	of sy_value field; compile unconditionally, not just if
	BFD_ASSEMBLER.
	* symbols.h: Compile S_{SG}ET_VALUE prototypes unconditionally.
	* write.c (write_object_file): Set BFD symbol value to gas symbol
	value.
	* config/obj-aout.h, config/obj-bout.h, config/obj-coff.h,
	config/obj-coffbfd.h, config/obj-generic.h, config/obj-vms.h
	(S_GET_VALUE, S_SET_VALUE): Removed macro definitions.
	* config/obj-ieee.c (S_GET_VALUE, S_SET_VALUE): Removed.
	* config/obj-coff.h, obj-coffbfd.h: Rewrote several macros to use
	S_GET_VALUE rather than ost_entry.n_value.
	* config/obj-aout.c (obj_symbol_to_chars), config/obj-bout.c
	(obj_symbol_to_chars), config/obj-coff.c (obj_symbol_to_chars),
	config/obj-coffbfd.c (symbol_to_chars): Get value to write out
	using S_GET_VALUE--don't assume it is already set.
	* config/obj-ieee.c (do_symbols): Set BFD symbol value to gas
	symbol value.
	* config/obj-vms.c (various): Don't assign directly to
	S_GET_VALUE; use S_SET_VALUE instead.

1 files changed, 22 insertions, 15 deletions

diff --git a/gas/symbols.c b/gas/symbols.c
index e39e50c..24fe3d8 100644
--- a/gas/symbols.c
+++ b/gas/symbols.c
@@ -946,6 +946,28 @@ decode_local_label_name (s)
   return (symbol_decode);
 }				/* decode_local_label_name() */
 
+/* Get the value of a symbol.  */
+
+valueT
+S_GET_VALUE (s)
+     symbolS *s;
+{
+  if (s->sy_value.X_seg != absolute_section)
+    as_bad ("Attempt to get value of unresolved symbol");
+  return (valueT) s->sy_value.X_add_number;
+}
+
+/* Set the value of a symbol.  */
+
+void
+S_SET_VALUE (s, val)
+     symbolS *s;
+     valueT val;
+{
+  s->sy_value.X_seg = absolute_section;
+  s->sy_value.X_add_number = (offsetT) val;
+}
+
 #ifdef BFD_ASSEMBLER
 
 int
@@ -1016,13 +1038,6 @@ S_IS_STABD (s)
   return S_GET_NAME (s) == 0;
 }
 
-valueT
-S_GET_VALUE (s)
-     symbolS *s;
-{
-  return s->bsym->value;
-}
-
 CONST char *
 S_GET_NAME (s)
      symbolS *s;
@@ -1038,14 +1053,6 @@ S_GET_SEGMENT (s)
 }
 
 void
-S_SET_VALUE (s, val)
-     symbolS *s;
-     valueT val;
-{
-  s->bsym->value = val;
-}
-
-void
 S_SET_SEGMENT (s, seg)
      symbolS *s;
      segT seg;