Lost changelog from previous merges.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index a6f3ae77ff9bb02370c6aa31543962f289aefc13..809204f8f89ddb278c6feb49fb91bb3a249909bd 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -30,6 +30,17 @@
        * configure: Rebuilt.
        * config/tc-i386.c: Add support for old FreeBSD a.out hosts.
 
+2001-02-14  Philip Blundell  <pb@futuretv.com>
+
+       From 2001-02-06  H.J. Lu  <hjl@gnu.org>
+       * config/tc-ia64.h (TC_RELOC_RTSYM_LOC_FIXUP): Do fixup if
+       there is no relocation.
+       
+       From 2001-02-06  H.J. Lu  <hjl@gnu.org>
+       * config/tc-ia64.h (TC_RELOC_RTSYM_LOC_FIXUP): New. Defined.
+       * config/tc-ia64.c (md_parse_option): Only accept the valid
+       ia64 options on "-axxx".
+
 2001-02-13  Alan Modra  <alan@linuxcare.com.au>
 
        * expr.c (operator): Don't bump input_line_pointer for two char