Fix 'the the' typo

[deliverable/binutils-gdb.git] / gas / config / tc-dlx.c

diff --git a/gas/config/tc-dlx.c b/gas/config/tc-dlx.c
index 9722d0db96f6d259b0c590d471ea170c9b31b895..7d45ee1e8a3aeaa6a88f9dc01706eee7af5c6ef1 100644 (file)
--- a/gas/config/tc-dlx.c
+++ b/gas/config/tc-dlx.c
@@ -1,5 +1,5 @@
 /* tc-ldx.c -- Assemble for the DLX
-   Copyright 2002 Free Software Foundation, Inc.
+   Copyright 2002, 2003 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -585,7 +585,7 @@ dlx_parse_loadop (str)
          /* Searching for (/[ which will match the ]/).  */
          for (pb = idx - 1; str[pb] != match; pb -= 1)
            /* Match can only be either '[' or '(', if it is
-              '(' then this can be an normal expression, we'll treat
+              '(' then this can be a normal expression, we'll treat
               it as an operand.  */
            if (str[pb] == endm || pb < (idx - 5))
              goto load_no_rs1;
@@ -1142,31 +1142,19 @@ md_chars_to_number (val, n)
   return retval;
 }
 
-/* Definition of TC_FORCE_RELOCATION.
-   we need this for gas to force relocation for VTABLE.  */
-
-int
-md_dlx_force_relocation (fixp)
-     struct fix *fixp;
-{
-  return (fixp->fx_r_type == BFD_RELOC_VTABLE_INHERIT
-          || fixp->fx_r_type == BFD_RELOC_VTABLE_ENTRY);
-}
-
-boolean
+bfd_boolean
 md_dlx_fix_adjustable (fixP)
    fixS *fixP;
 {
   /* We need the symbol name for the VTABLE entries.  */
-  return !(fixP->fx_addsy != NULL &&
-           (fixP->fx_r_type == BFD_RELOC_VTABLE_INHERIT
-            || fixP->fx_r_type == BFD_RELOC_VTABLE_ENTRY)) ;
+  return (fixP->fx_r_type != BFD_RELOC_VTABLE_INHERIT
+          && fixP->fx_r_type != BFD_RELOC_VTABLE_ENTRY);
 }
 
 void
 md_apply_fix3 (fixP, valP, seg)
      fixS *fixP;
-     valueT * valP;
+     valueT *valP;
      segT seg ATTRIBUTE_UNUSED;
 {
   long val = *valP;
@@ -1234,7 +1222,7 @@ md_apply_fix3 (fixP, valP, seg)
     }
 
   number_to_chars_bigendian (place, val, fixP->fx_size);
-  if (fixP->fx_addsy == NULL && fixP->fx_pcrel == 0)
+  if (fixP->fx_addsy == NULL)
     fixP->fx_done = 1;
   return;
 }
@@ -1442,11 +1430,10 @@ tc_gen_reloc (section, fixP)
   *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixP->fx_addsy);
   reloc->address = fixP->fx_frag->fr_address + fixP->fx_where;
 
-  if (fixP->fx_r_type == BFD_RELOC_VTABLE_INHERIT ||
-      fixP->fx_r_type == BFD_RELOC_VTABLE_ENTRY)
-    reloc->addend = fixP->fx_offset;
-  else
-    reloc->addend = fixP->fx_addnumber;
+  if (fixP->fx_r_type == BFD_RELOC_VTABLE_ENTRY)
+    reloc->address = fixP->fx_offset;
+  reloc->addend = 0;
+
   return reloc;
 }