* config/obj-coff*.*: Merged coffbfd versions into coff versions, with a single

"#ifdef BFD_ASSEMBLER" controlling most of it for now.  Deleted obj-coffbfd.*
files.
* configure.in: Always use obj-coff.* for COFF targets.

3 files changed, 11 insertions, 3198 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index aca8b08..380b2ff 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,16 @@
+Thu May  5 17:25:38 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* config/obj-coff*.*: Merged coffbfd versions into coff versions,
+	with a single "#ifdef BFD_ASSEMBLER" controlling most of it for
+	now.  Deleted obj-coffbfd.* files.
+	* configure.in: Always use obj-coff.* for COFF targets.
+
 Wed May  4 13:34:11 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
 
+	* config/te-dpx2.h (TARGET_FORMAT, REGISTER_PREFIX_OPTIONAL):
+	Define.
+	* configure.in (m68k-bull-sysv3*): Enable.
+
 	* config/coff_gnu.h: Deleted.
 
 Wed May  4 11:29:17 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
diff --git a/gas/config/obj-coffbfd.c b/gas/config/obj-coffbfd.c
deleted file mode 100644
index f62db37..0000000
--- a/gas/config/obj-coffbfd.c
+++ /dev/null
@@ -1,2689 +0,0 @@
-/* coff object file format with bfd
-   Copyright (C) 1989, 1990, 1991, 1993 Free Software Foundation, Inc.
-
-This file is part of GAS.
-
-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.  */
-
-/*
-
- How does this releate to the rest of GAS ?
-
- Well, all the other files in gas are more or less a black box. It
- takes care of opening files, parsing command lines, stripping blanks
- etc etc. This module gets a chance to register what it wants to do by
- saying that it is interested in various pseduo ops. The other big
- change is write_object_file. This runs through all the data
- structures that gas builds, and outputs the file in the format of our
- choice.
-
- Hacked for BFDness by steve chamberlain
-
- This object module now supports everything but the i960 and i860.
-
- sac@cygnus.com
-*/
-
-#include "as.h"
-#include "obstack.h"
-#include "subsegs.h"
-#include "frags.h"
-/* This is needed because we include internal bfd things. */
-#include <time.h>
-#include "../bfd/libbfd.h"
-#include "../bfd/libcoff.h"
-
-/* The NOP_OPCODE is for the alignment fill value.  Fill with nop so
-   that we can stick sections together without causing trouble.  */
-#ifndef NOP_OPCODE
-#define NOP_OPCODE 0x00
-#endif
-
-#define MIN(a,b) ((a) < (b)? (a) : (b))
-/* This vector is used to turn an internal segment into a section #
-   suitable for insertion into a coff symbol table
- */
-
-const short seg_N_TYPE[] =
-{				/* in: segT   out: N_TYPE bits */
-  C_ABS_SECTION,
-  1,
-  2,
-  3,
-  4,
-  5,
-  6,
-  7,
-  8,
-  9,
-  10,
-  C_UNDEF_SECTION,		/* SEG_UNKNOWN */
-  C_UNDEF_SECTION,		/* SEG_GOOF */
-  C_UNDEF_SECTION,		/* SEG_EXPR */
-  C_DEBUG_SECTION,		/* SEG_DEBUG */
-  C_NTV_SECTION,		/* SEG_NTV */
-  C_PTV_SECTION,		/* SEG_PTV */
-  C_REGISTER_SECTION,		/* SEG_REGISTER */
-};
-
-int function_lineoff = -1;	/* Offset in line#s where the last function
-				   started (the odd entry for line #0) */
-
-static symbolS *last_line_symbol;
-
-/* Add 4 to the real value to get the index and compensate the
-   negatives. This vector is used by S_GET_SEGMENT to turn a coff
-   section number into a segment number
-*/
-static symbolS *previous_file_symbol = NULL;
-void c_symbol_merge ();
-static int line_base;
-
-symbolS *c_section_symbol ();
-bfd *abfd;
-
-static void fixup_segment PARAMS ((segment_info_type *segP,
-				   segT this_segment_type));
-
-
-static void fixup_mdeps PARAMS ((fragS *,
-				 object_headers *,
-				 segT));
-
-
-static void fill_section PARAMS ((bfd * abfd,
-				  object_headers *,
-				  unsigned long *));
-
-
-static symbolS *tag_find_or_make PARAMS ((char *name));
-static symbolS *tag_find PARAMS ((char *name));
-static void tag_init PARAMS ((void));
-static void tag_insert PARAMS ((char *name, symbolS * symbolP));
-char *s_get_name PARAMS ((symbolS * s));
-
-static int c_line_new PARAMS ((symbolS * symbol, long paddr,
-			       unsigned short line_number,
-			       fragS * frag));
-
-
-static void w_symbols PARAMS ((bfd * abfd, char *where,
-			       symbolS * symbol_rootP));
-
-static void adjust_stab_section PARAMS ((bfd *abfd, segT seg));
-
-static struct hash_control *tag_hash;
-
-static symbolS *def_symbol_in_progress = NULL;
-
-static void obj_coff_def PARAMS ((int));
-static void obj_coff_dim PARAMS ((int));
-static void obj_coff_endef PARAMS ((int));
-static void obj_coff_line PARAMS ((int));
-static void obj_coff_ln PARAMS ((int));
-static void obj_coff_scl PARAMS ((int));
-static void obj_coff_size PARAMS ((int));
-static void obj_coff_tag PARAMS ((int));
-static void obj_coff_type PARAMS ((int));
-static void obj_coff_val PARAMS ((int));
-static void obj_coff_lcomm PARAMS ((int));
-static void obj_coff_text PARAMS ((int));
-static void obj_coff_data PARAMS ((int));
-static void obj_coff_bss PARAMS ((int));
-static void obj_coff_ident PARAMS ((int));
-void obj_coff_section PARAMS ((int));
-
-const pseudo_typeS obj_pseudo_table[] =
-{
-  {"def", obj_coff_def, 0},
-  {"dim", obj_coff_dim, 0},
-  {"endef", obj_coff_endef, 0},
-  {"line", obj_coff_line, 0},
-  {"ln", obj_coff_ln, 0},
-  {"appline", obj_coff_ln, 1},
-  {"scl", obj_coff_scl, 0},
-  {"size", obj_coff_size, 0},
-  {"tag", obj_coff_tag, 0},
-  {"type", obj_coff_type, 0},
-  {"val", obj_coff_val, 0},
-  {"section", obj_coff_section, 0},
-  {"use", obj_coff_section, 0},
-  {"sect", obj_coff_section, 0},
-  {"text", obj_coff_text, 0},
-  {"data", obj_coff_data, 0},
-  {"bss", obj_coff_bss, 0},
-  {"ident", obj_coff_ident, 0},
-  {"ABORT", s_abort, 0},
-  {"lcomm", obj_coff_lcomm, 0},
-#ifdef TC_M88K
-  /* The m88k uses sdef instead of def.  */
-  {"sdef", obj_coff_def, 0},
-#endif
-  {NULL}			/* end sentinel */
-};				/* obj_pseudo_table */
-
-/* stack stuff */
-typedef struct
-  {
-    unsigned long chunk_size;
-    unsigned long element_size;
-    unsigned long size;
-    char *data;
-    unsigned long pointer;
-  }
-stack;
-
-static stack *
-stack_init (chunk_size, element_size)
-     unsigned long chunk_size;
-     unsigned long element_size;
-{
-  stack *st;
-
-  st = (stack *) malloc (sizeof (stack));
-  if (!st)
-    return 0;
-  st->data = malloc (chunk_size);
-  if (!st->data)
-    {
-      free (st);
-      return 0;
-    }
-  st->pointer = 0;
-  st->size = chunk_size;
-  st->chunk_size = chunk_size;
-  st->element_size = element_size;
-  return st;
-}
-
-static void
-stack_delete (st)
-     stack *st;
-{
-  free (st->data);
-  free (st);
-}
-
-static char *
-stack_push (st, element)
-     stack *st;
-     char *element;
-{
-  if (st->pointer + st->element_size >= st->size)
-    {
-      st->size += st->chunk_size;
-      if ((st->data = xrealloc (st->data, st->size)) == (char *) 0)
-	return (char *) 0;
-    }
-  memcpy (st->data + st->pointer, element, st->element_size);
-  st->pointer += st->element_size;
-  return st->data + st->pointer;
-}
-
-static char *
-stack_pop (st)
-     stack *st;
-{
-  if (st->pointer < st->element_size)
-    {
-      st->pointer = 0;
-      return (char *) 0;
-    }
-  st->pointer -= st->element_size;
-  return st->data + st->pointer;
-}
-
-/*
- * Maintain a list of the tagnames of the structres.
- */
-
-static void
-tag_init ()
-{
-  tag_hash = hash_new ();
-}
-
-static void
-tag_insert (name, symbolP)
-     char *name;
-     symbolS *symbolP;
-{
-  const char *error_string;
-
-  if ((error_string = hash_jam (tag_hash, name, (char *) symbolP)))
-    {
-      as_fatal ("Inserting \"%s\" into structure table failed: %s",
-		name, error_string);
-    }
-}
-
-static symbolS *
-tag_find_or_make (name)
-     char *name;
-{
-  symbolS *symbolP;
-
-  if ((symbolP = tag_find (name)) == NULL)
-    {
-      symbolP = symbol_new (name, undefined_section,
-			    0, &zero_address_frag);
-
-      tag_insert (S_GET_NAME (symbolP), symbolP);
-    }				/* not found */
-
-  return symbolP;
-}
-
-static symbolS *
-tag_find (name)
-     char *name;
-{
-#ifdef STRIP_UNDERSCORE
-  if (*name == '_')
-    name++;
-#endif /* STRIP_UNDERSCORE */
-  return (symbolS *) hash_find (tag_hash, name);
-}
-
-/* Section stuff
-
-   We allow more than just the standard 3 sections, infact, we allow
-   10 sections, (though the usual three have to be there).
-
-   This structure performs the mappings for us:
-
-*/
-
-#define N_SEG 32
-typedef struct
-{
-  segT seg_t;  
-  int i;  
-} seg_info_type;
-
-seg_info_type seg_info_off_by_4[N_SEG] = 
-{
- {SEG_PTV,  },
- {SEG_NTV,  },
- {SEG_DEBUG, },
- {SEG_ABSOLUTE,  },
- {SEG_UNKNOWN,	 },
- {SEG_E0}, 
- {SEG_E1},
- {SEG_E2},
- {SEG_E3},
- {SEG_E4},
- {SEG_E5},
- {SEG_E6},
- {SEG_E7},
- {SEG_E8}, 
- {SEG_E9},
- {(segT)15},
- {(segT)16},
- {(segT)17},
- {(segT)18},
- {(segT)19},
- {(segT)20},
- {(segT)0},
- {(segT)0},
- {(segT)0},
- {SEG_REGISTER}
-};
-
-
-
-#define SEG_INFO_FROM_SECTION_NUMBER(x) (seg_info_off_by_4[(x)+4])
-#define SEG_INFO_FROM_SEG_NUMBER(x) (seg_info_off_by_4[(x)])
-
-
-static relax_addressT
-relax_align (address, alignment)
-     relax_addressT address;
-     long alignment;
-{
-  relax_addressT mask;
-  relax_addressT new_address;
-
-  mask = ~((~0) << alignment);
-  new_address = (address + mask) & (~mask);
-  return (new_address - address);
-}				/* relax_align() */
-
-
-segT
-s_get_segment (x)
-     symbolS * x;
-{
-  return SEG_INFO_FROM_SECTION_NUMBER (x->sy_symbol.ost_entry.n_scnum).seg_t;
-}
-
-
-
-/* calculate the size of the frag chain and fill in the section header
-   to contain all of it, also fill in the addr of the sections */
-static unsigned int
-size_section (abfd, idx)
-     bfd * abfd;
-     unsigned int idx;
-{
-
-  unsigned int size = 0;
-  fragS *frag = segment_info[idx].frchainP->frch_root;
-  while (frag)
-    {
-      size = frag->fr_address;
-      if (frag->fr_address != size)
-	{
-	  printf ("Out of step\n");
-	  size = frag->fr_address;
-	}
-
-      switch (frag->fr_type)
-	{
-#ifdef TC_COFF_SIZEMACHDEP
-	case rs_machine_dependent:
-	  size += TC_COFF_SIZEMACHDEP (frag);
-	  break;
-#endif
-	case rs_fill:
-	case rs_org:
-	  size += frag->fr_fix;
-	  size += frag->fr_offset * frag->fr_var;
-	  break;
-	case rs_align:
-	  size += frag->fr_fix;
-	  size += relax_align (size, frag->fr_offset);
-	  break;
-	default:
-	  BAD_CASE (frag->fr_type);
-	  break;
-	}
-      frag = frag->fr_next;
-    }
-  segment_info[idx].scnhdr.s_size = size;
-  return size;
-}
-
-
-static unsigned int
-count_entries_in_chain (idx)
-     unsigned int idx;
-{
-  unsigned int nrelocs;
-  fixS *fixup_ptr;
-
-  /* Count the relocations */
-  fixup_ptr = segment_info[idx].fix_root;
-  nrelocs = 0;
-  while (fixup_ptr != (fixS *) NULL)
-    {
-      if (TC_COUNT_RELOC (fixup_ptr))
-	{
-#ifdef TC_A29K
-	  if (fixup_ptr->fx_r_type == RELOC_CONSTH)
-	    nrelocs += 2;
-	  else
-	    nrelocs++;
-#else
-	  nrelocs++;
-#endif
-	}
-
-      fixup_ptr = fixup_ptr->fx_next;
-    }
-  return nrelocs;
-}
-
-/* output all the relocations for a section */
-void
-do_relocs_for (abfd, h, file_cursor)
-     bfd * abfd;
-     object_headers * h;
-     unsigned long *file_cursor;
-{
-  unsigned int nrelocs;
-  unsigned int idx;
-  unsigned long reloc_start = *file_cursor;
-
-  for (idx = SEG_E0; idx < SEG_E9; idx++)
-    {
-      if (segment_info[idx].scnhdr.s_name[0])
-	{
-	  struct external_reloc *ext_ptr;
-	  struct external_reloc *external_reloc_vec;
-	  unsigned int external_reloc_size;
-	  unsigned int base = segment_info[idx].scnhdr.s_paddr;
-	  fixS *fix_ptr = segment_info[idx].fix_root;
-	  nrelocs = count_entries_in_chain (idx);
-
-	  if (nrelocs)
-	    /* Bypass this stuff if no relocs.  This also incidentally
-	       avoids a SCO bug, where free(malloc(0)) tends to crash.  */
-	    {
-	      external_reloc_size = nrelocs * RELSZ;
-	      external_reloc_vec =
-		(struct external_reloc *) malloc (external_reloc_size);
-
-	      ext_ptr = external_reloc_vec;
-
-	      /* Fill in the internal coff style reloc struct from the
-		 internal fix list.  */
-	      while (fix_ptr)
-		{
-		  symbolS *symbol_ptr;
-		  struct internal_reloc intr;
-
-		  /* Only output some of the relocations */
-		  if (TC_COUNT_RELOC (fix_ptr))
-		    {
-#ifdef TC_RELOC_MANGLE
-		      TC_RELOC_MANGLE (fix_ptr, &intr, base);
-
-#else
-		      symbolS *dot;
-		      symbol_ptr = fix_ptr->fx_addsy;
-
-		      intr.r_type = TC_COFF_FIX2RTYPE (fix_ptr);
-		      intr.r_vaddr =
-			base + fix_ptr->fx_frag->fr_address + fix_ptr->fx_where;
-
-#ifdef TC_M88K
-		      intr.r_offset = fix_ptr->fx_offset;
-#else
-		      intr.r_offset = 0;
-#endif
-
-		      /* Turn the segment of the symbol into an offset.  */
-		      if (symbol_ptr)
-			{
-			  dot = segment_info[S_GET_SEGMENT (symbol_ptr)].dot;
-			  if (dot)
-			    {
-			      intr.r_symndx = dot->sy_number;
-			    }
-			  else
-			    {
-			      intr.r_symndx = symbol_ptr->sy_number;
-			    }
-
-			}
-		      else
-			{
-			  intr.r_symndx = -1;
-			}
-#endif
-
-		      (void) bfd_coff_swap_reloc_out (abfd, &intr, ext_ptr);
-		      ext_ptr++;
-
-#if defined(TC_A29K)
-
-		      /* The 29k has a special kludge for the high 16 bit
-			 reloc.  Two relocations are emited, R_IHIHALF,
-			 and R_IHCONST. The second one doesn't contain a
-			 symbol, but uses the value for offset.  */
-
-		      if (intr.r_type == R_IHIHALF)
-			{
-			  /* now emit the second bit */
-			  intr.r_type = R_IHCONST;
-			  intr.r_symndx = fix_ptr->fx_addnumber;
-			  (void) bfd_coff_swap_reloc_out (abfd, &intr, ext_ptr);
-			  ext_ptr++;
-			}
-#endif
-		    }
-
-		  fix_ptr = fix_ptr->fx_next;
-		}
-
-	      /* Write out the reloc table */
-	      bfd_write ((PTR) external_reloc_vec, 1, external_reloc_size,
-			 abfd);
-	      free (external_reloc_vec);
-
-	      /* Fill in section header info.  */
-	      segment_info[idx].scnhdr.s_relptr = *file_cursor;
-	      *file_cursor += external_reloc_size;
-	      segment_info[idx].scnhdr.s_nreloc = nrelocs;
-	    }
-	  else
-	    {
-	      /* No relocs */
-	      segment_info[idx].scnhdr.s_relptr = 0;
-	    }
-	}
-    }
-  /* Set relocation_size field in file headers */
-  H_SET_RELOCATION_SIZE (h, *file_cursor - reloc_start, 0);
-}
-
-
-/* run through a frag chain and write out the data to go with it, fill
-   in the scnhdrs with the info on the file postions
-*/
-static void
-fill_section (abfd, h, file_cursor)
-     bfd * abfd;
-     object_headers *h;
-     unsigned long *file_cursor;
-{
-
-  unsigned int i;
-  unsigned int paddr = 0;
-
-  for (i = SEG_E0; i < SEG_UNKNOWN; i++)
-    {
-      unsigned int offset = 0;
-
-      struct internal_scnhdr *s = &(segment_info[i].scnhdr);
-
-      if (s->s_name[0])
-	{
-	  fragS *frag = segment_info[i].frchainP->frch_root;
-	  char *buffer;
-
-	  if (s->s_size == 0)
-	    s->s_scnptr = 0;
-	  else
-	    {
-	      buffer = xmalloc (s->s_size);
-	      s->s_scnptr = *file_cursor;
-	    }
-	  know (s->s_paddr == paddr);
-
-	  if (strcmp (s->s_name, ".text") == 0)
-	    s->s_flags |= STYP_TEXT;
-	  else if (strcmp (s->s_name, ".data") == 0)
-	    s->s_flags |= STYP_DATA;
-	  else if (strcmp (s->s_name, ".bss") == 0)
-	    {
-	      s->s_scnptr = 0;
-	      s->s_flags |= STYP_BSS;
-
-	      /* @@ Should make the i386 and a29k coff targets define
-		 COFF_NOLOAD_PROBLEM, and have only one test here.  */
-#ifndef TC_I386
-#ifndef TC_A29K
-#ifndef COFF_NOLOAD_PROBLEM
-	      /* Apparently the SVR3 linker (and exec syscall) and UDI
-		 mondfe progrem are confused by noload sections.  */
-	      s->s_flags |= STYP_NOLOAD;
-#endif
-#endif
-#endif
-	    }
-	  else if (strcmp (s->s_name, ".lit") == 0)
-	    s->s_flags = STYP_LIT | STYP_TEXT;
-	  else if (strcmp (s->s_name, ".init") == 0)
-	    s->s_flags |= STYP_TEXT;
-	  else if (strcmp (s->s_name, ".fini") == 0)
-	    s->s_flags |= STYP_TEXT;
-	  else if (strncmp (s->s_name, ".comment", 8) == 0)
-	    s->s_flags |= STYP_INFO;
-
-	  while (frag)
-	    {
-	      unsigned int fill_size;
-	      switch (frag->fr_type)
-		{
-		case rs_machine_dependent:
-		  if (frag->fr_fix)
-		    {
-		      memcpy (buffer + frag->fr_address,
-			      frag->fr_literal,
-			      (unsigned int) frag->fr_fix);
-		      offset += frag->fr_fix;
-		    }
-
-		  break;
-		case rs_fill:
-		case rs_align:
-		case rs_org:
-		  if (frag->fr_fix)
-		    {
-		      memcpy (buffer + frag->fr_address,
-			      frag->fr_literal,
-			      (unsigned int) frag->fr_fix);
-		      offset += frag->fr_fix;
-		    }
-
-		  fill_size = frag->fr_var;
-		  if (fill_size && frag->fr_offset > 0)
-		    {
-		      unsigned int count;
-		      unsigned int off = frag->fr_fix;
-		      for (count = frag->fr_offset; count; count--)
-			{
-			  if (fill_size + frag->fr_address + off <= s->s_size)
-			    {
-			      memcpy (buffer + frag->fr_address + off,
-				      frag->fr_literal + frag->fr_fix,
-				      fill_size);
-			      off += fill_size;
-			      offset += fill_size;
-			    }
-			}
-		    }
-		  break;
-		case rs_broken_word:
-		  break;
-		default:
-		  abort ();
-		}
-	      frag = frag->fr_next;
-	    }
-
-	  if (s->s_size != 0)
-	    {
-	      if (s->s_scnptr != 0)
-		{
-		  bfd_write (buffer, s->s_size, 1, abfd);
-		  *file_cursor += s->s_size;
-		}
-	      free (buffer);
-	    }
-	  paddr += s->s_size;
-	}
-    }
-}
-
-/* Coff file generation & utilities */
-
-static void
-coff_header_append (abfd, h)
-     bfd * abfd;
-     object_headers * h;
-{
-  unsigned int i;
-  char buffer[1000];
-  char buffero[1000];
-
-  bfd_seek (abfd, 0, 0);
-
-#ifndef OBJ_COFF_OMIT_OPTIONAL_HEADER
-  H_SET_MAGIC_NUMBER (h, COFF_MAGIC);
-  H_SET_VERSION_STAMP (h, 0);
-  H_SET_ENTRY_POINT (h, 0);
-  H_SET_TEXT_START (h, segment_info[SEG_E0].frchainP->frch_root->fr_address);
-  H_SET_DATA_START (h, segment_info[SEG_E1].frchainP->frch_root->fr_address);
-  H_SET_SIZEOF_OPTIONAL_HEADER (h, bfd_coff_swap_aouthdr_out(abfd, &h->aouthdr,
-							     buffero));
-#else /* defined (OBJ_COFF_OMIT_OPTIONAL_HEADER) */
-  H_SET_SIZEOF_OPTIONAL_HEADER (h, 0);
-#endif /* defined (OBJ_COFF_OMIT_OPTIONAL_HEADER) */
-
-  i = bfd_coff_swap_filehdr_out (abfd, &h->filehdr, buffer);
-
-  bfd_write (buffer, i, 1, abfd);
-  bfd_write (buffero, H_GET_SIZEOF_OPTIONAL_HEADER (h), 1, abfd);
-
-  for (i = SEG_E0; i < SEG_E9; i++)
-    {
-      if (segment_info[i].scnhdr.s_name[0])
-	{
-	  unsigned int size =
-	  bfd_coff_swap_scnhdr_out (abfd,
-				    &(segment_info[i].scnhdr),
-				    buffer);
-	  bfd_write (buffer, size, 1, abfd);
-	}
-    }
-}
-
-
-char *
-symbol_to_chars (abfd, where, symbolP)
-     bfd * abfd;
-     char *where;
-     symbolS * symbolP;
-{
-  unsigned int numaux = symbolP->sy_symbol.ost_entry.n_numaux;
-  unsigned int i;
-  valueT val;
-
-  /* Turn any symbols with register attributes into abs symbols */
-  if (S_GET_SEGMENT (symbolP) == reg_section)
-    {
-      S_SET_SEGMENT (symbolP, absolute_section);
-    }
-  /* At the same time, relocate all symbols to their output value */
-
-  val = (segment_info[S_GET_SEGMENT (symbolP)].scnhdr.s_paddr
-	 + S_GET_VALUE (symbolP));
-
-  S_SET_VALUE (symbolP, val);
-
-  symbolP->sy_symbol.ost_entry.n_value = val;
-
-  where += bfd_coff_swap_sym_out (abfd, &symbolP->sy_symbol.ost_entry,
-				  where);
-
-  for (i = 0; i < numaux; i++)
-    {
-      where += bfd_coff_swap_aux_out (abfd,
-				      &symbolP->sy_symbol.ost_auxent[i],
-				      S_GET_DATA_TYPE (symbolP),
-				      S_GET_STORAGE_CLASS (symbolP),
-				      i, numaux, where);
-    }
-  return where;
-
-}
-
-void
-obj_symbol_new_hook (symbolP)
-     symbolS *symbolP;
-{
-  char underscore = 0;		/* Symbol has leading _ */
-
-  /* Effective symbol */
-  /* Store the pointer in the offset. */
-  S_SET_ZEROES (symbolP, 0L);
-  S_SET_DATA_TYPE (symbolP, T_NULL);
-  S_SET_STORAGE_CLASS (symbolP, 0);
-  S_SET_NUMBER_AUXILIARY (symbolP, 0);
-  /* Additional information */
-  symbolP->sy_symbol.ost_flags = 0;
-  /* Auxiliary entries */
-  memset ((char *) &symbolP->sy_symbol.ost_auxent[0], 0, AUXESZ);
-
-  if (S_IS_STRING (symbolP))
-    SF_SET_STRING (symbolP);
-  if (!underscore && S_IS_LOCAL (symbolP))
-    SF_SET_LOCAL (symbolP);
-}
-
-/*
- * Handle .ln directives.
- */
-
-static void
-obj_coff_ln (appline)
-     int appline;
-{
-  int l;
-
-  if (! appline && def_symbol_in_progress != NULL)
-    {
-      as_warn (".ln pseudo-op inside .def/.endef: ignored.");
-      demand_empty_rest_of_line ();
-      return;
-    }				/* wrong context */
-
-  c_line_new (0,
-	      obstack_next_free (&frags) - frag_now->fr_literal,
-	      l = get_absolute_expression (),
-	      frag_now);
-#ifndef NO_LISTING
-  {
-    extern int listing;
-
-    if (listing)
-      {
-	if (! appline)
-	  l += line_base - 1;
-	listing_source_line ((unsigned int) l);
-      }
-
-  }
-#endif
-  demand_empty_rest_of_line ();
-}
-
-/*
- *			def()
- *
- * Handle .def directives.
- *
- * One might ask : why can't we symbol_new if the symbol does not
- * already exist and fill it with debug information.  Because of
- * the C_EFCN special symbol. It would clobber the value of the
- * function symbol before we have a chance to notice that it is
- * a C_EFCN. And a second reason is that the code is more clear this
- * way. (at least I think it is :-).
- *
- */
-
-#define SKIP_SEMI_COLON()	while (*input_line_pointer++ != ';')
-#define SKIP_WHITESPACES()	while (*input_line_pointer == ' ' || \
-				      *input_line_pointer == '\t') \
-                                         input_line_pointer++;
-
-static void
-obj_coff_def (what)
-     int what;
-{
-  char name_end;		/* Char after the end of name */
-  char *symbol_name;		/* Name of the debug symbol */
-  char *symbol_name_copy;	/* Temporary copy of the name */
-  unsigned int symbol_name_length;
-
-  if (def_symbol_in_progress != NULL)
-    {
-      as_warn (".def pseudo-op used inside of .def/.endef: ignored.");
-      demand_empty_rest_of_line ();
-      return;
-    }				/* if not inside .def/.endef */
-
-  SKIP_WHITESPACES ();
-
-  def_symbol_in_progress = (symbolS *) obstack_alloc (&notes, sizeof (*def_symbol_in_progress));
-  memset (def_symbol_in_progress, 0, sizeof (*def_symbol_in_progress));
-
-  symbol_name = input_line_pointer;
-  name_end = get_symbol_end ();
-  symbol_name_length = strlen (symbol_name);
-  symbol_name_copy = xmalloc (symbol_name_length + 1);
-  strcpy (symbol_name_copy, symbol_name);
-
-  /* Initialize the new symbol */
-#ifdef STRIP_UNDERSCORE
-  S_SET_NAME (def_symbol_in_progress, (*symbol_name_copy == '_'
-				       ? symbol_name_copy + 1
-				       : symbol_name_copy));
-#else /* STRIP_UNDERSCORE */
-  S_SET_NAME (def_symbol_in_progress, symbol_name_copy);
-#endif /* STRIP_UNDERSCORE */
-  /* free(symbol_name_copy); */
-  def_symbol_in_progress->sy_name_offset = (unsigned long) ~0;
-  def_symbol_in_progress->sy_number = ~0;
-  def_symbol_in_progress->sy_frag = &zero_address_frag;
-  S_SET_VALUE (def_symbol_in_progress, 0);
-
-  if (S_IS_STRING (def_symbol_in_progress))
-    SF_SET_STRING (def_symbol_in_progress);
-
-  *input_line_pointer = name_end;
-
-  demand_empty_rest_of_line ();
-}
-
-unsigned int dim_index;
-
-
-static void
-obj_coff_endef (ignore)
-     int ignore;
-{
-  symbolS *symbolP = 0;
-  /* DIM BUG FIX sac@cygnus.com */
-  dim_index = 0;
-  if (def_symbol_in_progress == NULL)
-    {
-      as_warn (".endef pseudo-op used outside of .def/.endef: ignored.");
-      demand_empty_rest_of_line ();
-      return;
-    }				/* if not inside .def/.endef */
-
-  /* Set the section number according to storage class. */
-  switch (S_GET_STORAGE_CLASS (def_symbol_in_progress))
-    {
-    case C_STRTAG:
-    case C_ENTAG:
-    case C_UNTAG:
-      SF_SET_TAG (def_symbol_in_progress);
-      /* intentional fallthrough */
-    case C_FILE:
-    case C_TPDEF:
-      SF_SET_DEBUG (def_symbol_in_progress);
-      S_SET_SEGMENT (def_symbol_in_progress, SEG_DEBUG);
-      break;
-
-    case C_EFCN:
-      SF_SET_LOCAL (def_symbol_in_progress);	/* Do not emit this symbol. */
-      /* intentional fallthrough */
-    case C_BLOCK:
-      SF_SET_PROCESS (def_symbol_in_progress);	/* Will need processing before writing */
-      /* intentional fallthrough */
-    case C_FCN:
-      S_SET_SEGMENT (def_symbol_in_progress, SEG_E0);
-
-      if (strcmp (S_GET_NAME (def_symbol_in_progress), ".bf") == 0)
-	{			/* .bf */
-	  if (function_lineoff < 0)
-	    {
-	      fprintf (stderr, "`.bf' symbol without preceding function\n");
-	    }			/* missing function symbol */
-	  SA_GET_SYM_LNNOPTR (last_line_symbol) = function_lineoff;
-
-	  SF_SET_PROCESS (last_line_symbol);
-	  function_lineoff = -1;
-	}
-      /* Value is always set to . */
-      def_symbol_in_progress->sy_frag = frag_now;
-      S_SET_VALUE (def_symbol_in_progress, (valueT) frag_now_fix ());
-      break;
-
-#ifdef C_AUTOARG
-    case C_AUTOARG:
-#endif /* C_AUTOARG */
-    case C_AUTO:
-    case C_REG:
-    case C_MOS:
-    case C_MOE:
-    case C_MOU:
-    case C_ARG:
-    case C_REGPARM:
-    case C_FIELD:
-    case C_EOS:
-      SF_SET_DEBUG (def_symbol_in_progress);
-      S_SET_SEGMENT (def_symbol_in_progress, absolute_section);
-      break;
-
-    case C_EXT:
-    case C_STAT:
-    case C_LABEL:
-      /* Valid but set somewhere else (s_comm, s_lcomm, colon) */
-      break;
-
-    case C_USTATIC:
-    case C_EXTDEF:
-    case C_ULABEL:
-      as_warn ("unexpected storage class %d", S_GET_STORAGE_CLASS (def_symbol_in_progress));
-      break;
-    }				/* switch on storage class */
-
-  /* Now that we have built a debug symbol, try to find if we should
-     merge with an existing symbol or not.  If a symbol is C_EFCN or
-     absolute_section or untagged SEG_DEBUG it never merges.  We also
-     don't merge labels, which are in a different namespace, nor
-     symbols which have not yet been defined since they are typically
-     unique, nor do we merge tags with non-tags.  */
-
-  /* Two cases for functions.  Either debug followed by definition or
-     definition followed by debug.  For definition first, we will
-     merge the debug symbol into the definition.  For debug first, the
-     lineno entry MUST point to the definition function or else it
-     will point off into space when crawl_symbols() merges the debug
-     symbol into the real symbol.  Therefor, let's presume the debug
-     symbol is a real function reference. */
-
-  /* FIXME-SOON If for some reason the definition label/symbol is
-     never seen, this will probably leave an undefined symbol at link
-     time. */
-
-  if (S_GET_STORAGE_CLASS (def_symbol_in_progress) == C_EFCN
-      || S_GET_STORAGE_CLASS (def_symbol_in_progress) == C_LABEL
-      || (S_GET_SEGMENT (def_symbol_in_progress) == SEG_DEBUG
-	  && !SF_GET_TAG (def_symbol_in_progress))
-      || S_GET_SEGMENT (def_symbol_in_progress) == absolute_section
-      || def_symbol_in_progress->sy_value.X_op != O_constant
-      || (symbolP = symbol_find_base (S_GET_NAME (def_symbol_in_progress), DO_NOT_STRIP)) == NULL
-      || (SF_GET_TAG (def_symbol_in_progress) != SF_GET_TAG (symbolP)))
-    {
-      symbol_append (def_symbol_in_progress, symbol_lastP, &symbol_rootP,
-		     &symbol_lastP);
-    }
-  else
-    {
-      /* This symbol already exists, merge the newly created symbol
-	 into the old one.  This is not mandatory. The linker can
-	 handle duplicate symbols correctly. But I guess that it save
-	 a *lot* of space if the assembly file defines a lot of
-	 symbols. [loic] */
-
-      /* The debug entry (def_symbol_in_progress) is merged into the
-	 previous definition.  */
-
-      c_symbol_merge (def_symbol_in_progress, symbolP);
-      /* FIXME-SOON Should *def_symbol_in_progress be free'd? xoxorich. */
-      def_symbol_in_progress = symbolP;
-
-      if (SF_GET_FUNCTION (def_symbol_in_progress)
-	  || SF_GET_TAG (def_symbol_in_progress))
-	{
-	  /* For functions, and tags, the symbol *must* be where the
-	     debug symbol appears.  Move the existing symbol to the
-	     current place. */
-	  /* If it already is at the end of the symbol list, do nothing */
-	  if (def_symbol_in_progress != symbol_lastP)
-	    {
-	      symbol_remove (def_symbol_in_progress, &symbol_rootP,
-			     &symbol_lastP);
-	      symbol_append (def_symbol_in_progress, symbol_lastP,
-			     &symbol_rootP, &symbol_lastP);
-	    }			/* if not already in place */
-	}			/* if function */
-    }				/* normal or mergable */
-
-  if (SF_GET_TAG (def_symbol_in_progress)
-      && symbol_find_base (S_GET_NAME (def_symbol_in_progress), DO_NOT_STRIP) == NULL)
-    {
-      tag_insert (S_GET_NAME (def_symbol_in_progress), def_symbol_in_progress);
-    }
-
-  if (SF_GET_FUNCTION (def_symbol_in_progress))
-    {
-      know (sizeof (def_symbol_in_progress) <= sizeof (long));
-      function_lineoff
-	= c_line_new (def_symbol_in_progress, 0, 0, &zero_address_frag);
-
-      SF_SET_PROCESS (def_symbol_in_progress);
-
-      if (symbolP == NULL)
-	{
-	  /* That is, if this is the first time we've seen the
-	     function... */
-	  symbol_table_insert (def_symbol_in_progress);
-	}			/* definition follows debug */
-    }				/* Create the line number entry pointing to the function being defined */
-
-  def_symbol_in_progress = NULL;
-  demand_empty_rest_of_line ();
-}
-
-static void
-obj_coff_dim (ignore)
-     int ignore;
-{
-  int dim_index;
-
-  if (def_symbol_in_progress == NULL)
-    {
-      as_warn (".dim pseudo-op used outside of .def/.endef: ignored.");
-      demand_empty_rest_of_line ();
-      return;
-    }				/* if not inside .def/.endef */
-
-  S_SET_NUMBER_AUXILIARY (def_symbol_in_progress, 1);
-
-  for (dim_index = 0; dim_index < DIMNUM; dim_index++)
-    {
-      SKIP_WHITESPACES ();
-      SA_SET_SYM_DIMEN (def_symbol_in_progress, dim_index,
-			get_absolute_expression ());
-
-      switch (*input_line_pointer)
-	{
-	case ',':
-	  input_line_pointer++;
-	  break;
-
-	default:
-	  as_warn ("badly formed .dim directive ignored");
-	  /* intentional fallthrough */
-	case '\n':
-	case ';':
-	  dim_index = DIMNUM;
-	  break;
-	}
-    }
-
-  demand_empty_rest_of_line ();
-}
-
-static void
-obj_coff_line (ignore)
-     int ignore;
-{
-  int this_base;
-
-  if (def_symbol_in_progress == NULL)
-    {
-      obj_coff_ln (0);
-      return;
-    }
-
-  this_base = get_absolute_expression ();
-  if (this_base > line_base)
-    {
-      line_base = this_base;
-    }
-
-#ifndef NO_LISTING
-  {
-    extern int listing;
-    if (listing && 0)
-      {
-	listing_source_line ((unsigned int) line_base);
-      }
-  }
-#endif
-  S_SET_NUMBER_AUXILIARY (def_symbol_in_progress, 1);
-  SA_SET_SYM_LNNO (def_symbol_in_progress, this_base);
-
-  demand_empty_rest_of_line ();
-}
-
-static void
-obj_coff_size (ignore)
-     int ignore;
-{
-  if (def_symbol_in_progress == NULL)
-    {
-      as_warn (".size pseudo-op used outside of .def/.endef ignored.");
-      demand_empty_rest_of_line ();
-      return;
-    }				/* if not inside .def/.endef */
-
-  S_SET_NUMBER_AUXILIARY (def_symbol_in_progress, 1);
-  SA_SET_SYM_SIZE (def_symbol_in_progress, get_absolute_expression ());
-  demand_empty_rest_of_line ();
-}
-
-static void
-obj_coff_scl (ignore)
-     int ignore;
-{
-  if (def_symbol_in_progress == NULL)
-    {
-      as_warn (".scl pseudo-op used outside of .def/.endef ignored.");
-      demand_empty_rest_of_line ();
-      return;
-    }				/* if not inside .def/.endef */
-
-  S_SET_STORAGE_CLASS (def_symbol_in_progress, get_absolute_expression ());
-  demand_empty_rest_of_line ();
-}
-
-static void
-obj_coff_tag (ignore)
-     int ignore;
-{
-  char *symbol_name;
-  char name_end;
-
-  if (def_symbol_in_progress == NULL)
-    {
-      as_warn (".tag pseudo-op used outside of .def/.endef ignored.");
-      demand_empty_rest_of_line ();
-      return;
-    }
-
-  S_SET_NUMBER_AUXILIARY (def_symbol_in_progress, 1);
-  symbol_name = input_line_pointer;
-  name_end = get_symbol_end ();
-
-  /* Assume that the symbol referred to by .tag is always defined.
-     This was a bad assumption.  I've added find_or_make. xoxorich. */
-  SA_SET_SYM_TAGNDX (def_symbol_in_progress,
-		     (long) tag_find_or_make (symbol_name));
-  if (SA_GET_SYM_TAGNDX (def_symbol_in_progress) == 0L)
-    {
-      as_warn ("tag not found for .tag %s", symbol_name);
-    }				/* not defined */
-
-  SF_SET_TAGGED (def_symbol_in_progress);
-  *input_line_pointer = name_end;
-
-  demand_empty_rest_of_line ();
-}
-
-static void
-obj_coff_type (ignore)
-     int ignore;
-{
-  if (def_symbol_in_progress == NULL)
-    {
-      as_warn (".type pseudo-op used outside of .def/.endef ignored.");
-      demand_empty_rest_of_line ();
-      return;
-    }				/* if not inside .def/.endef */
-
-  S_SET_DATA_TYPE (def_symbol_in_progress, get_absolute_expression ());
-
-  if (ISFCN (S_GET_DATA_TYPE (def_symbol_in_progress)) &&
-      S_GET_STORAGE_CLASS (def_symbol_in_progress) != C_TPDEF)
-    {
-      SF_SET_FUNCTION (def_symbol_in_progress);
-    }				/* is a function */
-
-  demand_empty_rest_of_line ();
-}
-
-static void
-obj_coff_val (ignore)
-     int ignore;
-{
-  if (def_symbol_in_progress == NULL)
-    {
-      as_warn (".val pseudo-op used outside of .def/.endef ignored.");
-      demand_empty_rest_of_line ();
-      return;
-    }				/* if not inside .def/.endef */
-
-  if (is_name_beginner (*input_line_pointer))
-    {
-      char *symbol_name = input_line_pointer;
-      char name_end = get_symbol_end ();
-
-      if (!strcmp (symbol_name, "."))
-	{
-	  def_symbol_in_progress->sy_frag = frag_now;
-	  S_SET_VALUE (def_symbol_in_progress, (valueT) frag_now_fix ());
-	  /* If the .val is != from the .def (e.g. statics) */
-	}
-      else if (strcmp (S_GET_NAME (def_symbol_in_progress), symbol_name))
-	{
-	  def_symbol_in_progress->sy_value.X_op = O_symbol;
-	  def_symbol_in_progress->sy_value.X_add_symbol =
-	    symbol_find_or_make (symbol_name);
-	  def_symbol_in_progress->sy_value.X_op_symbol = NULL;
-	  def_symbol_in_progress->sy_value.X_add_number = 0;
-
-	  /* If the segment is undefined when the forward reference is
-	     resolved, then copy the segment id from the forward
-	     symbol.  */
-	  SF_SET_GET_SEGMENT (def_symbol_in_progress);
-
-	  /* FIXME: gcc can generate address expressions
-	     here in unusual cases (search for "obscure"
-	     in sdbout.c).  We just ignore the offset
-	     here, thus generating incorrect debugging
-	     information.  We ignore the rest of the
-	     line just below.  */
-	}
-      /* Otherwise, it is the name of a non debug symbol and
-	 its value will be calculated later. */
-      *input_line_pointer = name_end;
-
-      /* FIXME: this is to avoid an error message in the
-	 FIXME case mentioned just above.  */
-      while (! is_end_of_line[(unsigned char) *input_line_pointer])
-	++input_line_pointer;
-    }
-  else
-    {
-      S_SET_VALUE (def_symbol_in_progress,
-		   (valueT) get_absolute_expression ());
-    }				/* if symbol based */
-
-  demand_empty_rest_of_line ();
-}
-
-void
-obj_read_begin_hook ()
-{
-  /* These had better be the same.  Usually 18 bytes. */
-#ifndef BFD_HEADERS
-  know (sizeof (SYMENT) == sizeof (AUXENT));
-  know (SYMESZ == AUXESZ);
-#endif
-  tag_init ();
-}
-
-/* This function runs through the symbol table and puts all the
-   externals onto another chain */
-
-/* The chain of externals */
-symbolS *symbol_externP = NULL;
-symbolS *symbol_extern_lastP = NULL;
-
-stack *block_stack;
-symbolS *last_functionP = NULL;
-symbolS *last_tagP;
-
-static unsigned int
-yank_symbols ()
-{
-  symbolS *symbolP;
-  unsigned int symbol_number = 0;
-  unsigned int last_file_symno = 0;
-
-  for (symbolP = symbol_rootP;
-       symbolP;
-       symbolP = symbolP ? symbol_next (symbolP) : symbol_rootP)
-    {
-      if (!SF_GET_DEBUG (symbolP))
-	{
-	  /* Debug symbols do not need all this rubbish */
-	  symbolS *real_symbolP;
-
-	  /* L* and C_EFCN symbols never merge. */
-	  if (!SF_GET_LOCAL (symbolP)
-	      && S_GET_STORAGE_CLASS (symbolP) != C_LABEL
-	      && symbolP->sy_value.X_op == O_constant
-	      && (real_symbolP = symbol_find_base (S_GET_NAME (symbolP), DO_NOT_STRIP))
-	      && real_symbolP != symbolP)
-	    {
-	      /* FIXME-SOON: where do dups come from?
-		 Maybe tag references before definitions? xoxorich. */
-	      /* Move the debug data from the debug symbol to the
-		 real symbol. Do NOT do the oposite (i.e. move from
-		 real symbol to debug symbol and remove real symbol from the
-		 list.) Because some pointers refer to the real symbol
-		 whereas no pointers refer to the debug symbol. */
-	      c_symbol_merge (symbolP, real_symbolP);
-	      /* Replace the current symbol by the real one */
-	      /* The symbols will never be the last or the first
-		 because : 1st symbol is .file and 3 last symbols are
-		 .text, .data, .bss */
-	      symbol_remove (real_symbolP, &symbol_rootP, &symbol_lastP);
-	      symbol_insert (real_symbolP, symbolP, &symbol_rootP, &symbol_lastP);
-	      symbol_remove (symbolP, &symbol_rootP, &symbol_lastP);
-	      symbolP = real_symbolP;
-	    }			/* if not local but dup'd */
-
-	  if (flagseen['R'] && (S_GET_SEGMENT (symbolP) == SEG_E1))
-	    {
-	      S_SET_SEGMENT (symbolP, SEG_E0);
-	    }			/* push data into text */
-
-	  resolve_symbol_value (symbolP);
-
-	  if (S_GET_STORAGE_CLASS (symbolP) == C_NULL)
-	    {
-	      if (!S_IS_DEFINED (symbolP) && !SF_GET_LOCAL (symbolP))
-		{
-		  S_SET_EXTERNAL (symbolP);
-		}
-	      else if (S_GET_SEGMENT (symbolP) == SEG_E0)
-		{
-		  S_SET_STORAGE_CLASS (symbolP, C_LABEL);
-		}
-	      else
-		{
-		  S_SET_STORAGE_CLASS (symbolP, C_STAT);
-		}
-	    }
-
-	  /* Mainly to speed up if not -g */
-	  if (SF_GET_PROCESS (symbolP))
-	    {
-	      /* Handle the nested blocks auxiliary info. */
-	      if (S_GET_STORAGE_CLASS (symbolP) == C_BLOCK)
-		{
-		  if (!strcmp (S_GET_NAME (symbolP), ".bb"))
-		    stack_push (block_stack, (char *) &symbolP);
-		  else
-		    {		/* .eb */
-		      register symbolS *begin_symbolP;
-		      begin_symbolP = *(symbolS **) stack_pop (block_stack);
-		      if (begin_symbolP == (symbolS *) 0)
-			as_warn ("mismatched .eb");
-		      else
-			SA_SET_SYM_ENDNDX (begin_symbolP, symbol_number + 2);
-		    }
-		}
-	      /* If we are able to identify the type of a function, and we
-	       are out of a function (last_functionP == 0) then, the
-	       function symbol will be associated with an auxiliary
-	       entry. */
-	      if (last_functionP == (symbolS *) 0 &&
-		  SF_GET_FUNCTION (symbolP))
-		{
-		  last_functionP = symbolP;
-
-		  if (S_GET_NUMBER_AUXILIARY (symbolP) < 1)
-		    {
-		      S_SET_NUMBER_AUXILIARY (symbolP, 1);
-		    }		/* make it at least 1 */
-
-		  /* Clobber possible stale .dim information. */
-#if 0
-		  /* Iffed out by steve - this fries the lnnoptr info too */
-		  bzero (symbolP->sy_symbol.ost_auxent[0].x_sym.x_fcnary.x_ary.x_dimen,
-			 sizeof (symbolP->sy_symbol.ost_auxent[0].x_sym.x_fcnary.x_ary.x_dimen));
-#endif
-		}
-	      /* The C_FCN doesn't need any additional information.  I
-		 don't even know if this is needed for sdb. But the
-		 standard assembler generates it, so...  */
-	      if (S_GET_STORAGE_CLASS (symbolP) == C_EFCN)
-		{
-		  if (last_functionP == (symbolS *) 0)
-		    as_fatal ("C_EFCN symbol out of scope");
-		  SA_SET_SYM_FSIZE (last_functionP,
-				    (long) (S_GET_VALUE (symbolP) -
-					    S_GET_VALUE (last_functionP)));
-		  SA_SET_SYM_ENDNDX (last_functionP, symbol_number);
-		 last_functionP = (symbolS *) 0;
-		}
-	    }
-	}
-      else if (SF_GET_TAG (symbolP))
-	{
-	  /* First descriptor of a structure must point to
-	       the first slot after the structure description. */
-	  last_tagP = symbolP;
-
-	}
-      else if (S_GET_STORAGE_CLASS (symbolP) == C_EOS)
-	{
-	  /* +2 take in account the current symbol */
-	  SA_SET_SYM_ENDNDX (last_tagP, symbol_number + 2);
-	}
-      else if (S_GET_STORAGE_CLASS (symbolP) == C_FILE)
-	{
-	  if (S_GET_VALUE (symbolP))
-	    {
-	      S_SET_VALUE (symbolP, last_file_symno);
-	      last_file_symno = symbol_number;
-	    }			/* no one points at the first .file symbol */
-	}			/* if debug or tag or eos or file */
-
-      /* We must put the external symbols apart. The loader
-	 does not bomb if we do not. But the references in
-	 the endndx field for a .bb symbol are not corrected
-	 if an external symbol is removed between .bb and .be.
-	 I.e in the following case :
-	 [20] .bb endndx = 22
-	 [21] foo external
-	 [22] .be
-	 ld will move the symbol 21 to the end of the list but
-	 endndx will still be 22 instead of 21. */
-
-
-      if (SF_GET_LOCAL (symbolP))
-	{
-	  /* remove C_EFCN and LOCAL (L...) symbols */
-	  /* next pointer remains valid */
-	  symbol_remove (symbolP, &symbol_rootP, &symbol_lastP);
-
-	}
-      else if (!S_IS_DEFINED (symbolP)
-	       && !S_IS_DEBUG (symbolP)
-	       && !SF_GET_STATICS (symbolP) &&
-	       S_GET_STORAGE_CLASS (symbolP) == C_EXT)
-	{			/* C_EXT && !SF_GET_FUNCTION(symbolP))  */
-	  /* if external, Remove from the list */
-	  symbolS *hold = symbol_previous (symbolP);
-
-	  symbol_remove (symbolP, &symbol_rootP, &symbol_lastP);
-	  symbol_clear_list_pointers (symbolP);
-	  symbol_append (symbolP, symbol_extern_lastP, &symbol_externP, &symbol_extern_lastP);
-	  symbolP = hold;
-	}
-      else
-	{
-	  if (SF_GET_STRING (symbolP))
-	    {
-	      symbolP->sy_name_offset = string_byte_count;
-	      string_byte_count += strlen (S_GET_NAME (symbolP)) + 1;
-	    }
-	  else
-	    {
-	      symbolP->sy_name_offset = 0;
-	    }			/* fix "long" names */
-
-	  symbolP->sy_number = symbol_number;
-	  symbol_number += 1 + S_GET_NUMBER_AUXILIARY (symbolP);
-	}			/* if local symbol */
-    }				/* traverse the symbol list */
-  return symbol_number;
-
-}
-
-
-static unsigned int
-glue_symbols ()
-{
-  unsigned int symbol_number = 0;
-  symbolS *symbolP;
-  for (symbolP = symbol_externP; symbol_externP;)
-    {
-      symbolS *tmp = symbol_externP;
-
-      /* append */
-      symbol_remove (tmp, &symbol_externP, &symbol_extern_lastP);
-      symbol_append (tmp, symbol_lastP, &symbol_rootP, &symbol_lastP);
-
-      /* and process */
-      if (SF_GET_STRING (tmp))
-	{
-	  tmp->sy_name_offset = string_byte_count;
-	  string_byte_count += strlen (S_GET_NAME (tmp)) + 1;
-	}
-      else
-	{
-	  tmp->sy_name_offset = 0;
-	}			/* fix "long" names */
-
-      tmp->sy_number = symbol_number;
-      symbol_number += 1 + S_GET_NUMBER_AUXILIARY (tmp);
-    }				/* append the entire extern chain */
-  return symbol_number;
-
-}
-
-static unsigned int
-tie_tags ()
-{
-  unsigned int symbol_number = 0;
-
-  symbolS *symbolP;
-  for (symbolP = symbol_rootP; symbolP; symbolP =
-       symbol_next (symbolP))
-    {
-      symbolP->sy_number = symbol_number;
-
-
-
-      if (SF_GET_TAGGED (symbolP))
-	{
-	  SA_SET_SYM_TAGNDX
-	    (symbolP,
-	     ((symbolS *) SA_GET_SYM_TAGNDX (symbolP))->sy_number);
-	}
-
-      symbol_number += 1 + S_GET_NUMBER_AUXILIARY (symbolP);
-    }
-  return symbol_number;
-
-}
-
-static void
-crawl_symbols (h, abfd)
-     object_headers *h;
-     bfd * abfd;
-{
-  unsigned int i;
-
-  /* Initialize the stack used to keep track of the matching .bb .be */
-
-  block_stack = stack_init (512, sizeof (symbolS *));
-
-  /* The symbol list should be ordered according to the following sequence
-   * order :
-   * . .file symbol
-   * . debug entries for functions
-   * . fake symbols for the sections, including.text .data and .bss
-   * . defined symbols
-   * . undefined symbols
-   * But this is not mandatory. The only important point is to put the
-   * undefined symbols at the end of the list.
-   */
-
-  if (symbol_rootP == NULL
-      || S_GET_STORAGE_CLASS (symbol_rootP) != C_FILE)
-    {
-      c_dot_file_symbol ("fake");
-    }
-  /* Is there a .file symbol ? If not insert one at the beginning. */
-
-  /*
-   * Build up static symbols for the sections, they are filled in later
-   */
-
-
-  for (i = SEG_E0; i < SEG_E9; i++)
-    {
-      if (segment_info[i].scnhdr.s_name[0])
-	{
-	  char name[9];
-
-	  strncpy (name, segment_info[i].scnhdr.s_name, 8);
-	  name[8] = '\0';
-	  segment_info[i].dot = c_section_symbol (name, i - SEG_E0 + 1);
-	}
-    }
-
-
-  /* Take all the externals out and put them into another chain */
-  H_SET_SYMBOL_TABLE_SIZE (h, yank_symbols ());
-  /* Take the externals and glue them onto the end.*/
-  H_SET_SYMBOL_TABLE_SIZE (h, H_GET_SYMBOL_COUNT (h) + glue_symbols ());
-
-  H_SET_SYMBOL_TABLE_SIZE (h, tie_tags ());
-  know (symbol_externP == NULL);
-  know (symbol_extern_lastP == NULL);
-}
-
-/*
- * Find strings by crawling along symbol table chain.
- */
-
-void
-w_strings (where)
-     char *where;
-{
-  symbolS *symbolP;
-
-  /* Gotta do md_ byte-ordering stuff for string_byte_count first - KWK */
-  md_number_to_chars (where, (valueT) string_byte_count, 4);
-  where += 4;
-  for (symbolP = symbol_rootP;
-       symbolP;
-       symbolP = symbol_next (symbolP))
-    {
-      unsigned int size;
-
-      if (SF_GET_STRING (symbolP))
-	{
-	  size = strlen (S_GET_NAME (symbolP)) + 1;
-
-	  memcpy (where, S_GET_NAME (symbolP), size);
-	  where += size;
-
-	}
-    }
-}
-
-static void
-do_linenos_for (abfd, h, file_cursor)
-     bfd * abfd;
-     object_headers * h;
-     unsigned long *file_cursor;
-{
-  unsigned int idx;
-  unsigned long start = *file_cursor;
-
-  for (idx = SEG_E0; idx < SEG_E9; idx++)
-    {
-      segment_info_type *s = segment_info + idx;
-
-
-      if (s->scnhdr.s_nlnno != 0)
-	{
-	  struct lineno_list *line_ptr;
-
-	  struct external_lineno *buffer =
-	  (struct external_lineno *) xmalloc (s->scnhdr.s_nlnno * LINESZ);
-
-	  struct external_lineno *dst = buffer;
-
-	  /* Run through the table we've built and turn it into its external
-	 form, take this chance to remove duplicates */
-
-	  for (line_ptr = s->lineno_list_head;
-	       line_ptr != (struct lineno_list *) NULL;
-	       line_ptr = line_ptr->next)
-	    {
-
-	      if (line_ptr->line.l_lnno == 0)
-		{
-		  /* Turn a pointer to a symbol into the symbols' index */
-		  line_ptr->line.l_addr.l_symndx =
-		    ((symbolS *) line_ptr->line.l_addr.l_symndx)->sy_number;
-		}
-	      else
-		{
-		  line_ptr->line.l_addr.l_paddr += ((struct frag *) (line_ptr->frag))->fr_address;
-		}
-
-
-	      (void) bfd_coff_swap_lineno_out (abfd, &(line_ptr->line), dst);
-	      dst++;
-
-	    }
-
-	  s->scnhdr.s_lnnoptr = *file_cursor;
-
-	  bfd_write (buffer, 1, s->scnhdr.s_nlnno * LINESZ, abfd);
-	  free (buffer);
-
-	  *file_cursor += s->scnhdr.s_nlnno * LINESZ;
-	}
-    }
-  H_SET_LINENO_SIZE (h, *file_cursor - start);
-}
-
-
-/* Now we run through the list of frag chains in a segment and
-   make all the subsegment frags appear at the end of the
-   list, as if the seg 0 was extra long */
-
-static void
-remove_subsegs ()
-{
-  unsigned int i;
-
-  for (i = SEG_E0; i < SEG_UNKNOWN; i++)
-    {
-      frchainS *head = segment_info[i].frchainP;
-      fragS dummy;
-      fragS *prev_frag = &dummy;
-
-      while (head && head->frch_seg == i)
-	{
-	  prev_frag->fr_next = head->frch_root;
-	  prev_frag = head->frch_last;
-	  head = head->frch_next;
-	}
-      prev_frag->fr_next = 0;
-    }
-}
-
-unsigned long machine;
-int coff_flags;
-extern void
-write_object_file ()
-{
-  int i;
-  char *name;
-  struct frchain *frchain_ptr;
-
-  object_headers headers;
-  unsigned long file_cursor;
-  bfd *abfd;
-  unsigned int addr;
-  abfd = bfd_openw (out_file_name, TARGET_FORMAT);
-
-
-  if (abfd == 0)
-    {
-      as_perror ("FATAL: Can't create %s", out_file_name);
-      exit (42);
-    }
-  bfd_set_format (abfd, bfd_object);
-  bfd_set_arch_mach (abfd, BFD_ARCH, machine);
-
-  string_byte_count = 4;
-
-  for (frchain_ptr = frchain_root;
-       frchain_ptr != (struct frchain *) NULL;
-       frchain_ptr = frchain_ptr->frch_next)
-    {
-      /* Run through all the sub-segments and align them up. Also close any
-	       open frags. We tack a .fill onto the end of the frag chain so
-	       that any .align's size can be worked by looking at the next
-	       frag */
-
-      subseg_set (frchain_ptr->frch_seg, frchain_ptr->frch_subseg);
-#ifndef SUB_SEGMENT_ALIGN
-#define SUB_SEGMENT_ALIGN(SEG) 1
-#endif
-      frag_align (SUB_SEGMENT_ALIGN (now_seg), NOP_OPCODE);
-      frag_wane (frag_now);
-      frag_now->fr_fix = 0;
-      know (frag_now->fr_next == NULL);
-    }
-
-
-  remove_subsegs ();
-
-
-  for (i = SEG_E0; i < SEG_UNKNOWN; i++)
-    {
-      relax_segment (segment_info[i].frchainP->frch_root, i);
-    }
-
-  H_SET_NUMBER_OF_SECTIONS (&headers, 0);
-
-  /* Find out how big the sections are, and set the addresses.  */
-  addr = 0;
-  for (i = SEG_E0; i < SEG_UNKNOWN; i++)
-    {
-      long size;
-
-      segment_info[i].scnhdr.s_paddr = addr;
-      segment_info[i].scnhdr.s_vaddr = addr;
-
-      if (segment_info[i].scnhdr.s_name[0])
-	{
-	  H_SET_NUMBER_OF_SECTIONS (&headers,
-				    H_GET_NUMBER_OF_SECTIONS (&headers) + 1);
-	}
-
-      size = size_section (abfd, (unsigned int) i);
-      addr += size;
-
-      if (i == SEG_E0)
-	H_SET_TEXT_SIZE (&headers, size);
-      else if (i == SEG_E1)
-	H_SET_DATA_SIZE (&headers, size);
-      else if (i == SEG_E2)
-	H_SET_BSS_SIZE (&headers, size);
-    }
-
-  /* Turn the gas native symbol table shape into a coff symbol table */
-  crawl_symbols (&headers, abfd);
-
-  if (string_byte_count == 4)
-    string_byte_count = 0;
-
-  H_SET_STRING_SIZE (&headers, string_byte_count);
-
-#if !defined(TC_H8300) && !defined(TC_Z8K) 
-  for (i = SEG_E0; i < SEG_UNKNOWN; i++)
-    {
-      fixup_mdeps (segment_info[i].frchainP->frch_root, &headers, i);
-      fixup_segment (&segment_info[i], i);
-    }
-#endif
-
-  /* Look for ".stab" segments and fill in their initial symbols
-     correctly. */
-  for (i = SEG_E0; i < SEG_UNKNOWN; i++)
-    {
-      name = segment_info[i].scnhdr.s_name;
-
-      if (name != NULL
-	  && strncmp (".stab", name, 5) == 0
-	  && strncmp (".stabstr", name, 8) != 0)
-	adjust_stab_section (abfd, i);
-    }
-
-  file_cursor = H_GET_TEXT_FILE_OFFSET (&headers);
-
-  bfd_seek (abfd, (file_ptr) file_cursor, 0);
-
-  /* Plant the data */
-
-  fill_section (abfd, &headers, &file_cursor);
-
-  do_relocs_for (abfd, &headers, &file_cursor);
-
-  do_linenos_for (abfd, &headers, &file_cursor);
-
-  H_SET_FILE_MAGIC_NUMBER (&headers, COFF_MAGIC);
-#ifndef OBJ_COFF_OMIT_TIMESTAMP
-  H_SET_TIME_STAMP (&headers, (long)time((long*)0));
-#else
-  H_SET_TIME_STAMP (&headers, 0);
-#endif
-
-#ifdef KEEP_RELOC_INFO
-  H_SET_FLAGS (&headers, ((H_GET_LINENO_SIZE(&headers) ? 0 : F_LNNO) |
-			  COFF_FLAGS | coff_flags));
-#else
-  H_SET_FLAGS (&headers, ((H_GET_LINENO_SIZE(&headers)     ? 0 : F_LNNO)   |
-			  (H_GET_RELOCATION_SIZE(&headers) ? 0 : F_RELFLG) |
-			  COFF_FLAGS | coff_flags));
-#endif	
-
-  {
-    unsigned int symtable_size = H_GET_SYMBOL_TABLE_SIZE (&headers);
-    char *buffer1 = xmalloc (symtable_size + string_byte_count + 1);
-
-    H_SET_SYMBOL_TABLE_POINTER (&headers, bfd_tell (abfd));
-    w_symbols (abfd, buffer1, symbol_rootP);
-    if (string_byte_count > 0)
-      w_strings (buffer1 + symtable_size);
-    bfd_write (buffer1, 1, symtable_size + string_byte_count, abfd);
-    free (buffer1);
-  }
-
-  coff_header_append (abfd, &headers);
-#if 0
-  /* Recent changes to write need this, but where it should
-     go is up to Ken.. */
-  if (bfd_close_all_done (abfd) == false)
-    as_fatal ("Can't close %s: %s", out_file_name,
-	      bfd_errmsg (bfd_get_error ()));
-#else
-  {
-    extern bfd *stdoutput;
-    stdoutput = abfd;
-  }
-#endif
-
-}
-
-/* Add a new segment.  This is called from subseg_new via the
-   obj_new_segment macro.  */
-
-segT
-obj_coff_add_segment (name)
-     const char *name;
-{
-  unsigned int len;
-  unsigned int i;
-
-  /* Find out if we've already got a section of this name.  */
-  len = strlen (name);
-  if (len < sizeof (segment_info[i].scnhdr.s_name))
-    ++len;
-  else
-    len = sizeof (segment_info[i].scnhdr.s_name);
-  for (i = SEG_E0; i < SEG_E9 && segment_info[i].scnhdr.s_name[0]; i++)
-    if (strncmp (segment_info[i].scnhdr.s_name, name, len) == 0
-	&& (len == sizeof (segment_info[i].scnhdr.s_name)
-	    || segment_info[i].scnhdr.s_name[len] == '\0'))
-      return (segT) i;
-
-  if (i == SEG_E9)
-    {
-      as_bad ("Too many new sections; can't add \"%s\"", name);
-      return now_seg;
-    }
-
-  /* Add a new section.  */
-  strncpy (segment_info[i].scnhdr.s_name, name,
-	   sizeof (segment_info[i].scnhdr.s_name));
-  segment_info[i].scnhdr.s_flags = STYP_REG;
-
-  return (segT) i;
-}
-
-/*
- * implement the .section pseudo op:
- *	.section name {, "flags"}
- *                ^         ^
- *                |         +--- optional flags: 'b' for bss
- *                |                              'i' for info
- *                +-- section name               'l' for lib
- *                                               'n' for noload
- *                                               'o' for over
- *                                               'w' for data
- *						 'd' (apparently m88k for data)
- *                                               'x' for text
- * But if the argument is not a quoted string, treat it as a
- * subsegment number.
- */
-
-void
-obj_coff_section (ignore)
-     int ignore;
-{
-  /* Strip out the section name */
-  char *section_name;
-  char *section_name_end;
-  char c;
-  int argp;
-  unsigned int len;
-  unsigned int exp;
-  long flags;
-
-  section_name = input_line_pointer;
-  c = get_symbol_end ();
-  section_name_end = input_line_pointer;
-
-  len = section_name_end - section_name;
-  input_line_pointer++;
-  SKIP_WHITESPACE ();
-
-  argp = 0;
-  if (c == ',')
-    argp = 1;
-  else if (*input_line_pointer == ',')
-    {
-      argp = 1;
-      ++input_line_pointer;
-      SKIP_WHITESPACE ();
-    }
-
-  exp = 0;
-  flags = 0;
-  if (argp)
-    {
-      if (*input_line_pointer != '"')
-	exp = get_absolute_expression ();
-      else
-	{
-	  ++input_line_pointer;
-	  while (*input_line_pointer != '"'
-		 && ! is_end_of_line[(unsigned char) *input_line_pointer])
-	    {
-	      switch (*input_line_pointer)
-		{
-		case 'b': flags |= STYP_BSS;    break;
-		case 'i': flags |= STYP_INFO;   break;
-		case 'l': flags |= STYP_LIB;    break;
-		case 'n': flags |= STYP_NOLOAD; break;
-		case 'o': flags |= STYP_OVER;   break;
-		case 'd':
-		case 'w': flags |= STYP_DATA;   break;
-		case 'x': flags |= STYP_TEXT;   break;
-		default:
-		  as_warn("unknown section attribute '%c'",
-			  *input_line_pointer);
-		  break;
-		}
-	      ++input_line_pointer;
-	    }
-	  if (*input_line_pointer == '"')
-	    ++input_line_pointer;
-	}
-    }
-
-  subseg_new (section_name, (subsegT) exp);
-
-  segment_info[now_seg].scnhdr.s_flags |= flags;
-
-  *section_name_end = c;
-}
-
-
-static void
-obj_coff_text (ignore)
-     int ignore;
-{
-  subseg_new (".text", get_absolute_expression ());
-}
-
-
-static void
-obj_coff_data (ignore)
-     int ignore;
-{
-  if (flagseen['R'])
-    subseg_new (".text", get_absolute_expression () + 1000);
-  else
-    subseg_new (".data", get_absolute_expression ());
-}
-
-static void
-obj_coff_bss (ignore)
-     int ignore;
-{
-  if (*input_line_pointer == '\n')	/* .bss 		*/
-    subseg_new(".bss", get_absolute_expression());
-  else					/* .bss id,expr		*/
-    obj_coff_lcomm(0);
-}
-
-static void
-obj_coff_ident (ignore)
-     int ignore;
-{
-  segT current_seg = now_seg;		/* save current seg	*/
-  subsegT current_subseg = now_subseg;
-  subseg_new (".comment", 0);		/* .comment seg		*/
-  stringer (1);				/* read string		*/
-  subseg_set (current_seg, current_subseg);	/* restore current seg	*/
-}
-
-void
-c_symbol_merge (debug, normal)
-     symbolS *debug;
-     symbolS *normal;
-{
-  S_SET_DATA_TYPE (normal, S_GET_DATA_TYPE (debug));
-  S_SET_STORAGE_CLASS (normal, S_GET_STORAGE_CLASS (debug));
-
-  if (S_GET_NUMBER_AUXILIARY (debug) > S_GET_NUMBER_AUXILIARY (normal))
-    {
-      S_SET_NUMBER_AUXILIARY (normal, S_GET_NUMBER_AUXILIARY (debug));
-    }				/* take the most we have */
-
-  if (S_GET_NUMBER_AUXILIARY (debug) > 0)
-    {
-      memcpy ((char *) &normal->sy_symbol.ost_auxent[0],
-	      (char *) &debug->sy_symbol.ost_auxent[0],
-	      (unsigned int) (S_GET_NUMBER_AUXILIARY (debug) * AUXESZ));
-    }				/* Move all the auxiliary information */
-
-  /* Move the debug flags. */
-  SF_SET_DEBUG_FIELD (normal, SF_GET_DEBUG_FIELD (debug));
-}				/* c_symbol_merge() */
-
-static int
-c_line_new (symbol, paddr, line_number, frag)
-     symbolS * symbol;
-     long paddr;
-     unsigned short line_number;
-     fragS * frag;
-{
-  struct lineno_list *new_line =
-  (struct lineno_list *) xmalloc (sizeof (struct lineno_list));
-
-  segment_info_type *s = segment_info + now_seg;
-  new_line->line.l_lnno = line_number;
-
-  if (line_number == 0)
-    {
-      last_line_symbol = symbol;
-      new_line->line.l_addr.l_symndx = (long) symbol;
-    }
-  else
-    {
-      new_line->line.l_addr.l_paddr = paddr;
-    }
-
-  new_line->frag = (char *) frag;
-  new_line->next = (struct lineno_list *) NULL;
-
-
-  if (s->lineno_list_head == (struct lineno_list *) NULL)
-    {
-      s->lineno_list_head = new_line;
-    }
-  else
-    {
-      s->lineno_list_tail->next = new_line;
-    }
-  s->lineno_list_tail = new_line;
-  return LINESZ * s->scnhdr.s_nlnno++;
-}
-
-void
-c_dot_file_symbol (filename)
-     char *filename;
-{
-  symbolS *symbolP;
-
-  symbolP = symbol_new (".file",
-			SEG_DEBUG,
-			0,
-			&zero_address_frag);
-
-  S_SET_STORAGE_CLASS (symbolP, C_FILE);
-  S_SET_NUMBER_AUXILIARY (symbolP, 1);
-  SA_SET_FILE_FNAME (symbolP, filename);
-#ifndef NO_LISTING
-  {
-    extern int listing;
-    if (listing)
-      {
-	listing_source_file (filename);
-      }
-
-  }
-
-#endif
-  SF_SET_DEBUG (symbolP);
-  S_SET_VALUE (symbolP, (valueT) previous_file_symbol);
-
-  previous_file_symbol = symbolP;
-
-  /* Make sure that the symbol is first on the symbol chain */
-  if (symbol_rootP != symbolP)
-    {
-      if (symbolP == symbol_lastP)
-	{
-	  symbol_lastP = symbol_lastP->sy_previous;
-	}			/* if it was the last thing on the list */
-
-      symbol_remove (symbolP, &symbol_rootP, &symbol_lastP);
-      symbol_insert (symbolP, symbol_rootP, &symbol_rootP, &symbol_lastP);
-      symbol_rootP = symbolP;
-    }				/* if not first on the list */
-
-}				/* c_dot_file_symbol() */
-
-/*
- * Build a 'section static' symbol.
- */
-
-symbolS *
-c_section_symbol (name, idx)
-     char *name;
-     int idx;
-{
-  symbolS *symbolP;
-
-  symbolP = symbol_new (name, idx,
-			0,
-			&zero_address_frag);
-
-  S_SET_STORAGE_CLASS (symbolP, C_STAT);
-  S_SET_NUMBER_AUXILIARY (symbolP, 1);
-
-  SF_SET_STATICS (symbolP);
-
-  return symbolP;
-}				/* c_section_symbol() */
-
-static void
-w_symbols (abfd, where, symbol_rootP)
-     bfd * abfd;
-     char *where;
-     symbolS * symbol_rootP;
-{
-  symbolS *symbolP;
-  unsigned int i;
-
-  /* First fill in those values we have only just worked out */
-  for (i = SEG_E0; i < SEG_E9; i++)
-    {
-      symbolP = segment_info[i].dot;
-      if (symbolP)
-	{
-
-	  SA_SET_SCN_SCNLEN (symbolP, segment_info[i].scnhdr.s_size);
-	  SA_SET_SCN_NRELOC (symbolP, segment_info[i].scnhdr.s_nreloc);
-	  SA_SET_SCN_NLINNO (symbolP, segment_info[i].scnhdr.s_nlnno);
-
-	}
-    }
-
-  /*
-     * 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;
-
-      tc_coff_symbol_emit_hook (symbolP);
-
-      temp = S_GET_NAME (symbolP);
-      if (SF_GET_STRING (symbolP))
-	{
-	  S_SET_OFFSET (symbolP, symbolP->sy_name_offset);
-	  S_SET_ZEROES (symbolP, 0);
-	}
-      else
-	{
-	  memset (symbolP->sy_symbol.ost_entry.n_name, 0, SYMNMLEN);
-	  strncpy (symbolP->sy_symbol.ost_entry.n_name, temp, SYMNMLEN);
-	}
-      where = symbol_to_chars (abfd, where, symbolP);
-      S_SET_NAME (symbolP, temp);
-    }
-
-}				/* w_symbols() */
-
-static void
-obj_coff_lcomm (ignore)
-     int ignore;
-{
-  s_lcomm(0);
-  return;
-#if 0
-  char *name;
-  char c;
-  int temp;
-  char *p;
-
-  symbolS *symbolP;
-
-  name = input_line_pointer;
-
-  c = get_symbol_end ();
-  p = input_line_pointer;
-  *p = c;
-  SKIP_WHITESPACE ();
-  if (*input_line_pointer != ',')
-    {
-      as_bad ("Expected comma after name");
-      ignore_rest_of_line ();
-      return;
-    }
-  if (*input_line_pointer == '\n')
-    {
-      as_bad ("Missing size expression");
-      return;
-    }
-  input_line_pointer++;
-  if ((temp = get_absolute_expression ()) < 0)
-    {
-      as_warn ("lcomm length (%d.) <0! Ignored.", temp);
-      ignore_rest_of_line ();
-      return;
-    }
-  *p = 0;
-
-  symbolP = symbol_find_or_make(name);
-
-  if (S_GET_SEGMENT(symbolP) == SEG_UNKNOWN &&
-      S_GET_VALUE(symbolP) == 0)
-    {
-      if (! need_pass_2)
-	{
-	  char *p;
-	  segT current_seg = now_seg; 	/* save current seg     */
-	  subsegT current_subseg = now_subseg;
-
-	  subseg_set (SEG_E2, 1);
-	  symbolP->sy_frag = frag_now;
-	  p = frag_var(rs_org, 1, 1, (relax_substateT)0, symbolP,
-		       temp, (char *)0);
-	  *p = 0;
-	  subseg_set (current_seg, current_subseg); /* restore current seg */
-	  S_SET_SEGMENT(symbolP, SEG_E2);
-	  S_SET_STORAGE_CLASS(symbolP, C_STAT);
-	}
-    }
-  else
-    as_bad("Symbol %s already defined", name);
-
-  demand_empty_rest_of_line();
-#endif
-}
-
-static void
-fixup_mdeps (frags, h, this_segment)
-     fragS * frags;
-     object_headers * h;
-     segT this_segment;
-{
-  subseg_change (this_segment, 0);
-  while (frags)
-    {
-      switch (frags->fr_type)
-	{
-	case rs_align:
-	case rs_org:
-	  frags->fr_type = rs_fill;
-	  frags->fr_offset =
-	    (frags->fr_next->fr_address - frags->fr_address - frags->fr_fix);
-	  break;
-	case rs_machine_dependent:
-	  md_convert_frag (h, frags);
-	  frag_wane (frags);
-	  break;
-	default:
-	  ;
-	}
-      frags = frags->fr_next;
-    }
-}
-
-#if 1
-static void
-fixup_segment (segP, this_segment_type)
-     segment_info_type * segP;
-     segT this_segment_type;
-{
-  register fixS * fixP;
-  register symbolS *add_symbolP;
-  register symbolS *sub_symbolP;
-  register long add_number;
-  register int size;
-  register char *place;
-  register long where;
-  register char pcrel;
-  register fragS *fragP;
-  register segT add_symbol_segment = absolute_section;
-
-
-  for (fixP = segP->fix_root; fixP; fixP = fixP->fx_next)
-    {
-      fragP = fixP->fx_frag;
-      know (fragP);
-      where = fixP->fx_where;
-      place = fragP->fr_literal + where;
-      size = fixP->fx_size;
-      add_symbolP = fixP->fx_addsy;
-#ifdef TC_I960
-      if (fixP->fx_tcbit && TC_S_IS_CALLNAME (add_symbolP))
-	{
-	  /* Relocation should be done via the associated 'bal' entry
-	     point symbol. */
-
-	  if (!TC_S_IS_BALNAME (tc_get_bal_of_call (add_symbolP)))
-	    {
-	      as_bad ("No 'bal' entry point for leafproc %s",
-		      S_GET_NAME (add_symbolP));
-	      continue;
-	    }
-	  fixP->fx_addsy = add_symbolP = tc_get_bal_of_call (add_symbolP);
-	}
-#endif
-      sub_symbolP = fixP->fx_subsy;
-      add_number = fixP->fx_offset;
-      pcrel = fixP->fx_pcrel;
-
-      if (add_symbolP)
-	{
-	  add_symbol_segment = S_GET_SEGMENT (add_symbolP);
-	}			/* if there is an addend */
-
-      if (sub_symbolP)
-	{
-	  if (!add_symbolP)
-	    {
-	      /* Its just -sym */
-	      if (S_GET_SEGMENT (sub_symbolP) != absolute_section)
-		{
-		  as_bad ("Negative of non-absolute symbol %s", S_GET_NAME (sub_symbolP));
-		}		/* not absolute */
-
-	      add_number -= S_GET_VALUE (sub_symbolP);
-	      fixP->fx_subsy = 0;
-
-	      /* if sub_symbol is in the same segment that add_symbol
-			   and add_symbol is either in DATA, TEXT, BSS or ABSOLUTE */
-	    }
-	  else if ((S_GET_SEGMENT (sub_symbolP) == add_symbol_segment)
-		   && (SEG_NORMAL (add_symbol_segment)
-		       || (add_symbol_segment == absolute_section)))
-	    {
-	      /* Difference of 2 symbols from same segment.  Can't
-		 make difference of 2 undefineds: 'value' means
-		 something different for N_UNDF. */
-#ifdef TC_I960
-	      /* Makes no sense to use the difference of 2 arbitrary symbols
-	         as the target of a call instruction.  */
-	      if (fixP->fx_tcbit)
-		{
-		  as_bad ("callj to difference of 2 symbols");
-		}
-#endif /* TC_I960 */
-	      add_number += S_GET_VALUE (add_symbolP) -
-		S_GET_VALUE (sub_symbolP);
-
-	      add_symbolP = NULL;
-	      fixP->fx_addsy = NULL;
-	      fixP->fx_done = 1;
-	    }
-	  else
-	    {
-	      /* Different segments in subtraction. */
-	      know (!(S_IS_EXTERNAL (sub_symbolP) && (S_GET_SEGMENT (sub_symbolP) == absolute_section)));
-
-	      if ((S_GET_SEGMENT (sub_symbolP) == absolute_section))
-		{
-		  add_number -= S_GET_VALUE (sub_symbolP);
-		}
-#ifdef DIFF_EXPR_OK
-	      else if (!pcrel
-		       && S_GET_SEGMENT (sub_symbolP) == this_segment_type)
-		{
-		  /* Make it pc-relative.  */
-		  add_number += (md_pcrel_from (fixP)
-				 - S_GET_VALUE (sub_symbolP));
-		  pcrel = 1;
-		  fixP->fx_pcrel = 1;
-		  sub_symbolP = 0;
-		  fixP->fx_subsy = 0;
-		}
-#endif
-	      else
-		{
-		  as_bad ("Can't emit reloc {- %s-seg symbol \"%s\"} @ file address %ld.",
-			  segment_name (S_GET_SEGMENT (sub_symbolP)),
-			  S_GET_NAME (sub_symbolP),
-			  (long) (fragP->fr_address + where));
-		}		/* if absolute */
-	    }
-	}			/* if sub_symbolP */
-
-      if (add_symbolP)
-	{
-	  if (add_symbol_segment == this_segment_type && pcrel)
-	    {
-	      /*
-	       * This fixup was made when the symbol's segment was
-	       * SEG_UNKNOWN, but it is now in the local segment.
-	       * So we know how to do the address without relocation.
-	       */
-#ifdef TC_I960
-	      /* reloc_callj() may replace a 'call' with a 'calls' or a 'bal',
-	       * in which cases it modifies *fixP as appropriate.  In the case
-	       * of a 'calls', no further work is required, and *fixP has been
-	       * set up to make the rest of the code below a no-op.
-	       */
-	      reloc_callj (fixP);
-#endif /* TC_I960 */
-
-	      add_number += S_GET_VALUE (add_symbolP);
-	      add_number -= md_pcrel_from (fixP);
-#if defined (TC_I386) || defined (TE_LYNX)
-	      /* On the 386 we must adjust by the segment
-		 vaddr as well.  Ian Taylor.  */
-	      add_number -= segP->scnhdr.s_vaddr;
-#endif
-	      pcrel = 0;	/* Lie. Don't want further pcrel processing. */
-	      fixP->fx_addsy = NULL;
-	      fixP->fx_done = 1;
-	    }
-	  else
-	    {
-	      switch (add_symbol_segment)
-		{
-		case absolute_section:
-#ifdef TC_I960
-		  reloc_callj (fixP);	/* See comment about reloc_callj() above*/
-#endif /* TC_I960 */
-		  add_number += S_GET_VALUE (add_symbolP);
-		  fixP->fx_addsy = NULL;
-		  fixP->fx_done = 1;
-		  add_symbolP = NULL;
-		  break;
-		default:
-
-#ifdef TC_A29K
-		  /* This really should be handled in the linker, but
-		     backward compatibility forbids.  */
-		  add_number += S_GET_VALUE (add_symbolP);
-#else
-		  add_number += S_GET_VALUE (add_symbolP) +
-		    segment_info[S_GET_SEGMENT (add_symbolP)].scnhdr.s_paddr;
-#endif
-		  break;
-
-		case SEG_UNKNOWN:
-#ifdef TC_I960
-		  if ((int) fixP->fx_bit_fixP == 13)
-		    {
-		      /* This is a COBR instruction.  They have only a
-		       * 13-bit displacement and are only to be used
-		       * for local branches: flag as error, don't generate
-		       * relocation.
-		       */
-		      as_bad ("can't use COBR format with external label");
-		      fixP->fx_addsy = NULL;
-		      fixP->fx_done = 1;
-		      continue;
-		    }		/* COBR */
-#endif /* TC_I960 */
-#if defined (TC_I386) || defined (TE_LYNX)
-		  /* 386 COFF uses a peculiar format in
-		     which the value of a common symbol is
-		     stored in the .text segment (I've
-		     checked this on SVR3.2 and SCO 3.2.2)
-		     Ian Taylor <ian@cygnus.com>.  */
-		  if (S_IS_COMMON (add_symbolP))
-		    add_number += S_GET_VALUE (add_symbolP);
-#endif
-		  break;
-
-
-		}		/* switch on symbol seg */
-	    }			/* if not in local seg */
-	}			/* if there was a + symbol */
-
-      if (pcrel)
-	{
-#ifndef TC_M88K
-	  /* This adjustment is not correct on the m88k, for which the
-	     linker does all the computation.  */
-	  add_number -= md_pcrel_from (fixP);
-#endif
-	  if (add_symbolP == 0)
-	    {
-	      fixP->fx_addsy = &abs_symbol;
-	    }			/* if there's an add_symbol */
-#if defined (TC_I386) || defined (TE_LYNX)
-	  /* On the 386 we must adjust by the segment vaddr
-	     as well.  Ian Taylor.  */
-	  add_number -= segP->scnhdr.s_vaddr;
-#endif
-	}			/* if pcrel */
-
-      if (!fixP->fx_bit_fixP)
-	{
-#ifndef TC_M88K
-	  /* The m88k uses the offset field of the reloc to get around
-	     this problem.  */
-	  if ((size == 1 &&
-	  (add_number & ~0xFF) && ((add_number & ~0xFF) != (-1 & ~0xFF))) ||
-	      (size == 2 &&
-	       (add_number & ~0xFFFF) && ((add_number & ~0xFFFF) != (-1 & ~0xFFFF))))
-	    {
-	      as_bad ("Value of %ld too large for field of %d bytes at 0x%lx",
-		      (long) add_number, size,
-		      (unsigned long) (fragP->fr_address + where));
-	    }			/* generic error checking */
-#endif
-#ifdef WARN_SIGNED_OVERFLOW_WORD
-	  /* Warn if a .word value is too large when treated as
-	     a signed number.  We already know it is not too
-	     negative.  This is to catch over-large switches
-	     generated by gcc on the 68k.  */
-	  if (!flagseen['J']
-	      && size == 2
-	      && add_number > 0x7fff)
-	    as_bad ("Signed .word overflow; switch may be too large; %ld at 0x%lx",
-		    (long) add_number,
-		    (unsigned long) (fragP->fr_address + where));
-#endif
-	}			/* not a bit fix */
-      /* once this fix has been applied, we don't have to output anything
-	   nothing more need be done -*/
-      md_apply_fix (fixP, add_number);
-    }				/* For each fixS in this segment. */
-}				/* fixup_segment() */
-
-#endif
-
-/* The first entry in a .stab section is special.  */
-
-void
-obj_coff_init_stab_section (seg)
-     segT seg;
-{
-  char *file;
-  char *p;
-  char *stabstr_name;
-  unsigned int stroff;
-
-  /* Make space for this first symbol. */
-  p = frag_more (12);
-  /* Zero it out. */
-  memset (p, 0, 12);
-  as_where (&file, (unsigned int *) NULL);
-  stabstr_name = (char *) alloca (strlen (segment_info[seg].scnhdr.s_name) + 4);
-  strcpy (stabstr_name, segment_info[seg].scnhdr.s_name);
-  strcat (stabstr_name, "str");
-  stroff = get_stab_string_offset (file, stabstr_name);
-  know (stroff == 1);
-  md_number_to_chars (p, stroff, 4);
-}
-
-/* Fill in the counts in the first entry in a .stab section.  */
-
-static void
-adjust_stab_section(abfd, seg)
-     bfd *abfd;
-     segT seg;
-{
-  segT stabstrseg = SEG_UNKNOWN;
-  char *secname, *name, *name2;
-  char *p = NULL;
-  int i, strsz = 0, nsyms;
-  fragS *frag = segment_info[seg].frchainP->frch_root;
-
-  /* Look for the associated string table section. */
-
-  secname = segment_info[seg].scnhdr.s_name;
-  name = (char *) alloca (strlen (secname) + 4);
-  strcpy (name, secname);
-  strcat (name, "str");
-
-  for (i = SEG_E0; i < SEG_UNKNOWN; i++)
-    {
-      name2 = segment_info[i].scnhdr.s_name;
-      if (name2 != NULL && strncmp(name2, name, 8) == 0)
-	{
-	  stabstrseg = i;
-	  break;
-	}
-    }
-
-  /* If we found the section, get its size. */
-  if (stabstrseg != SEG_UNKNOWN)
-    strsz = size_section (abfd, stabstrseg);
-
-  nsyms = size_section (abfd, seg) / 12 - 1;
-
-  /* Look for the first frag of sufficient size for the initial stab
-     symbol, and collect a pointer to it. */
-  while (frag && frag->fr_fix < 12)
-    frag = frag->fr_next;
-  assert (frag != 0);
-  p = frag->fr_literal;
-  assert (p != 0);
-
-  /* Write in the number of stab symbols and the size of the string
-     table. */
-  bfd_h_put_16 (abfd, (bfd_vma) nsyms, (bfd_byte *) p + 6);
-  bfd_h_put_32 (abfd, (bfd_vma) strsz, (bfd_byte *) p + 8);
-}
diff --git a/gas/config/obj-coffbfd.h b/gas/config/obj-coffbfd.h
deleted file mode 100644
index c65b5d0..0000000
--- a/gas/config/obj-coffbfd.h
+++ /dev/null
@@ -1,509 +0,0 @@
-/* coff object file format
-   Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
-
-   This file is part of GAS.
-
-   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.  */
-
-#ifndef OBJ_FORMAT_H
-#define OBJ_FORMAT_H
-
-#define OBJ_COFF 1
-
-#define WORKING_DOT_WORD
-#define WARN_SIGNED_OVERFLOW_WORD
-
-/* By default we omit the optional aouthdr.  */
-#define OBJ_COFF_OMIT_OPTIONAL_HEADER
-
-#define BFD_HEADERS
-#define BFD
-
-#include "targ-cpu.h"
-
-#include "bfd.h"
-
-/* This internal_lineno crap is to stop namespace pollution from the
-   bfd internal coff headerfile. */
-
-#define internal_lineno bfd_internal_lineno
-#include "coff/internal.h"
-#undef internal_lineno
-
-#ifdef TC_Z8K
-#include "coff/z8k.h"
-#define TARGET_FORMAT "coff-z8k"
-#endif
-
-#ifdef TC_H8300
-#include "coff/h8300.h"
-#define TARGET_FORMAT "coff-h8300"
-#endif
-
-#ifdef TC_H8500
-#include "coff/h8500.h"
-#define TARGET_FORMAT "coff-h8500"
-#endif
-
-#ifdef TC_SH
-#include "coff/sh.h"
-#define TARGET_FORMAT "coff-sh"
-#endif
-
-#ifdef TC_M88K
-#include "coff/m88k.h"
-#define TARGET_FORMAT "coff-m88kbcs"
-#endif
-
-#ifdef TC_I386
-#include "coff/i386.h"
-#ifndef TARGET_FORMAT
-#define TARGET_FORMAT "coff-i386"
-#endif
-#endif
-
-#ifdef TC_M68K
-#include "coff/m68k.h"
-#ifndef TARGET_FORMAT
-#define TARGET_FORMAT "coff-m68k"
-#endif
-#endif
-
-#ifdef TC_A29K
-#include "coff/a29k.h"
-#define TARGET_FORMAT "coff-a29k-big"
-
-/* Allow translate from aout relocs to coff relocs */
-#define NO_RELOC 20
-#define RELOC_32 1
-#define RELOC_8 2
-#define RELOC_CONST 3
-#define RELOC_CONSTH 4
-#define RELOC_JUMPTARG 5
-#define RELOC_BASE22 6
-#define RELOC_HI22 7
-#define RELOC_LO10 8
-#define RELOC_BASE13 9
-#define RELOC_WDISP22 10
-#define RELOC_WDISP30 11
-#endif
-
-#ifdef TC_I960
-#include "coff/i960.h"
-#define TARGET_FORMAT "coff-Intel-little"
-#endif
-
-
-#ifndef OBJ_COFF_MAX_AUXENTRIES
-#define OBJ_COFF_MAX_AUXENTRIES 1
-#endif /* OBJ_COFF_MAX_AUXENTRIES */
-
-
-extern const segT N_TYPE_seg[];
-
-/* Magic number of paged executable. */
-#define DEFAULT_MAGIC_NUMBER_FOR_OBJECT_FILE	0x8300
-
-
-/* SYMBOL TABLE */
-
-/* targets may also set this */
-#undef SYMBOLS_NEED_BACKPOINTERS
-#define SYMBOLS_NEED_BACKPOINTERS 1
-
-/* Symbol table entry data type */
-
-typedef struct
-{
-  /* Basic symbol */
-  struct internal_syment ost_entry;
-  /* Auxiliary entry. */
-  union internal_auxent ost_auxent[OBJ_COFF_MAX_AUXENTRIES];
-  /* obj_coff internal use only flags */
-  unsigned int ost_flags;
-} obj_symbol_type;
-
-#ifndef DO_NOT_STRIP
-#define DO_NOT_STRIP	0
-#define DO_STRIP	1
-#endif
-/* Symbol table macros and constants */
-
-/* Possible and usefull section number in symbol table
- * The values of TEXT, DATA and BSS may not be portable.
- */
-
-#define C_ABS_SECTION		N_ABS
-#define C_UNDEF_SECTION		N_UNDEF
-#define C_DEBUG_SECTION		N_DEBUG
-#define C_NTV_SECTION		N_TV
-#define C_PTV_SECTION		P_TV
-#define C_REGISTER_SECTION	20
-
-/*
- *  Macros to extract information from a symbol table entry.
- *  This syntaxic indirection allows independence regarding a.out or coff.
- *  The argument (s) of all these macros is a pointer to a symbol table entry.
- */
-
-/* Predicates */
-/* True if the symbol is external */
-#define S_IS_EXTERNAL(s)        ((s)->sy_symbol.ost_entry.n_scnum == C_UNDEF_SECTION)
-/* True if symbol has been defined, ie :
-   section > 0 (DATA, TEXT or BSS)
-   section == 0 and value > 0 (external bss symbol) */
-#define S_IS_DEFINED(s)         ((s)->sy_symbol.ost_entry.n_scnum > C_UNDEF_SECTION || \
-				 ((s)->sy_symbol.ost_entry.n_scnum == C_UNDEF_SECTION && \
-				  S_GET_VALUE (s) > 0))
-/* True if a debug special symbol entry */
-#define S_IS_DEBUG(s)		((s)->sy_symbol.ost_entry.n_scnum == C_DEBUG_SECTION)
-/* True if a symbol is local symbol name */
-/* A symbol name whose name includes ^A is a gas internal pseudo symbol */
-#define S_IS_LOCAL(s) \
-  ((s)->sy_symbol.ost_entry.n_scnum == C_REGISTER_SECTION \
-   || (S_LOCAL_NAME(s) && !flagseen['L']) \
-   || (strchr (S_GET_NAME (s), '\001') != NULL))
-/* True if a symbol is not defined in this file */
-#define S_IS_EXTERN(s)		((s)->sy_symbol.ost_entry.n_scnum == 0 \
-				 && S_GET_VALUE (s) == 0)
-/*
- * True if a symbol can be multiply defined (bss symbols have this def
- * though it is bad practice)
- */
-#define S_IS_COMMON(s)		((s)->sy_symbol.ost_entry.n_scnum == 0 \
-				 && S_GET_VALUE (s) != 0)
-/* True if a symbol name is in the string table, i.e. its length is > 8. */
-#define S_IS_STRING(s)		(strlen(S_GET_NAME(s)) > 8 ? 1 : 0)
-
-/* Accessors */
-/* The name of the symbol */
-#define S_GET_NAME(s)		((char*)(s)->sy_symbol.ost_entry.n_offset)
-/* The pointer to the string table */
-#define S_GET_OFFSET(s)         ((s)->sy_symbol.ost_entry.n_offset)
-/* The zeroes if symbol name is longer than 8 chars */
-#define S_GET_ZEROES(s)		((s)->sy_symbol.ost_entry.n_zeroes)
-/* The numeric value of the segment */
-#define S_GET_SEGMENT(s)   s_get_segment(s)
-/* The data type */
-#define S_GET_DATA_TYPE(s)	((s)->sy_symbol.ost_entry.n_type)
-/* The storage class */
-#define S_GET_STORAGE_CLASS(s)	((s)->sy_symbol.ost_entry.n_sclass)
-/* The number of auxiliary entries */
-#define S_GET_NUMBER_AUXILIARY(s)	((s)->sy_symbol.ost_entry.n_numaux)
-
-/* Modifiers */
-/* Set the name of the symbol */
-#define S_SET_NAME(s,v)		((s)->sy_symbol.ost_entry.n_offset = (unsigned long)(v))
-/* Set the offset of the symbol */
-#define S_SET_OFFSET(s,v)	((s)->sy_symbol.ost_entry.n_offset = (v))
-/* The zeroes if symbol name is longer than 8 chars */
-#define S_SET_ZEROES(s,v)		((s)->sy_symbol.ost_entry.n_zeroes = (v))
-/* The numeric value of the segment */
-#define S_SET_SEGMENT(s,v)	((s)->sy_symbol.ost_entry.n_scnum = SEGMENT_TO_SYMBOL_TYPE(v))
-/* The data type */
-#define S_SET_DATA_TYPE(s,v)	((s)->sy_symbol.ost_entry.n_type = (v))
-/* The storage class */
-#define S_SET_STORAGE_CLASS(s,v)	((s)->sy_symbol.ost_entry.n_sclass = (v))
-/* The number of auxiliary entries */
-#define S_SET_NUMBER_AUXILIARY(s,v)	((s)->sy_symbol.ost_entry.n_numaux = (v))
-
-/* Additional modifiers */
-/* The symbol is external (does not mean undefined) */
-#define S_SET_EXTERNAL(s)       { S_SET_STORAGE_CLASS(s, C_EXT) ; SF_CLEAR_LOCAL(s); }
-
-/* Auxiliary entry macros. SA_ stands for symbol auxiliary */
-/* Omit the tv related fields */
-/* Accessors */
-#define SYM_AUXENT(S)	(&(S)->sy_symbol.ost_auxent[0])
-
-#define SA_GET_SYM_TAGNDX(s)	(SYM_AUXENT (s)->x_sym.x_tagndx.l)
-#define SA_GET_SYM_LNNO(s)	(SYM_AUXENT (s)->x_sym.x_misc.x_lnsz.x_lnno)
-#define SA_GET_SYM_SIZE(s)	(SYM_AUXENT (s)->x_sym.x_misc.x_lnsz.x_size)
-#define SA_GET_SYM_FSIZE(s)	(SYM_AUXENT (s)->x_sym.x_misc.x_fsize)
-#define SA_GET_SYM_LNNOPTR(s)	(SYM_AUXENT (s)->x_sym.x_fcnary.x_fcn.x_lnnoptr)
-#define SA_GET_SYM_ENDNDX(s)	(SYM_AUXENT (s)->x_sym.x_fcnary.x_fcn.x_endndx.l)
-#define SA_GET_SYM_DIMEN(s,i)	(SYM_AUXENT (s)->x_sym.x_fcnary.x_ary.x_dimen[(i)])
-#define SA_GET_FILE_FNAME(s)	(SYM_AUXENT (s)->x_file.x_fname)
-#define SA_GET_SCN_SCNLEN(s)	(SYM_AUXENT (s)->x_scn.x_scnlen)
-#define SA_GET_SCN_NRELOC(s)	(SYM_AUXENT (s)->x_scn.x_nreloc)
-#define SA_GET_SCN_NLINNO(s)	(SYM_AUXENT (s)->x_scn.x_nlinno)
-
-/* Modifiers */
-#define SA_SET_SYM_TAGNDX(s,v)	(SYM_AUXENT (s)->x_sym.x_tagndx.l=(v))
-#define SA_SET_SYM_LNNO(s,v)	(SYM_AUXENT (s)->x_sym.x_misc.x_lnsz.x_lnno=(v))
-#define SA_SET_SYM_SIZE(s,v)	(SYM_AUXENT (s)->x_sym.x_misc.x_lnsz.x_size=(v))
-#define SA_SET_SYM_FSIZE(s,v)	(SYM_AUXENT (s)->x_sym.x_misc.x_fsize=(v))
-#define SA_SET_SYM_LNNOPTR(s,v)	(SYM_AUXENT (s)->x_sym.x_fcnary.x_fcn.x_lnnoptr=(v))
-#define SA_SET_SYM_ENDNDX(s,v)	(SYM_AUXENT (s)->x_sym.x_fcnary.x_fcn.x_endndx.l=(v))
-#define SA_SET_SYM_DIMEN(s,i,v)	(SYM_AUXENT (s)->x_sym.x_fcnary.x_ary.x_dimen[(i)]=(v))
-#define SA_SET_FILE_FNAME(s,v)	strncpy(SYM_AUXENT (s)->x_file.x_fname,(v),FILNMLEN)
-#define SA_SET_SCN_SCNLEN(s,v)	(SYM_AUXENT (s)->x_scn.x_scnlen=(v))
-#define SA_SET_SCN_NRELOC(s,v)	(SYM_AUXENT (s)->x_scn.x_nreloc=(v))
-#define SA_SET_SCN_NLINNO(s,v)	(SYM_AUXENT (s)->x_scn.x_nlinno=(v))
-
-/*
- * Internal use only definitions. SF_ stands for symbol flags.
- *
- * These values can be assigned to sy_symbol.ost_flags field of a symbolS.
- *
- * You'll break i960 if you shift the SYSPROC bits anywhere else.  for
- * more on the balname/callname hack, see tc-i960.h.  b.out is done
- * differently.
- */
-
-#define SF_I960_MASK	(0x000001ff)	/* Bits 0-8 are used by the i960 port. */
-#define SF_SYSPROC	(0x0000003f)	/* bits 0-5 are used to store the sysproc number */
-#define SF_IS_SYSPROC	(0x00000040)	/* bit 6 marks symbols that are sysprocs */
-#define SF_BALNAME	(0x00000080)	/* bit 7 marks BALNAME symbols */
-#define SF_CALLNAME	(0x00000100)	/* bit 8 marks CALLNAME symbols */
-
-#define SF_NORMAL_MASK	(0x0000ffff)	/* bits 12-15 are general purpose. */
-
-#define SF_STATICS	(0x00001000)	/* Mark the .text & all symbols */
-#define SF_DEFINED	(0x00002000)	/* Symbol is defined in this file */
-#define SF_STRING	(0x00004000)	/* Symbol name length > 8 */
-#define SF_LOCAL	(0x00008000)	/* Symbol must not be emitted */
-
-#define SF_DEBUG_MASK	(0xffff0000)	/* bits 16-31 are debug info */
-
-#define SF_FUNCTION	(0x00010000)	/* The symbol is a function */
-#define SF_PROCESS	(0x00020000)	/* Process symbol before write */
-#define SF_TAGGED	(0x00040000)	/* Is associated with a tag */
-#define SF_TAG		(0x00080000)	/* Is a tag */
-#define SF_DEBUG	(0x00100000)	/* Is in debug or abs section */
-#define SF_GET_SEGMENT	(0x00200000)	/* Get the section of the forward symbol. */
-/* All other bits are unused. */
-
-/* Accessors */
-#define SF_GET(s)		((s)->sy_symbol.ost_flags)
-#define SF_GET_NORMAL_FIELD(s)	(SF_GET (s) & SF_NORMAL_MASK)
-#define SF_GET_DEBUG_FIELD(s)	(SF_GET (s) & SF_DEBUG_MASK)
-#define SF_GET_FILE(s)		(SF_GET (s) & SF_FILE)
-#define SF_GET_STATICS(s)	(SF_GET (s) & SF_STATICS)
-#define SF_GET_DEFINED(s)	(SF_GET (s) & SF_DEFINED)
-#define SF_GET_STRING(s)	(SF_GET (s) & SF_STRING)
-#define SF_GET_LOCAL(s)		(SF_GET (s) & SF_LOCAL)
-#define SF_GET_FUNCTION(s)      (SF_GET (s) & SF_FUNCTION)
-#define SF_GET_PROCESS(s)	(SF_GET (s) & SF_PROCESS)
-#define SF_GET_DEBUG(s)		(SF_GET (s) & SF_DEBUG)
-#define SF_GET_TAGGED(s)	(SF_GET (s) & SF_TAGGED)
-#define SF_GET_TAG(s)		(SF_GET (s) & SF_TAG)
-#define SF_GET_GET_SEGMENT(s)	(SF_GET (s) & SF_GET_SEGMENT)
-#define SF_GET_I960(s)		(SF_GET (s) & SF_I960_MASK)	/* used by i960 */
-#define SF_GET_BALNAME(s)	(SF_GET (s) & SF_BALNAME)	/* used by i960 */
-#define SF_GET_CALLNAME(s)	(SF_GET (s) & SF_CALLNAME)	/* used by i960 */
-#define SF_GET_IS_SYSPROC(s)	(SF_GET (s) & SF_IS_SYSPROC)	/* used by i960 */
-#define SF_GET_SYSPROC(s)	(SF_GET (s) & SF_SYSPROC)	/* used by i960 */
-
-/* Modifiers */
-#define SF_SET(s,v)		(SF_GET (s) = (v))
-#define SF_SET_NORMAL_FIELD(s,v)(SF_GET (s) |= ((v) & SF_NORMAL_MASK))
-#define SF_SET_DEBUG_FIELD(s,v)	(SF_GET (s) |= ((v) & SF_DEBUG_MASK))
-#define SF_SET_FILE(s)		(SF_GET (s) |= SF_FILE)
-#define SF_SET_STATICS(s)	(SF_GET (s) |= SF_STATICS)
-#define SF_SET_DEFINED(s)	(SF_GET (s) |= SF_DEFINED)
-#define SF_SET_STRING(s)	(SF_GET (s) |= SF_STRING)
-#define SF_SET_LOCAL(s)		(SF_GET (s) |= SF_LOCAL)
-#define SF_CLEAR_LOCAL(s)	(SF_GET (s) &= ~SF_LOCAL)
-#define SF_SET_FUNCTION(s)      (SF_GET (s) |= SF_FUNCTION)
-#define SF_SET_PROCESS(s)	(SF_GET (s) |= SF_PROCESS)
-#define SF_SET_DEBUG(s)		(SF_GET (s) |= SF_DEBUG)
-#define SF_SET_TAGGED(s)	(SF_GET (s) |= SF_TAGGED)
-#define SF_SET_TAG(s)		(SF_GET (s) |= SF_TAG)
-#define SF_SET_GET_SEGMENT(s)	(SF_GET (s) |= SF_GET_SEGMENT)
-#define SF_SET_I960(s,v)	(SF_GET (s) |= ((v) & SF_I960_MASK))	/* used by i960 */
-#define SF_SET_BALNAME(s)	(SF_GET (s) |= SF_BALNAME)	/* used by i960 */
-#define SF_SET_CALLNAME(s)	(SF_GET (s) |= SF_CALLNAME)	/* used by i960 */
-#define SF_SET_IS_SYSPROC(s)	(SF_GET (s) |= SF_IS_SYSPROC)	/* used by i960 */
-#define SF_SET_SYSPROC(s,v)	(SF_GET (s) |= ((v) & SF_SYSPROC))	/* used by i960 */
-
-/* File header macro and type definition */
-
-/*
- * File position calculators. Beware to use them when all the
- * appropriate fields are set in the header.
- */
-
-#ifdef OBJ_COFF_OMIT_OPTIONAL_HEADER
-#define OBJ_COFF_AOUTHDRSZ (0)
-#else
-#define OBJ_COFF_AOUTHDRSZ (AOUTHDRSZ)
-#endif /* OBJ_COFF_OMIT_OPTIONAL_HEADER */
-
-#define H_GET_FILE_SIZE(h) \
-    (long)(FILHSZ + OBJ_COFF_AOUTHDRSZ + \
-	   H_GET_NUMBER_OF_SECTIONS(h) * SCNHSZ + \
-	   H_GET_TEXT_SIZE(h) + H_GET_DATA_SIZE(h) + \
-	   H_GET_RELOCATION_SIZE(h) + H_GET_LINENO_SIZE(h) + \
-	   H_GET_SYMBOL_TABLE_SIZE(h) + \
-	   (h)->string_table_size)
-#define H_GET_TEXT_FILE_OFFSET(h) \
-    (long)(FILHSZ + OBJ_COFF_AOUTHDRSZ + \
-	   H_GET_NUMBER_OF_SECTIONS(h) * SCNHSZ)
-#define H_GET_DATA_FILE_OFFSET(h) \
-    (long)(FILHSZ + OBJ_COFF_AOUTHDRSZ + \
-	   H_GET_NUMBER_OF_SECTIONS(h) * SCNHSZ + \
-	   H_GET_TEXT_SIZE(h))
-#define H_GET_BSS_FILE_OFFSET(h) 0
-#define H_GET_RELOCATION_FILE_OFFSET(h) \
-    (long)(FILHSZ + OBJ_COFF_AOUTHDRSZ + \
-	   H_GET_NUMBER_OF_SECTIONS(h) * SCNHSZ + \
-	   H_GET_TEXT_SIZE(h) + H_GET_DATA_SIZE(h))
-#define H_GET_LINENO_FILE_OFFSET(h) \
-    (long)(FILHSZ + OBJ_COFF_AOUTHDRSZ + \
-	   H_GET_NUMBER_OF_SECTIONS(h) * SCNHSZ + \
-	   H_GET_TEXT_SIZE(h) + H_GET_DATA_SIZE(h) + \
-	   H_GET_RELOCATION_SIZE(h))
-#define H_GET_SYMBOL_TABLE_FILE_OFFSET(h) \
-    (long)(FILHSZ + OBJ_COFF_AOUTHDRSZ + \
-	   H_GET_NUMBER_OF_SECTIONS(h) * SCNHSZ + \
-	   H_GET_TEXT_SIZE(h) + H_GET_DATA_SIZE(h) + \
-	   H_GET_RELOCATION_SIZE(h) + H_GET_LINENO_SIZE(h))
-
-/* Accessors */
-/* aouthdr */
-#define H_GET_MAGIC_NUMBER(h)           ((h)->aouthdr.magic)
-#define H_GET_VERSION_STAMP(h)		((h)->aouthdr.vstamp)
-#define H_GET_TEXT_SIZE(h)              ((h)->aouthdr.tsize)
-#define H_GET_DATA_SIZE(h)              ((h)->aouthdr.dsize)
-#define H_GET_BSS_SIZE(h)               ((h)->aouthdr.bsize)
-#define H_GET_ENTRY_POINT(h)            ((h)->aouthdr.entry)
-#define H_GET_TEXT_START(h)		((h)->aouthdr.text_start)
-#define H_GET_DATA_START(h)		((h)->aouthdr.data_start)
-/* filehdr */
-#define H_GET_FILE_MAGIC_NUMBER(h)	((h)->filehdr.f_magic)
-#define H_GET_NUMBER_OF_SECTIONS(h)	((h)->filehdr.f_nscns)
-#define H_GET_TIME_STAMP(h)		((h)->filehdr.f_timdat)
-#define H_GET_SYMBOL_TABLE_POINTER(h)	((h)->filehdr.f_symptr)
-#define H_GET_SYMBOL_COUNT(h)		((h)->filehdr.f_nsyms)
-#define H_GET_SYMBOL_TABLE_SIZE(h)	(H_GET_SYMBOL_COUNT(h) * SYMESZ)
-#define H_GET_SIZEOF_OPTIONAL_HEADER(h)	((h)->filehdr.f_opthdr)
-#define H_GET_FLAGS(h)			((h)->filehdr.f_flags)
-/* Extra fields to achieve bsd a.out compatibility and for convenience */
-#define H_GET_RELOCATION_SIZE(h)   	((h)->relocation_size)
-#define H_GET_STRING_SIZE(h)            ((h)->string_table_size)
-#define H_GET_LINENO_SIZE(h)            ((h)->lineno_size)
-
-#ifndef OBJ_COFF_OMIT_OPTIONAL_HEADER
-#define H_GET_HEADER_SIZE(h)		(sizeof(FILHDR) \
-					 + sizeof(AOUTHDR)\
-					 + (H_GET_NUMBER_OF_SECTIONS(h) * SCNHSZ))
-#else /* OBJ_COFF_OMIT_OPTIONAL_HEADER */
-#define H_GET_HEADER_SIZE(h)		(sizeof(FILHDR) \
-					 + (H_GET_NUMBER_OF_SECTIONS(h) * SCNHSZ))
-#endif /* OBJ_COFF_OMIT_OPTIONAL_HEADER */
-
-#define H_GET_TEXT_RELOCATION_SIZE(h)	(text_section_header.s_nreloc * RELSZ)
-#define H_GET_DATA_RELOCATION_SIZE(h)	(data_section_header.s_nreloc * RELSZ)
-
-/* Modifiers */
-/* aouthdr */
-#define H_SET_MAGIC_NUMBER(h,v)         ((h)->aouthdr.magic = (v))
-#define H_SET_VERSION_STAMP(h,v)	((h)->aouthdr.vstamp = (v))
-#define H_SET_TEXT_SIZE(h,v)            ((h)->aouthdr.tsize = (v))
-#define H_SET_DATA_SIZE(h,v)            ((h)->aouthdr.dsize = (v))
-#define H_SET_BSS_SIZE(h,v)             ((h)->aouthdr.bsize = (v))
-#define H_SET_ENTRY_POINT(h,v)          ((h)->aouthdr.entry = (v))
-#define H_SET_TEXT_START(h,v)		((h)->aouthdr.text_start = (v))
-#define H_SET_DATA_START(h,v)		((h)->aouthdr.data_start = (v))
-/* filehdr */
-#define H_SET_FILE_MAGIC_NUMBER(h,v)	((h)->filehdr.f_magic = (v))
-#define H_SET_NUMBER_OF_SECTIONS(h,v)	((h)->filehdr.f_nscns = (v))
-#define H_SET_TIME_STAMP(h,v)		((h)->filehdr.f_timdat = (v))
-#define H_SET_SYMBOL_TABLE_POINTER(h,v)	((h)->filehdr.f_symptr = (v))
-#define H_SET_SYMBOL_TABLE_SIZE(h,v)    ((h)->filehdr.f_nsyms = (v))
-#define H_SET_SIZEOF_OPTIONAL_HEADER(h,v) ((h)->filehdr.f_opthdr = (v))
-#define H_SET_FLAGS(h,v)		((h)->filehdr.f_flags = (v))
-/* Extra fields to achieve bsd a.out compatibility and for convinience */
-#define H_SET_RELOCATION_SIZE(h,t,d) 	((h)->relocation_size = (t)+(d))
-#define H_SET_STRING_SIZE(h,v)          ((h)->string_table_size = (v))
-#define H_SET_LINENO_SIZE(h,v)          ((h)->lineno_size = (v))
-
-/* Segment flipping */
-
-typedef struct
-{
-  struct internal_aouthdr aouthdr;	/* a.out header */
-  struct internal_filehdr filehdr;	/* File header, not machine dep. */
-  long string_table_size;	/* names + '\0' + sizeof(int) */
-  long relocation_size;	/* Cumulated size of relocation
-			   information for all sections in
-			   bytes. */
-  long lineno_size;		/* Size of the line number information
-				   table in bytes */
-} object_headers;
-
-
-
-struct lineno_list
-{
-  struct bfd_internal_lineno line;
-  char *frag;			/* Frag to which the line number is related */
-  struct lineno_list *next;	/* Forward chain pointer */
-};
-
-
-
-
-#define obj_segment_name(i) (segment_info[(int) (i)].scnhdr.s_name)
-
-#define obj_add_segment(s) obj_coff_add_segment (s)
-
-extern segT obj_coff_add_segment PARAMS ((const char *));
-
-extern void obj_coff_section PARAMS ((int));
-
-extern void c_dot_file_symbol PARAMS ((char *filename));
-extern void obj_extra_stuff PARAMS ((object_headers * headers));
-
-extern segT s_get_segment PARAMS ((struct symbol * ptr));
-
-extern void c_section_header PARAMS ((struct internal_scnhdr * header,
-				      char *name,
-				      long core_address,
-				      long size,
-				      long data_ptr,
-				      long reloc_ptr,
-				      long lineno_ptr,
-				      long reloc_number,
-				      long lineno_number,
-				      long alignment));
-
-
-/* sanity check */
-
-#ifdef TC_I960
-#ifndef C_LEAFSTAT
-hey ! Where is the C_LEAFSTAT definition ? i960 - coff support is depending on it.
-#endif /* no C_LEAFSTAT */
-#endif /* TC_I960 */
-extern struct internal_scnhdr data_section_header;
-extern struct internal_scnhdr text_section_header;
-
-/* Forward the segment of a forwarded symbol.  */
-#define obj_frob_forward_symbol(symp) \
-  (SF_GET_GET_SEGMENT (symp) \
-   ? (S_SET_SEGMENT (symp, S_GET_SEGMENT (symp->sy_value.X_add_symbol)), 0) \
-   : 0)
-
-/* Stabs in a coff file go into their own section.  */
-#define SEPARATE_STAB_SECTIONS
-
-/* We need 12 bytes at the start of the section to hold some initial
-   information.  */
-extern void obj_coff_init_stab_section PARAMS ((segT));
-#define INIT_STAB_SECTION(seg) obj_coff_init_stab_section (seg)
-
-#endif /* OBJ_FORMAT_H */