* config/tc-cris.c (cris_relax_frag): Fix typo in comment.

	(md_assemble): Don't pass on branches to constants as relaxable.
	Tweak comment.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index e877a41253449790be8ca9273516a6c1284b97cf..6ca492de2866466661086e4304203ccdfe695552 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-26  Hans-Peter Nilsson  <hp@axis.com>
+
+       * config/tc-cris.c (cris_relax_frag): Fix typo in comment.
+       (md_assemble): Don't pass on branches to constants as relaxable.
+       Tweak comment.
+
 2002-11-25  Svein E. Seldal  <Svein.Seldal@solidas.com>
 
        * config/tc-tic4x.c (c4x_operands_match): Bugfix in direct mode

diff --git a/gas/config/tc-cris.c b/gas/config/tc-cris.c
index b263da71767c4c17a427ba9b705ecece7c8e5e68..8f4b63324b3eeac14f3fcf0a0c13761fd5c500d4 100644 (file)
--- a/gas/config/tc-cris.c
+++ b/gas/config/tc-cris.c
@@ -360,7 +360,7 @@ cris_relax_frag (seg, fragP, stretch)
   const relax_typeS *table = TC_GENERIC_RELAX_TABLE;
 
   /* We only have to cope with frags as prepared by
-     md_estimate_size_before_relax.  The dword cases may geet here
+     md_estimate_size_before_relax.  The dword cases may get here
      because of the different reasons that they aren't relaxable.  */
   switch (fragP->fr_subtype)
     {
@@ -924,8 +924,7 @@ md_assemble (str)
            is_undefined = 1;
        }
 
-      if (output_instruction.expr.X_op == O_constant
-         || to_seg == now_seg || is_undefined)
+      if (to_seg == now_seg || is_undefined)
        {
          /* Handle complex expressions.  */
          valueT addvalue
@@ -949,8 +948,7 @@ md_assemble (str)
        {
          /* We have: to_seg != now_seg && to_seg != undefined_section.
             This means it is a branch to a known symbol in another
-            section.  Code in data?  Weird but valid.  Emit a 32-bit
-            branch.  */
+            section, perhaps an absolute address.  Emit a 32-bit branch.  */
          char *cond_jump = frag_more (10);
 
          gen_cond_branch_32 (opcodep, cond_jump, frag_now,