* 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, 556 insertions, 433 deletions

diff --git a/gas/config/obj-aout.c b/gas/config/obj-aout.c
index db3c3ec..c074df2 100644
--- a/gas/config/obj-aout.c
+++ b/gas/config/obj-aout.c
@@ -1,113 +1,150 @@
 /* a.out object file format
-   Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
-   
-   This file is part of GAS, the GNU Assembler.
-   
-   GAS is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2,
-   or (at your option) any later version.
-   
-   GAS is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-   the GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public
-   License along with GAS; see the file COPYING.  If not, write
-   to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+   Copyright (C) 1989, 1990, 1991 Free Software Foundation, Inc.
+
+This file is part of GAS, the GNU Assembler.
+
+GAS is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2,
+or (at your option) any later version.
+
+GAS is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with GAS; see the file COPYING.  If not, write
+to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "as.h"
 #include "aout/stab_gnu.h"
 #include "obstack.h"
 
+#ifndef BFD_ASSEMBLER
 /* in: segT   out: N_TYPE bits */
-const short seg_N_TYPE[] = {
-	N_ABS,
-	N_TEXT,
-	N_DATA,
-	N_BSS,
-	N_UNDF, /* unknown */
-	N_UNDF, /* absent */
-	N_UNDF, /* pass1 */
-	N_UNDF, /* error */
-	N_UNDF, /* bignum/flonum */
-	N_UNDF, /* difference */
-	N_UNDF, /* debug */
-	N_UNDF, /* ntv */
-	N_UNDF, /* ptv */
-	N_REGISTER, /* register */
+const short seg_N_TYPE[] =
+{
+  N_ABS,
+  N_TEXT,
+  N_DATA,
+  N_BSS,
+  N_UNDF,			/* unknown */
+  N_UNDF,			/* absent */
+  N_UNDF,			/* pass1 */
+  N_UNDF,			/* error */
+  N_UNDF,			/* bignum/flonum */
+  N_UNDF,			/* difference */
+  N_UNDF,			/* debug */
+  N_UNDF,			/* ntv */
+  N_UNDF,			/* ptv */
+  N_REGISTER,			/* register */
 };
 
-const segT N_TYPE_seg [N_TYPE+2] = {	/* N_TYPE == 0x1E = 32-2 */
-	SEG_UNKNOWN,			/* N_UNDF == 0 */
-	SEG_GOOF,
-	SEG_ABSOLUTE,			/* N_ABS == 2 */
-	SEG_GOOF,
-	SEG_TEXT,			/* N_TEXT == 4 */
-	SEG_GOOF,
-	SEG_DATA,			/* N_DATA == 6 */
-	SEG_GOOF,
-	SEG_BSS,			/* N_BSS == 8 */
-	SEG_GOOF,
-	SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF,
-	SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF,
-	SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF,
-	SEG_REGISTER,			/* dummy N_REGISTER for regs = 30 */
-	SEG_GOOF,
+const segT N_TYPE_seg[N_TYPE + 2] =
+{				/* N_TYPE == 0x1E = 32-2 */
+  SEG_UNKNOWN,			/* N_UNDF == 0 */
+  SEG_GOOF,
+  SEG_ABSOLUTE,			/* N_ABS == 2 */
+  SEG_GOOF,
+  SEG_TEXT,			/* N_TEXT == 4 */
+  SEG_GOOF,
+  SEG_DATA,			/* N_DATA == 6 */
+  SEG_GOOF,
+  SEG_BSS,			/* N_BSS == 8 */
+  SEG_GOOF,
+  SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF,
+  SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF,
+  SEG_GOOF, SEG_GOOF, SEG_GOOF, SEG_GOOF,
+  SEG_REGISTER,			/* dummy N_REGISTER for regs = 30 */
+  SEG_GOOF,
 };
+#endif
+
+static void obj_aout_stab PARAMS ((int what));
+static void obj_aout_line PARAMS ((void));
+static void obj_aout_desc PARAMS ((void));
 
-#if __STDC__ == 1
-static void obj_aout_stab(int what);
-static void obj_aout_line(void);
-static void obj_aout_desc(void);
-#else /* not __STDC__ */
-static void obj_aout_desc();
-static void obj_aout_stab();
-static void obj_aout_line();
-#endif /* not __STDC__ */
-
-const pseudo_typeS obj_pseudo_table[] = {
-#ifndef IGNORE_DEBUG
-	/* stabs debug info */
-	{ "line",	obj_aout_line,		0	}, /* source code line number */
-	{ "ln",		obj_aout_line,		0	}, /* coff line number that we use anyway */
-	{ "desc",	obj_aout_desc,		0	}, /* desc */
-	{ "stabd",	obj_aout_stab,		'd'	}, /* stabs */
-	{ "stabn",	obj_aout_stab,		'n'	}, /* stabs */
-	{ "stabs",	obj_aout_stab,		's'	}, /* stabs */
-#else /* IGNORE_DEBUG */
-	{ "line",	obj_aout_line,		0	}, /* source code line number */
-	{ "ln",		obj_aout_line,		0	}, /* coff line number that we use anyway */
-	{ "desc",	obj_aout_desc,		0	}, /* desc */
-	{ "stabd",	obj_aout_stab,		'd'	}, /* stabs */
-	{ "stabn",	obj_aout_stab,		'n'	}, /* stabs */
-	{ "stabs",	obj_aout_stab,		's'	}, /* stabs */
-#endif /* IGNORE_DEBUG */
-	
-	/* coff debug pseudos (ignored) */
-	{ "def",	s_ignore, 0 },
-	{ "dim",	s_ignore, 0 },
-	{ "endef",	s_ignore, 0 },
-	{ "ident",	s_ignore, 0 },
-	{ "line",	s_ignore, 0 },
-	{ "ln",		s_ignore, 0 },
-	{ "scl",	s_ignore, 0 },
-	{ "size",	s_ignore, 0 },
-	{ "tag",	s_ignore, 0 },
-	{ "type",	s_ignore, 0 },
-	{ "val",	s_ignore, 0 },
-	{ "version",	s_ignore, 0 },
-	
-	/* stabs-in-coff (?) debug pseudos (ignored) */
-	{ "optim",	s_ignore, 0 }, /* For sun386i cc (?) */
-	
-	/* other stuff */
-	{ "ABORT",      s_abort,		0 },
-	
-	{ NULL}	/* end sentinel */
-}; /* obj_pseudo_table */
+const pseudo_typeS obj_pseudo_table[] =
+{
+  /* stabs debug info */
+  {"line", obj_aout_line, 0},	/* source code line number */
+  {"ln", obj_aout_line, 0},	/* coff line number that we use anyway */
+  {"desc", obj_aout_desc, 0},	/* desc */
+  {"stabd", obj_aout_stab, 'd'},/* stabs */
+  {"stabn", obj_aout_stab, 'n'},/* stabs */
+  {"stabs", obj_aout_stab, 's'},/* stabs */
 
+  /* coff debug pseudos (ignored) */
+  {"def", s_ignore, 0},
+  {"dim", s_ignore, 0},
+  {"endef", s_ignore, 0},
+  {"ident", s_ignore, 0},
+  {"line", s_ignore, 0},
+  {"ln", s_ignore, 0},
+  {"scl", s_ignore, 0},
+  {"size", s_ignore, 0},
+  {"tag", s_ignore, 0},
+  {"type", s_ignore, 0},
+  {"val", s_ignore, 0},
+  {"version", s_ignore, 0},
+
+  /* stabs-in-coff (?) debug pseudos (ignored) */
+  {"optim", s_ignore, 0},	/* For sun386i cc (?) */
+
+  /* other stuff */
+  {"ABORT", s_abort, 0},
+
+  {NULL}			/* end sentinel */
+};				/* obj_pseudo_table */
+
+
+#ifdef BFD_ASSEMBLER
+
+void
+obj_aout_frob_symbol (sym, punt)
+     symbolS *sym;
+     int *punt;
+{
+  flagword flags;
+  asection *sec;
+  int desc, type, other;
+
+  /* Is this part format-dependent?  */
+  if (sym->sy_forward)
+    {
+      S_SET_VALUE (sym,
+		   S_GET_VALUE (sym)
+		   + S_GET_VALUE (sym->sy_forward)
+		   + sym->sy_forward->sy_frag->fr_address
+		   );
+      sym->sy_forward = 0;
+    }
+
+  flags = sym->bsym->flags;
+  desc = S_GET_DESC (sym);
+  type = S_GET_TYPE (sym);
+  other = S_GET_OTHER (sym);
+  sec = sym->bsym->section;
+
+  /* Only frob simple symbols this way right now.  */
+  if (! (type & ~0x1f))
+    {
+      if (sec == &bfd_abs_section
+	  || sec == &bfd_und_section)
+	return;
+      if (flags & BSF_EXPORT)
+	type |= 1;
+    }
+  else
+    {
+      sym->bsym->flags |= BSF_DEBUGGING;
+    }
+
+  S_SET_TYPE (sym, type);
+}
+
+#else
 
 /* Relocation. */
 
@@ -116,108 +153,104 @@ const pseudo_typeS obj_pseudo_table[] = {
  *
  * Crawl along a fixS chain. Emit the segment's relocations.
  */
-void obj_emit_relocations(where, fixP, segment_address_in_file)
-char **where;
-fixS *fixP; /* Fixup chain for this segment. */
-relax_addressT segment_address_in_file;
+void
+obj_emit_relocations (where, fixP, segment_address_in_file)
+     char **where;
+     fixS *fixP;		/* Fixup chain for this segment. */
+     relax_addressT segment_address_in_file;
 {
-	for (;  fixP;  fixP = fixP->fx_next) {
-		if (fixP->fx_addsy != NULL) {
-			tc_aout_fix_to_chars(*where, fixP, segment_address_in_file);
-			*where += md_reloc_size;
-		} /* if there is an add symbol */
-	} /* for each fix */
-	
-	return;
-} /* obj_emit_relocations() */
+  for (; fixP; fixP = fixP->fx_next)
+    if (fixP->fx_addsy != NULL)
+      {
+	tc_aout_fix_to_chars (*where, fixP, segment_address_in_file);
+	*where += md_reloc_size;
+      }
+}
 
+#ifndef obj_header_append
 /* Aout file generation & utilities */
-void obj_header_append(where, headers)
-char **where;
-object_headers *headers;
+void
+obj_header_append (where, headers)
+     char **where;
+     object_headers *headers;
 {
-	tc_headers_hook(headers);
-	
+  tc_headers_hook (headers);
+
 #ifdef CROSS_COMPILE
-	md_number_to_chars(*where, headers->header.a_info, sizeof(headers->header.a_info));
-	*where += sizeof(headers->header.a_info);
-	md_number_to_chars(*where, headers->header.a_text, sizeof(headers->header.a_text));
-	*where += sizeof(headers->header.a_text);
-	md_number_to_chars(*where, headers->header.a_data, sizeof(headers->header.a_data));
-	*where += sizeof(headers->header.a_data);
-	md_number_to_chars(*where, headers->header.a_bss, sizeof(headers->header.a_bss));
-	*where += sizeof(headers->header.a_bss);
-	md_number_to_chars(*where, headers->header.a_syms, sizeof(headers->header.a_syms));
-	*where += sizeof(headers->header.a_syms);
-	md_number_to_chars(*where, headers->header.a_entry, sizeof(headers->header.a_entry));
-	*where += sizeof(headers->header.a_entry);
-	md_number_to_chars(*where, headers->header.a_trsize, sizeof(headers->header.a_trsize));
-	*where += sizeof(headers->header.a_trsize);
-	md_number_to_chars(*where, headers->header.a_drsize, sizeof(headers->header.a_drsize));
-	*where += sizeof(headers->header.a_drsize);
-	
+  md_number_to_chars (*where, headers->header.a_info, sizeof (headers->header.a_info));
+  *where += sizeof (headers->header.a_info);
+  md_number_to_chars (*where, headers->header.a_text, sizeof (headers->header.a_text));
+  *where += sizeof (headers->header.a_text);
+  md_number_to_chars (*where, headers->header.a_data, sizeof (headers->header.a_data));
+  *where += sizeof (headers->header.a_data);
+  md_number_to_chars (*where, headers->header.a_bss, sizeof (headers->header.a_bss));
+  *where += sizeof (headers->header.a_bss);
+  md_number_to_chars (*where, headers->header.a_syms, sizeof (headers->header.a_syms));
+  *where += sizeof (headers->header.a_syms);
+  md_number_to_chars (*where, headers->header.a_entry, sizeof (headers->header.a_entry));
+  *where += sizeof (headers->header.a_entry);
+  md_number_to_chars (*where, headers->header.a_trsize, sizeof (headers->header.a_trsize));
+  *where += sizeof (headers->header.a_trsize);
+  md_number_to_chars (*where, headers->header.a_drsize, sizeof (headers->header.a_drsize));
+  *where += sizeof (headers->header.a_drsize);
+
 #else /* CROSS_COMPILE */
-	
-	append(where, (char *) &headers->header, sizeof(headers->header));
+
+  append (where, (char *) &headers->header, sizeof (headers->header));
 #endif /* CROSS_COMPILE */
-	
-	return;
-} /* obj_append_header() */
 
-void obj_symbol_to_chars(where, symbolP)
-char **where;
-symbolS *symbolP;
-{
-	md_number_to_chars((char *)&(S_GET_OFFSET(symbolP)), S_GET_OFFSET(symbolP), sizeof(S_GET_OFFSET(symbolP)));
-	md_number_to_chars((char *)&(S_GET_DESC(symbolP)), S_GET_DESC(symbolP), sizeof(S_GET_DESC(symbolP)));
-	md_number_to_chars((char *)&(S_GET_VALUE(symbolP)), S_GET_VALUE(symbolP), sizeof(S_GET_VALUE(symbolP)));
-	
-	append(where, (char *)&symbolP->sy_symbol, sizeof(obj_symbol_type));
-} /* obj_symbol_to_chars() */
-
-void obj_emit_symbols(where, symbol_rootP)
-char **where;
-symbolS *symbol_rootP;
+}
+#endif
+
+void
+obj_symbol_to_chars (where, symbolP)
+     char **where;
+     symbolS *symbolP;
 {
-	symbolS *	symbolP;
-	
-	/*
-	 * Emit all symbols left in the symbol chain.
-	 */
-	for(symbolP = symbol_rootP; symbolP; symbolP = symbol_next(symbolP)) {
-		/* Used to save the offset of the name. It is used to point
-		   to the string in memory but must be a file offset. */
-		register char *temp;
-		
-		temp = S_GET_NAME(symbolP);
-		S_SET_OFFSET(symbolP, symbolP->sy_name_offset);
-		
-		/* Any symbol still undefined and is not a dbg symbol is made N_EXT. */
-		if (!S_IS_DEBUG(symbolP) && !S_IS_DEFINED(symbolP)) S_SET_EXTERNAL(symbolP);
-		
-		obj_symbol_to_chars(where, symbolP);
-		S_SET_NAME(symbolP,temp);
-	}
-} /* emit_symbols() */
+  md_number_to_chars ((char *) &(S_GET_OFFSET (symbolP)), S_GET_OFFSET (symbolP), sizeof (S_GET_OFFSET (symbolP)));
+  md_number_to_chars ((char *) &(S_GET_DESC (symbolP)), S_GET_DESC (symbolP), sizeof (S_GET_DESC (symbolP)));
+  md_number_to_chars ((char *) &(symbolP->sy_symbol.n_value), S_GET_VALUE (symbolP), sizeof (symbolP->sy_symbol.n_value));
+
+  append (where, (char *) &symbolP->sy_symbol, sizeof (obj_symbol_type));
+}
 
-#if comment
-/* uneeded if symbol is born zeroed. */
-void obj_symbol_new_hook(symbolP)
-symbolS *symbolP;
+void
+obj_emit_symbols (where, symbol_rootP)
+     char **where;
+     symbolS *symbol_rootP;
 {
-	S_SET_OTHER(symbolP, 0);
-	S_SET_DESC(symbolP, 0);
-	return;
-} /* obj_symbol_new_hook() */
-#endif /* comment */
+  symbolS *symbolP;
+
+  /* Emit all symbols left in the symbol chain.  */
+  for (symbolP = symbol_rootP; symbolP; symbolP = symbol_next (symbolP))
+    {
+      /* Used to save the offset of the name. It is used to point
+	 to the string in memory but must be a file offset. */
+      register char *temp;
+
+      temp = S_GET_NAME (symbolP);
+      S_SET_OFFSET (symbolP, symbolP->sy_name_offset);
 
-static void obj_aout_line() {
-	/* Assume delimiter is part of expression. */
-	/* BSD4.2 as fails with delightful bug, so we */
-	/* are not being incompatible here. */
-	new_logical_line((char *)NULL, (int)(get_absolute_expression()));
-	demand_empty_rest_of_line();
-} /* obj_aout_line() */
+      /* Any symbol still undefined and is not a dbg symbol is made N_EXT. */
+      if (!S_IS_DEBUG (symbolP) && !S_IS_DEFINED (symbolP))
+	S_SET_EXTERNAL (symbolP);
+
+      obj_symbol_to_chars (where, symbolP);
+      S_SET_NAME (symbolP, temp);
+    }
+}
+
+#endif /* ! BFD_ASSEMBLER */
+
+static void
+obj_aout_line ()
+{
+  /* Assume delimiter is part of expression.
+     BSD4.2 as fails with delightful bug, so we
+     are not being incompatible here. */
+  new_logical_line ((char *) NULL, (int) (get_absolute_expression ()));
+  demand_empty_rest_of_line ();
+}				/* obj_aout_line() */
 
 /*
  *			stab()
@@ -238,276 +271,366 @@ static void obj_aout_line() {
  * .stabX directives always make a symbol table entry. It may be junk if
  * the rest of your .stabX directive is malformed.
  */
-static void obj_aout_stab(what)
-int what;
+static void
+obj_aout_stab (what)
+     int what;
 {
-	extern int listing;
-	
-	register symbolS *	symbolP = 0;
-	register char *	string;
-	int saved_type = 0;
-	int length;
-	int goof; /* TRUE if we have aborted. */
-	long longint;
-	
-	/*
-	 * Enter with input_line_pointer pointing past .stabX and any following
-	 * whitespace.
-	 */
-	goof = 0; /* JF who forgot this?? */
-	if (what == 's') {
-		string = demand_copy_C_string(& length);
-		SKIP_WHITESPACE();
-		if (* input_line_pointer == ',')
-		    input_line_pointer ++;
-		else {
-			as_bad("I need a comma after symbol's name");
-			goof = 1;
-		}
-	} else
-	    string = "";
-	
-	/*
-	 * Input_line_pointer->after ','.  String->symbol name.
-	 */
-	if (! goof) {
-		symbolP = symbol_new(string,
-				     SEG_UNKNOWN,
-				     0,
-				     (struct frag *)0);
-		switch (what) {
-		case 'd':
-			S_SET_NAME(symbolP, NULL); /* .stabd feature. */
-			S_SET_VALUE(symbolP, obstack_next_free(&frags) - frag_now->fr_literal);
-			symbolP->sy_frag = frag_now;
-			break;
-			
-		case 'n':
-			symbolP->sy_frag = &zero_address_frag;
-			break;
-			
-		case 's':
-			symbolP->sy_frag = & zero_address_frag;
-			break;
-			
-		default:
-			BAD_CASE(what);
-			break;
-		}
-		
-		if (get_absolute_expression_and_terminator(&longint) == ',')
-		    symbolP->sy_symbol.n_type = saved_type = longint;
-		else {
-			as_bad("I want a comma after the n_type expression");
-			goof = 1;
-			input_line_pointer --; /* Backup over a non-',' char. */
-		}
+  extern int listing;
+
+  register symbolS *symbolP = 0;
+  register char *string;
+  int saved_type = 0;
+  int length;
+  int goof;			/* TRUE if we have aborted. */
+  long longint;
+
+  /*
+   * Enter with input_line_pointer pointing past .stabX and any following
+   * whitespace.
+   */
+  goof = 0;			/* JF who forgot this?? */
+  if (what == 's')
+    {
+      string = demand_copy_C_string (&length);
+      SKIP_WHITESPACE ();
+      if (*input_line_pointer == ',')
+	input_line_pointer++;
+      else
+	{
+	  as_bad ("I need a comma after symbol's name");
+	  goof = 1;
 	}
-	
-	if (!goof) {
-		if (get_absolute_expression_and_terminator(&longint) == ',')
-		    S_SET_OTHER(symbolP, longint);
-		else {
-			as_bad("I want a comma after the n_other expression");
-			goof = 1;
-			input_line_pointer--; /* Backup over a non-',' char. */
-		}
+    }
+  else
+    string = "";
+
+  /*
+   * Input_line_pointer->after ','.  String->symbol name.
+   */
+  if (!goof)
+    {
+      symbolP = symbol_new (string, undefined_section, 0, (struct frag *) 0);
+      switch (what)
+	{
+	case 'd':
+	  S_SET_NAME (symbolP, NULL);	/* .stabd feature. */
+	  S_SET_VALUE (symbolP, (char*) obstack_next_free (&frags) - frag_now->fr_literal);
+	  symbolP->sy_frag = frag_now;
+	  break;
+
+	case 'n':
+	  symbolP->sy_frag = &zero_address_frag;
+	  break;
+
+	case 's':
+	  symbolP->sy_frag = &zero_address_frag;
+	  break;
+
+	default:
+	  BAD_CASE (what);
+	  break;
 	}
-	
-	if (!goof) {
-		S_SET_DESC(symbolP, get_absolute_expression());
-		if (what == 's' || what == 'n') {
-			if (*input_line_pointer != ',') {
-				as_bad("I want a comma after the n_desc expression");
-				goof = 1;
-			} else {
-				input_line_pointer++;
-			}
-		}
+
+      if (get_absolute_expression_and_terminator (&longint) == ',')
+	{
+	  saved_type = longint;
+	  S_SET_TYPE (symbolP, saved_type);
 	}
-	
-	if ((!goof) && (what=='s' || what=='n')) {
-		pseudo_set(symbolP);
-		symbolP->sy_symbol.n_type = saved_type;
+      else
+	{
+	  as_bad ("I want a comma after the n_type expression");
+	  goof = 1;
+	  input_line_pointer--;	/* Backup over a non-',' char. */
 	}
-#ifndef NO_LISTING
-	if (listing && !goof) 
+    }
+
+  if (!goof)
+    {
+      if (get_absolute_expression_and_terminator (&longint) == ',')
+	S_SET_OTHER (symbolP, longint);
+      else
+	{
+	  as_bad ("I want a comma after the n_other expression");
+	  goof = 1;
+	  input_line_pointer--;	/* Backup over a non-',' char. */
+	}
+    }
+
+  if (!goof)
+    {
+      S_SET_DESC (symbolP, get_absolute_expression ());
+      if (what == 's' || what == 'n')
+	{
+	  if (*input_line_pointer != ',')
 	    {
-		    if (symbolP->sy_symbol.n_type == N_SLINE) 
-			{
-				
-				listing_source_line(symbolP->sy_symbol.n_desc);
-			}
-		    else if (symbolP->sy_symbol.n_type == N_SO
-			     || symbolP->sy_symbol.n_type == N_SOL) 
-			{
-				listing_source_file(string);
-			}			  
+	      as_bad ("I want a comma after the n_desc expression");
+	      goof = 1;
+	    }
+	  else
+	    {
+	      input_line_pointer++;
 	    }
-#endif  
-	
-	if (goof)
-	    ignore_rest_of_line();
-	else
-	    demand_empty_rest_of_line ();
-} /* obj_aout_stab() */
-
-static void obj_aout_desc() {
-	register char *name;
-	register char c;
-	register char *p;
-	register symbolS *symbolP;
-	register int temp;
-	
-	/*
-	 * Frob invented at RMS' request. Set the n_desc of a symbol.
-	 */
-	name = input_line_pointer;
-	c = get_symbol_end();
-	p = input_line_pointer;
-	* p = c;
-	SKIP_WHITESPACE();
-	if (*input_line_pointer != ',') {
-		*p = 0;
-		as_bad("Expected comma after name \"%s\"", name);
-		*p = c;
-		ignore_rest_of_line();
-	} else {
-		input_line_pointer ++;
-		temp = get_absolute_expression();
-		*p = 0;
-		symbolP = symbol_find_or_make(name);
-		*p = c;
-		S_SET_DESC(symbolP,temp);
 	}
-	demand_empty_rest_of_line();
-} /* obj_aout_desc() */
+    }
 
-void obj_read_begin_hook() {
-	return;
-} /* obj_read_begin_hook() */
+  if ((!goof) && (what == 's' || what == 'n'))
+    {
+      pseudo_set (symbolP);
+      S_SET_TYPE (symbolP, saved_type);
+    }
+#ifndef NO_LISTING
+  if (listing && !goof)
+    {
+      if (S_GET_TYPE (symbolP) == N_SLINE)
+	{
+	  listing_source_line (S_GET_DESC (symbolP));
+	}
+      else if (S_GET_TYPE (symbolP) == N_SO || S_GET_TYPE (symbolP) == N_SOL)
+	{
+	  listing_source_file (string);
+	}
+    }
+#endif
+
+  if (goof)
+    ignore_rest_of_line ();
+  else
+    demand_empty_rest_of_line ();
+}				/* obj_aout_stab() */
+
+static void
+obj_aout_desc ()
+{
+  register char *name;
+  register char c;
+  register char *p;
+  register symbolS *symbolP;
+  register int temp;
+
+  /*
+	 * Frob invented at RMS' request. Set the n_desc of a symbol.
+ */
+  name = input_line_pointer;
+  c = get_symbol_end ();
+  p = input_line_pointer;
+  *p = c;
+  SKIP_WHITESPACE ();
+  if (*input_line_pointer != ',')
+    {
+      *p = 0;
+      as_bad ("Expected comma after name \"%s\"", name);
+      *p = c;
+      ignore_rest_of_line ();
+    }
+  else
+    {
+      input_line_pointer++;
+      temp = get_absolute_expression ();
+      *p = 0;
+      symbolP = symbol_find_or_make (name);
+      *p = c;
+      S_SET_DESC (symbolP, temp);
+    }
+  demand_empty_rest_of_line ();
+}				/* obj_aout_desc() */
+
+void
+obj_read_begin_hook ()
+{
+  return;
+}				/* obj_read_begin_hook() */
+
+#ifndef BFD_ASSEMBLER
 
-void obj_crawl_symbol_chain(headers)
-object_headers *headers;
+void
+obj_crawl_symbol_chain (headers)
+     object_headers *headers;
 {
-	symbolS *symbolP;
-	symbolS **symbolPP;
-	int symbol_number = 0;
-	
-	/* JF deal with forward references first... */
-	for (symbolP = symbol_rootP; symbolP; symbolP = symbol_next(symbolP)) {
-		if (symbolP->sy_forward) {
-			S_SET_VALUE(symbolP, S_GET_VALUE(symbolP)
-				    + S_GET_VALUE(symbolP->sy_forward)
-				    + symbolP->sy_forward->sy_frag->fr_address);
-			
-			symbolP->sy_forward=0;
-		} /* if it has a forward reference */
-	} /* walk the symbol chain */
-	
-	tc_crawl_symbol_chain(headers);
-	
-	symbolPP = &symbol_rootP;	/*->last symbol chain link. */
-	while ((symbolP  = *symbolPP) != NULL) {
-		if (flagseen['R'] && (S_GET_SEGMENT(symbolP) == SEG_DATA)) {
-			S_SET_SEGMENT(symbolP, SEG_TEXT);
-		} /* if pusing data into text */
-		
-		S_SET_VALUE(symbolP, S_GET_VALUE(symbolP) + symbolP->sy_frag->fr_address);
-		
-		/* OK, here is how we decide which symbols go out into the
-		   brave new symtab.  Symbols that do are:
-		   
-		   * symbols with no name (stabd's?)
-		   * symbols with debug info in their N_TYPE
-		   
-		   Symbols that don't are:
-		   * symbols that are registers
-		   * symbols with \1 as their 3rd character (numeric labels)
-		   * "local labels" as defined by S_LOCAL_NAME(name)
-		   if the -L switch was passed to gas.
-		   
-		   All other symbols are output.  We complain if a deleted
-		   symbol was marked external. */
-		
-		
-		if (!S_IS_REGISTER(symbolP)
-		    && (!S_GET_NAME(symbolP)
-			|| S_IS_DEBUG(symbolP)
+  symbolS *symbolP;
+  symbolS **symbolPP;
+  int symbol_number = 0;
+
+  /* JF deal with forward references first... */
+  for (symbolP = symbol_rootP; symbolP; symbolP = symbol_next (symbolP))
+    {
+      if (symbolP->sy_forward)
+	{
+	  S_SET_VALUE (symbolP, S_GET_VALUE (symbolP)
+		       + S_GET_VALUE (symbolP->sy_forward)
+		       + symbolP->sy_forward->sy_frag->fr_address);
+
+	  symbolP->sy_forward = 0;
+	}			/* if it has a forward reference */
+    }				/* walk the symbol chain */
+
+  tc_crawl_symbol_chain (headers);
+
+  symbolPP = &symbol_rootP;	/*->last symbol chain link. */
+  while ((symbolP = *symbolPP) != NULL)
+    {
+      if (flagseen['R'] && (S_GET_SEGMENT (symbolP) == SEG_DATA))
+	{
+	  S_SET_SEGMENT (symbolP, SEG_TEXT);
+	}			/* if pusing data into text */
+
+      S_SET_VALUE (symbolP, S_GET_VALUE (symbolP) + symbolP->sy_frag->fr_address);
+
+      /* OK, here is how we decide which symbols go out into the brave
+	 new symtab.  Symbols that do are:
+
+	 * symbols with no name (stabd's?)
+	 * symbols with debug info in their N_TYPE
+
+	 Symbols that don't are:
+	 * symbols that are registers
+	 * symbols with \1 as their 3rd character (numeric labels)
+	 * "local labels" as defined by S_LOCAL_NAME(name) if the -L
+	 switch was passed to gas.
+
+	 All other symbols are output.  We complain if a deleted
+	 symbol was marked external. */
+
+
+      if (!S_IS_REGISTER (symbolP)
+	  && (!S_GET_NAME (symbolP)
+	      || S_IS_DEBUG (symbolP)
 #ifdef TC_I960
-			/* FIXME-SOON this ifdef seems highly dubious to me.  xoxorich. */
-			|| !S_IS_DEFINED(symbolP)
-			|| S_IS_EXTERNAL(symbolP)
+      /* FIXME-SOON this ifdef seems highly dubious to me.  xoxorich. */
+	      || !S_IS_DEFINED (symbolP)
+	      || S_IS_EXTERNAL (symbolP)
 #endif /* TC_I960 */
-			|| (S_GET_NAME(symbolP)[0] != '\001' && (flagseen ['L'] || ! S_LOCAL_NAME(symbolP))))) {
-			symbolP->sy_number = symbol_number++;
-			
-			/* The + 1 after strlen account for the \0 at the
+	      || (S_GET_NAME (symbolP)[0] != '\001' && (flagseen['L'] || !S_LOCAL_NAME (symbolP)))))
+	{
+	  symbolP->sy_number = symbol_number++;
+
+	  /* The + 1 after strlen account for the \0 at the
 			   end of each string */
-			if (!S_IS_STABD(symbolP)) {
-				/* Ordinary case. */
-				symbolP->sy_name_offset = string_byte_count;
-				string_byte_count += strlen(S_GET_NAME(symbolP)) + 1;
-			}
-			else	/* .Stabd case. */
-			    symbolP->sy_name_offset = 0;
-			symbolPP = &(symbol_next(symbolP));
-		} else {
-			if (S_IS_EXTERNAL(symbolP) || !S_IS_DEFINED(symbolP)) {
-				as_bad("Local symbol %s never defined.", decode_local_label_name(S_GET_NAME(symbolP)));
-			} /* oops. */
-			
-			/* Unhook it from the chain */
-			*symbolPP = symbol_next(symbolP);
-		} /* if this symbol should be in the output */
-	} /* for each symbol */
-	
-	H_SET_SYMBOL_TABLE_SIZE(headers, symbol_number);
-	
-	return;
-} /* obj_crawl_symbol_chain() */
+	  if (!S_IS_STABD (symbolP))
+	    {
+	      /* Ordinary case. */
+	      symbolP->sy_name_offset = string_byte_count;
+	      string_byte_count += strlen (S_GET_NAME (symbolP)) + 1;
+	    }
+	  else			/* .Stabd case. */
+	    symbolP->sy_name_offset = 0;
+	  symbolPP = &(symbol_next (symbolP));
+	}
+      else
+	{
+	  if (S_IS_EXTERNAL (symbolP) || !S_IS_DEFINED (symbolP))
+	    {
+	      as_bad ("Local symbol %s never defined.", decode_local_label_name (S_GET_NAME (symbolP)));
+	    }			/* oops. */
+
+	  /* Unhook it from the chain */
+	  *symbolPP = symbol_next (symbolP);
+	}			/* if this symbol should be in the output */
+    }				/* for each symbol */
+
+  H_SET_SYMBOL_TABLE_SIZE (headers, symbol_number);
+
+  return;
+}				/* obj_crawl_symbol_chain() */
 
 /*
  * Find strings by crawling along symbol table chain.
  */
 
-void obj_emit_strings(where)
-char **where;
+void
+obj_emit_strings (where)
+     char **where;
 {
-	symbolS *symbolP;
-	
+  symbolS *symbolP;
+
 #ifdef CROSS_COMPILE
-	/* Gotta do md_ byte-ordering stuff for string_byte_count first - KWK */
-	md_number_to_chars(*where, string_byte_count, sizeof(string_byte_count));
-	*where += sizeof(string_byte_count);
+  /* Gotta do md_ byte-ordering stuff for string_byte_count first - KWK */
+  md_number_to_chars (*where, string_byte_count, sizeof (string_byte_count));
+  *where += sizeof (string_byte_count);
 #else /* CROSS_COMPILE */
-	append (where, (char *)&string_byte_count, (unsigned long)sizeof(string_byte_count));
+  append (where, (char *) &string_byte_count, (unsigned long) sizeof (string_byte_count));
 #endif /* CROSS_COMPILE */
-	
-	for(symbolP = symbol_rootP; symbolP; symbolP = symbol_next(symbolP)) {
-		if(S_GET_NAME(symbolP))
-		    append(&next_object_file_charP, S_GET_NAME(symbolP),
-			   (unsigned long)(strlen (S_GET_NAME(symbolP)) + 1));
-	} /* walk symbol chain */
-	
-	return;
-} /* obj_emit_strings() */
 
-void obj_pre_write_hook(headers)
-object_headers *headers;
+  for (symbolP = symbol_rootP; symbolP; symbolP = symbol_next (symbolP))
+    {
+      if (S_GET_NAME (symbolP))
+	append (&next_object_file_charP, S_GET_NAME (symbolP),
+		(unsigned long) (strlen (S_GET_NAME (symbolP)) + 1));
+    }				/* walk symbol chain */
+
+  return;
+}				/* obj_emit_strings() */
+
+#ifndef AOUT_VERSION
+#define AOUT_VERSION 0
+#endif
+
+void
+obj_pre_write_hook (headers)
+     object_headers *headers;
 {
-	H_SET_DYNAMIC(headers, 0);
-	H_SET_VERSION(headers, 0);
-	H_SET_MACHTYPE(headers, AOUT_MACHTYPE);
-	tc_aout_pre_write_hook(headers);
-	return;
-} /* obj_pre_write_hook() */
+  H_SET_DYNAMIC (headers, 0);
+  H_SET_VERSION (headers, AOUT_VERSION);
+  H_SET_MACHTYPE (headers, AOUT_MACHTYPE);
+  tc_aout_pre_write_hook (headers);
+  return;
+}				/* obj_pre_write_hook() */
 
-/*
- * Local Variables:
- * comment-column: 0
- * fill-column: 131
- * End:
- */
+void
+DEFUN_VOID (s_sect)
+{
+  /* Strip out the section name */
+  char *section_name;
+  char *section_name_end;
+  char c;
+
+  unsigned int len;
+  unsigned int exp;
+  char *save;
+
+  section_name = input_line_pointer;
+  c = get_symbol_end ();
+  section_name_end = input_line_pointer;
+
+  len = section_name_end - section_name;
+  input_line_pointer++;
+  save = input_line_pointer;
+
+  SKIP_WHITESPACE ();
+  if (c == ',')
+    {
+      exp = get_absolute_expression ();
+    }
+  else if (*input_line_pointer == ',')
+    {
+      input_line_pointer++;
+      exp = get_absolute_expression ();
+    }
+  else
+    {
+      input_line_pointer = save;
+      exp = 0;
+    }
+  if (exp >= 1000)
+    {
+      as_bad ("subsegment index too high");
+    }
+
+  if (strcmp (section_name, ".text") == 0)
+    {
+      subseg_new (SEG_TEXT, (subsegT) exp);
+    }
+
+  if (strcmp (section_name, ".data") == 0)
+    {
+      if (flagseen['R'])
+	subseg_new (SEG_TEXT, (subsegT) exp + 1000);
+      else
+	subseg_new (SEG_DATA, (subsegT) exp);
+    }
+
+  *section_name_end = c;
+}
+
+#endif /* ! BFD_ASSEMBLER */
 
 /* end of obj-aout.c */