diff --git a/gas/ChangeLog b/gas/ChangeLog
index fb9c9aae158..d7297746afc 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+Fri May  5 14:47:13 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* config/obj-coff.h (SEPARATE_STAB_SECTIONS): Define to 1, not
+	empty.
+	* config/obj-elf.h (SEPARATE_STAB_SECTIONS): Ditto.
+	* config/obj-som.h (SEPARATE_STAB_SECTIONS): Ditto.
+
 Thu May  4 19:26:55 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
 
 	* stabs.c (get_stab_string_offset): Always define.  If
diff --git a/gas/config/obj-coff.h b/gas/config/obj-coff.h
index ae92a02be63..6574b35dbdd 100644
--- a/gas/config/obj-coff.h
+++ b/gas/config/obj-coff.h
@@ -105,6 +105,11 @@
 #define TARGET_FORMAT "coff-m88kbcs"
 #endif
 
+#ifdef TC_W65
+#include "coff/w65.h"
+#define TARGET_FORMAT "coff-w65"
+#endif
+
 /* Targets may also set this.  Also, if BFD_ASSEMBLER is defined, this
    will already have been defined.  */
 #undef SYMBOLS_NEED_BACKPOINTERS
@@ -158,6 +163,8 @@
 
 #include "bfd/libcoff.h"
 
+#define OUTPUT_FLAVOR bfd_target_coff_flavour
+
 /* SYMBOL TABLE */
 
 /* Alter the field names, for now, until we've fixed up the other
@@ -301,6 +308,7 @@ extern void coff_add_linesym PARAMS ((struct symbol *));
 
 
 void c_dot_file_symbol PARAMS ((char *filename));
+#define obj_app_file c_dot_file_symbol
 
 extern void coff_frob_symbol PARAMS ((struct symbol *, int *));
 extern void coff_adjust_symtab PARAMS ((void));
@@ -703,6 +711,7 @@ 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));
+#define obj_app_file c_dot_file_symbol
 extern void obj_extra_stuff PARAMS ((object_headers * headers));
 
 extern segT s_get_segment PARAMS ((struct symbol * ptr));
@@ -741,7 +750,7 @@ extern struct internal_scnhdr text_section_header;
 #endif /* not BFD_ASSEMBLER */
 
 /* Stabs in a coff file go into their own section.  */
-#define SEPARATE_STAB_SECTIONS
+#define SEPARATE_STAB_SECTIONS 1
 
 /* We need 12 bytes at the start of the section to hold some initial
    information.  */
diff --git a/gas/config/obj-elf.h b/gas/config/obj-elf.h
index 4348b6c539d..b86a742c637 100644
--- a/gas/config/obj-elf.h
+++ b/gas/config/obj-elf.h
@@ -84,7 +84,7 @@ extern void obj_elf_version PARAMS ((int));
   S_SET_SIZE ((DEST), S_GET_SIZE (SRC))
 
 /* Stabs go in a separate section.  */
-#define SEPARATE_STAB_SECTIONS
+#define SEPARATE_STAB_SECTIONS 1
 
 /* We need 12 bytes at the start of the section to hold some initial
    information.  */