aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2000-10-14 21:05:59 +0000
committerPhil Blundell <philb@gnu.org>2000-10-14 21:05:59 +0000
commit1f48331673826c98f7d8057f88b34f880cec7b1d (patch)
tree7a130dbe1bfb3584deb67e2a4d90fd754e003de7
parentMerge from mainline (diff)
downloadbinutils-gdb-1f48331673826c98f7d8057f88b34f880cec7b1d.tar.gz
binutils-gdb-1f48331673826c98f7d8057f88b34f880cec7b1d.tar.bz2
binutils-gdb-1f48331673826c98f7d8057f88b34f880cec7b1d.zip
Merge from mainline
-rw-r--r--gas/ChangeLog7
-rw-r--r--gas/config/obj-coff.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 590abef5171..d7e5cd51047 100644
--- 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 d7508680336..a0847c4c600 100644
--- 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