* ecoff.c (init_file): Initialize fMerge to 1.

	(add_file): Restore old file merging code, but only merge files if
	fMerge is set.
	(ecoff_directive_loc): Clear fMerge field of current file.
	(ecoff_generate_asm_lineno): Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 75329b204aa3cd23b7f19b3e30b68b5092545091..4df69af8f03a29d0dcf10517a6dd104c542e3674 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+Mon Aug 26 14:38:22 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+       * ecoff.c (init_file): Initialize fMerge to 1.
+       (add_file): Restore old file merging code, but only merge files if
+       fMerge is set.
+       (ecoff_directive_loc): Clear fMerge field of current file.
+       (ecoff_generate_asm_lineno): Likewise.
+
 start-sanitize-d10v
 Fri Aug 23 11:40:47 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
@@ -7,6 +15,9 @@ end-sanitize-d10v
 start-sanitize-v850
 Fri Aug 23 10:41:32 1996  Jeffrey A Law  (law@cygnus.com)
 
+       * config/tc-v850.c (md_assemble): Correct bit masking for
+       hi and lo expressions.
+
        * config/tc-v850.c (md_assemble): Rough cut at demanding
        "ep" or "r30" in sst and sld instructions.
        (md_apply_fix3): Don't abort.  Just warn that we don't