* Makefile.in (stmp-bfd.h): Add an 'if' to mask a harmless

[binutils-gdb.git] / bfd / ChangeLog

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 43eed1f62e6b17d3036469168a55457f6a3e6606..94c8450b683f939896fe33bd49b05dc56b3df747 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,13 @@
+Fri May 13 10:43:51 1994  Bill Cox  (bill@rtl.cygnus.com)
+
+       * Makefile.in (stmp-bfd.h): Add an 'if' to mask a harmless
+         grep error.  Already in progressive/bfd/Makefile.in.
+
+Fri May 13 10:51:21 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+       * config/mipsbelf.mt (SELECT_VECS): Add ecoff_big_vec and
+       ecoff_little_vec since Irix 5 supports ECOFF executables.
+
 Wed May 11 00:31:57 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
        * ecoff.c (ecoff_find_nearest_line): Handle fdr.adr != pdr.adr
@@ -135,7 +145,6 @@ Thu May  5 15:40:47 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
        (mips_fix_hi16_s): Use bfd_is_com_section.
        (mips_howto_table_ext): Call mips_fix_jmp_addr for MIPS_RELOC_JMP.
 
->>>>>>> 1.1152
 Wed May  4 11:09:53 1994  Ian Lance Taylor  (ian@cygnus.com)
 
        Changed m68k-aout to set flags to 0; m68k-sunos still uses 1.