Merge from mainline

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 590abef5171a69dc776338f2ffff52d1ef03c45d..d7e5cd5104769a5209e6871928ff12d54530d039 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-14  Philip Blundell  <philb@gnu.org>
+
+       From 2000-06-17 Mark Elbrecht <snowball3@bigfoot.com>
+
+       * config/obj-coff.c (obj_coff_weak): Typo fix: Change BFD_ASSEMLER
+       to BFD_ASSEMBLER.
+
 2000-09-08  Philip Blundell  <philb@gnu.org>
 
        * config/tc-arm.c (md_apply_fix3): Correct handling of ADRL when

diff --git a/gas/config/obj-coff.c b/gas/config/obj-coff.c
index d7508680336ae4a52ef92c910cdaea6398ef62a0..a0847c4c600fa5b3e7ec56de0ba804a2fe14b74f 100644 (file)
--- a/gas/config/obj-coff.c
+++ b/gas/config/obj-coff.c
@@ -213,7 +213,7 @@ obj_coff_weak (ignore)
       *input_line_pointer = c;
       SKIP_WHITESPACE ();
 
-#ifdef BFD_ASSEMLER
+#ifdef BFD_ASSEMBLER
       S_SET_WEAK (symbolP);
 #endif