* read.c (s_app_file): If obj_app_file is defined, call it with string as argument.

Don't call c_dot_file_symbol or elf_file_symbol.
* config/obj-coff.h (obj_app_file): Define as c_dot_file_symbol.
* config/obj-elf.h (obj_app_file): Define as elf_file_symbol.

* as.h (OUTPUT_FLAVOR): Don't define here.
* config/obj-aout.h (OUTPUT_FLAVOR) [BFD_ASSEMBLER]: Define.
* config/obj-bout.h (OUTPUT_FLAVOR): Define.
* config/obj-coff.h (OUTPUT_FLAVOR) [BFD_ASSEMBLER]: Define.
* config/obj-ecoff.h (OUTPUT_FLAVOR): Define.
* config/obj-elf.h (OUTPUT_FLAVOR): Define.

diff --git a/gas/config/obj-bout.h b/gas/config/obj-bout.h
index ab47deff504b401d322d5b435c2f30239f02f0e2..ea5f60c51a7c4ad5444fdbe72400047e1d252c13 100644 (file)
--- a/gas/config/obj-bout.h
+++ b/gas/config/obj-bout.h
@@ -58,6 +58,8 @@
 
 #define OBJ_BOUT 1
 
+#define OUTPUT_FLAVOR bfd_target_aout_flavour
+
 #include "targ-cpu.h"
 
 /* We want \v. */