* config/obj-coff.h, config/obj-coff.c: Deleted all code used only when

BFD_ASSEMBLER is not defined, and all conditionals relating to such code.  No
such targets remain.

Fixes for stabs-in-coff:
* config/obj-coff.c: Include subsegs.h.
(coff_frob_section): New function.
(obj_coff_init_stab_section): New function.
* config/obj-coff.h (obj_coff_init_stab_section, coff_frob_section): Declare.
(obj_frob_section): New macro; uses coff_frob_section.
(INIT_STAB_SECTION): New macro; uses obj_coff_init_stab_section.

1 files changed, 8 insertions, 393 deletions

diff --git a/gas/config/obj-coff.h b/gas/config/obj-coff.h
index 26244bf..0d5a68c 100644
--- a/gas/config/obj-coff.h
+++ b/gas/config/obj-coff.h
@@ -1,5 +1,5 @@
 /* coff object file format
-   Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1994 Free Software Foundation, Inc.
 
    This file is part of GAS.
 
@@ -21,8 +21,6 @@
 
 #include "targ-cpu.h"
 
-#if defined (BFD_HEADERS) || defined (BFD_ASSEMBLER)
-
 /* This internal_lineno crap is to stop namespace pollution from the
    bfd internal coff headerfile. */
 
@@ -31,9 +29,7 @@
 #include "coff/internal.h"
 #undef internal_lineno
 
-#ifdef BFD_ASSEMBLER
 #include "../bfd/libcoff.h"
-#endif
 
 #ifdef TC_A29K
 #include "coff/a29k.h"
@@ -72,72 +68,6 @@ extern bfd *stdoutput;
 #endif
 #endif
 
-#else /* not BFD_HEADERS */
-
-#include "coff_gnu.h"
-
-#endif /* not BFD_HEADERS */
-
-#ifndef BFD_ASSEMBLER
-/* Define some processor dependent values according to the processor
-   we are on. */
-#ifdef TC_M68K
-
-#define BYTE_ORDERING		F_AR32W	/* See filehdr.h for more info. */
-#ifndef FILE_HEADER_MAGIC
-#define FILE_HEADER_MAGIC	MC68MAGIC	/* ... */
-#endif /* FILE_HEADER_MAGIC */
-
-#endif /* TC_M68K */
-
-#if defined(TC_I386)
-
-#define BYTE_ORDERING		F_AR32WR	/* See filehdr.h for more info. */
-#ifndef FILE_HEADER_MAGIC
-#define FILE_HEADER_MAGIC	I386MAGIC	/* ... */
-#endif /* FILE_HEADER_MAGIC */
-
-#endif /* TC_I386 */
-
-#if defined(TC_I960)
-
-#define BYTE_ORDERING		F_AR32WR	/* See filehdr.h for more info. */
-#ifndef FILE_HEADER_MAGIC
-#define FILE_HEADER_MAGIC	I960ROMAGIC	/* ... */
-#endif /* FILE_HEADER_MAGIC */
-
-#endif /* TC_I960 */
-
-#if defined(TC_A29K)
-
-#define BYTE_ORDERING		F_AR32W	/* big endian. */
-#ifndef FILE_HEADER_MAGIC
-#define FILE_HEADER_MAGIC	SIPFBOMAGIC
-#endif /* FILE_HEADER_MAGIC */
-
-#endif /* TC_A29K */
-
-#ifndef OBJ_COFF_MAX_AUXENTRIES
-#define OBJ_COFF_MAX_AUXENTRIES 1
-#endif /* OBJ_COFF_MAX_AUXENTRIES */
-
-extern const short seg_N_TYPE[];
-extern const segT N_TYPE_seg[];
-
-/* Magic number of paged executable. */
-#define DEFAULT_MAGIC_NUMBER_FOR_OBJECT_FILE	(FILE_HEADER_MAGIC)
-
-#ifndef BFD_HEADERS
-
-/* Add these definitions to have a consistent convention for all the
-   types used in COFF format. */
-#define AOUTHDR			struct aouthdr
-#define AOUTHDRSZ		sizeof(AOUTHDR)
-#endif
-
-#endif /* not BFD_ASSEMBLER */
-
-
 /* SYMBOL TABLE */
 
 /* targets may also set this */
@@ -145,8 +75,6 @@ extern const segT N_TYPE_seg[];
 #define SYMBOLS_NEED_BACKPOINTERS 1
 #endif /* SYMBOLS_NEED_BACKPOINTERS */
 
-#ifdef BFD_ASSEMBLER
-
 /* Alter the field names, for now, until we've fixed up the other
    references to use the new name.  */
 #ifdef TC_I960
@@ -161,123 +89,12 @@ extern const segT N_TYPE_seg[];
 #define OBJ_COFF_MAX_AUXENTRIES 1
 #endif
 
-#else
-
-/* Symbol table entry data type */
-
-typedef struct
-  {
-#ifdef BFD_HEADERS
-    struct internal_syment ost_entry;	/* Basic symbol */
-    union internal_auxent ost_auxent[OBJ_COFF_MAX_AUXENTRIES];	/* Auxiliary entry. */
-#else
-    SYMENT ost_entry;		/* Basic symbol */
-    AUXENT ost_auxent[OBJ_COFF_MAX_AUXENTRIES];	/* Auxiliary entry. */
-#endif
-    unsigned int ost_flags;	/* obj_coff internal use only flags */
-  }
-obj_symbol_type;
-#endif /* ! BFD_ASSEMBLER */
 
-#ifdef BFD_ASSEMBLER
 #define SYM_AUXENT(S)	(&coffsymbol ((S)->bsym)->native[1].u.auxent)
-#else
-#define SYM_AUXENT(S)	(&(S)->sy_symbol.ost_auxent[0])
-#endif
 
 #define DO_NOT_STRIP	0
 #define DO_STRIP	1
 
-#ifndef BFD_ASSEMBLER
-
-/* 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_TEXT_SECTION		((short)1)
-#define C_DATA_SECTION		((short)2)
-#define C_BSS_SECTION		((short)3)
-#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	4
-
-/*
- *  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 begin with ^A is a gas internal pseudo symbol */
-#define S_IS_LOCAL(s)		(S_GET_NAME(s)[0] == '\001' || \
-				 (s)->sy_symbol.ost_entry.n_scnum == C_REGISTER_SECTION || \
-				 (S_LOCAL_NAME(s) && !flagseen['L']))
-/* 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)        (N_TYPE_seg[(s)->sy_symbol.ost_entry.n_scnum+4])
-/* 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); }
-
-#else /* BFD_ASSEMBLER */
-
 extern void obj_coff_section PARAMS ((int));
 
 /* The number of auxiliary entries */
@@ -293,43 +110,22 @@ extern int S_SET_STORAGE_CLASS PARAMS ((struct symbol *, int));
 extern int S_GET_STORAGE_CLASS PARAMS ((struct symbol *));
 extern void SA_SET_SYM_ENDNDX PARAMS ((struct symbol *, struct symbol *));
 
-#endif /* ! BFD_ASSEMBLER */
-
 /* Auxiliary entry macros. SA_ stands for symbol auxiliary */
 /* Omit the tv related fields */
 /* Accessors */
 
-#if defined (BFD_HEADERS) || defined (BFD_ASSEMBLER)
 #define SA_GET_SYM_TAGNDX(s)	(SYM_AUXENT (s)->x_sym.x_tagndx.l)
-#else
-#define SA_GET_SYM_TAGNDX(s)	(SYM_AUXENT (s)->x_sym.x_tagndx)
-#endif
 #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)
-#ifdef BFD_HEADERS
-#define SA_GET_SYM_ENDNDX(s)	(SYM_AUXENT (s)->x_sym.x_fcnary.x_fcn.x_endndx.l)
-#else
 #define SA_GET_SYM_ENDNDX(s)	(SYM_AUXENT (s)->x_sym.x_fcnary.x_fcn.x_endndx)
-#endif
 #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 */
-#ifndef BFD_ASSEMBLER
-#ifdef BFD_HEADERS
-#define SA_SET_SYM_TAGNDX(s,v)	(SYM_AUXENT (s)->x_sym.x_tagndx.l=(v))
-#define SA_SET_SYM_ENDNDX(s,v)	(SYM_AUXENT (s)->x_sym.x_fcnary.x_fcn.x_endndx.l=(v))
-#else
-#define SA_SET_SYM_ENDNDX(s,v)	(SYM_AUXENT (s)->x_sym.x_fcnary.x_fcn.x_endndx=(v))
-#define SA_SET_SYM_TAGNDX(s,v)	(SYM_AUXENT (s)->x_sym.x_tagndx=(v))
-#endif
-#endif
-
 #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))
@@ -374,15 +170,9 @@ extern void SA_SET_SYM_ENDNDX PARAMS ((struct symbol *, struct symbol *));
 /* All other bits are unused. */
 
 /* Accessors */
-#ifdef BFD_ASSEMBLER
 #define SF_GET(s)		((s)->sy_flags)
 #define SF_GET_DEBUG(s)		((s)->bsym->flags & BSF_DEBUGGING)
 #define SF_SET_DEBUG(s)		((s)->bsym->flags |= BSF_DEBUGGING)
-#else
-#define SF_GET(s)		((s)->sy_symbol.ost_flags)
-#define SF_GET_DEBUG(s)		((s)->sy_symbol.ost_flags & SF_DEBUG)
-#define SF_SET_DEBUG(s)		((s)->sy_symbol.ost_flags |= SF_DEBUG)
-#endif
 #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)
@@ -422,161 +212,12 @@ extern void SA_SET_SYM_ENDNDX PARAMS ((struct symbol *, struct symbol *));
 #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 */
-
-#ifndef BFD_ASSEMBLER
-/*
- * 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
-  {
-#ifdef BFD_HEADERS
-    struct internal_aouthdr aouthdr;	/* a.out header */
-    struct internal_filehdr filehdr;	/* File header, not machine dep. */
-#else
-    AOUTHDR aouthdr;		/* a.out header */
-    FILHDR filehdr;		/* File header, not machine dep. */
-#endif
-    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;
-#endif /* ! BFD_ASSEMBLER */
-
 /* --------------  Line number handling ------- */
 extern int text_lineno_number;
 extern int coff_line_base;
 
-#ifndef BFD_ASSEMBLER
-/* line numbering stuff. */
-
-typedef struct internal_lineno
-  {
-#ifdef BFD_HEADERS
-    struct bfd_internal_lineno line;
-#else
-    LINENO line;		/* The lineno structure itself */
-#endif
-    char *frag;			/* Frag to which the line number is related */
-    struct internal_lineno *next;	/* Forward chain pointer */
-  } lineno;
-
-extern lineno *lineno_lastP;
-extern lineno *lineno_rootP;
-#define OBJ_EMIT_LINENO(a, b, c)	obj_emit_lineno((a),(b),(c))
-
-void obj_emit_lineno PARAMS ((char **where, lineno * line, char *file_start));
-
-#endif /* not BFD_ASSEMBLER */
-
-#ifdef BFD_ASSEMBLER
 #define obj_emit_lineno(WHERE,LINE,FILE_START)	abort ()
 extern void coff_add_linesym PARAMS ((struct symbol *));
-#endif
 
 /* stack stuff */
 typedef struct
@@ -587,7 +228,6 @@ typedef struct
     char *data;
     unsigned long pointer;
   }
-
 stack;
 
 char *stack_pop PARAMS ((stack * st));
@@ -598,21 +238,16 @@ stack *stack_init PARAMS ((unsigned long chunk_size,
 void c_dot_file_symbol PARAMS ((char *filename));
 void stack_delete PARAMS ((stack * st));
 
-#ifndef BFD_ASSEMBLER
-void obj_extra_stuff PARAMS ((object_headers * headers));
-#ifndef tc_headers_hook
-void tc_headers_hook PARAMS ((object_headers * headers));
-#endif
-#endif
-
 #ifndef tc_coff_symbol_emit_hook
 void tc_coff_symbol_emit_hook PARAMS ((/* symbolS * */));
 #endif
 
 extern void coff_frob_symbol PARAMS ((struct symbol *, int *));
 extern void coff_frob_file PARAMS ((void));
+extern void coff_frob_section PARAMS ((segT));
 #define obj_frob_symbol(S,P) 	coff_frob_symbol(S,&P)
 #define obj_frob_file()		coff_frob_file ()
+#define obj_frob_section(S)	coff_frob_section (S)
 
 extern struct symbol *coff_last_function;
 
@@ -629,22 +264,6 @@ extern struct symbol *coff_last_function;
    : 0)
 #endif
 
-#ifndef BFD_ASSEMBLER
-#ifdef BFD_HEADERS
-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));
-#else
-void c_section_header PARAMS ((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));
-#endif
-#endif
-
 /* sanity check */
 
 #ifdef TC_I960
@@ -652,16 +271,12 @@ void c_section_header PARAMS ((SCNHDR * header,
 hey ! Where is the C_LEAFSTAT definition ? i960 - coff support is depending on it.
 #endif /* no C_LEAFSTAT */
 #endif /* TC_I960 */
-#ifndef BFD_ASSEMBLER
-#ifdef BFD_HEADERS
-extern struct internal_scnhdr data_section_header;
-extern struct internal_scnhdr text_section_header;
-#else
-extern SCNHDR data_section_header;
-extern SCNHDR text_section_header;
-#endif
-#endif
 
 #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)
+
 
 /* end of obj-coff.h */