* config/tc-mmix.c (md_estimate_size_before_relax): Don't consider

	a weak symbol in same section to be within reach.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0227b77f053322ed3971ee3527ba8a05e8045093..a7fa056451900c6a2857da9b07e98271a23c0e38 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-14  Hans-Peter Nilsson  <hp@bitrange.com>
+
+       * config/tc-mmix.c (md_estimate_size_before_relax): Don't consider
+       a weak symbol in same section to be within reach.
+
 2002-03-07  Daniel Jacobowitz  <drow@mvista.com>
 
        * doc/as.texinfo: Wrap @menu in @ifnottex, not @ifinfo.

diff --git a/gas/config/tc-mmix.c b/gas/config/tc-mmix.c
index a8c7e239c1c7cee6d2351385e8b5104edf8e601f..a9087814c8458e890aab13fd413cd68bc485ac67 100644 (file)
--- a/gas/config/tc-mmix.c
+++ b/gas/config/tc-mmix.c
@@ -2172,7 +2172,8 @@ md_estimate_size_before_relax (fragP, segment)
 #define HANDLE_RELAXABLE(state)                                                \
  case ENCODE_RELAX (state, STATE_UNDF):                                        \
    if (fragP->fr_symbol != NULL                                                \
-       && S_GET_SEGMENT (fragP->fr_symbol) == segment)                 \
+       && S_GET_SEGMENT (fragP->fr_symbol) == segment                  \
+       && !S_IS_WEAK (fragP->fr_symbol))                               \
      {                                                                 \
        /* The symbol lies in the same segment - a relaxable case.  */  \
        fragP->fr_subtype                                               \