aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog3
-rw-r--r--bfd/linker.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 15b07dd..aa06860 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,8 @@
Fri Apr 5 12:24:13 1996 Ian Lance Taylor <ian@cygnus.com>
+ * linker.c (link_action): For WARN_ROW/warn, use MWARN, not CYCLE,
+ to avoid crashing in bfd_hash_replace.
+
* sysdep.h: Use #ifdef, not #if.
Thu Apr 4 23:32:23 1996 Ian Lance Taylor <ian@cygnus.com>
diff --git a/bfd/linker.c b/bfd/linker.c
index 696d310..b47817d 100644
--- a/bfd/linker.c
+++ b/bfd/linker.c
@@ -1397,7 +1397,7 @@ static const enum link_action link_action[8][8] =
/* DEFW_ROW */ {DEFW, DEFW, DEFW, NOACT, NOACT, NOACT, NOACT, CYCLE },
/* COMMON_ROW */ {COM, COM, COM, CREF, CREF, BIG, CREF, WARNC },
/* INDR_ROW */ {IND, IND, IND, MDEF, IND, CIND, MIND, CYCLE },
- /* WARN_ROW */ {MWARN, WARN, WARN, CWARN, CWARN, WARN, CWARN, CYCLE },
+ /* WARN_ROW */ {MWARN, WARN, WARN, CWARN, CWARN, WARN, CWARN, MWARN },
/* SET_ROW */ {SET, SET, SET, SET, SET, SET, CYCLE, CYCLE }
};