* config/tc-ppc.c (ppc_fix_adjustable <ELF>): Remove bogus checks.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8f38437ed3f28b65a54e63a5e12e85a510cf55c1..d92dcbecb1a6c586a1ac0e1cc1f88e45e7c7a884 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-02  Alan Modra  <[email protected]>
+
+       * config/tc-ppc.c (ppc_fix_adjustable <ELF>): Remove bogus checks.
+
 2005-03-02  Jan Beulich  <[email protected]>
 
        * as.c (main): Use unlink_if_ordinary instead of unlink.
@@ -1861,7 +1865,7 @@
        (set_section, add_unwind_adjustsp, flush_pending_unwind,
        finish_unwind_opcodes, start_unwind_section, create_unwind_entry,
        require_hashconst, add_unwind_opcode): New functions.
-       * doc/tc-arm.text: Document unwinding opcodes.
+       * doc/c-arm.texi: Document unwinding opcodes.
        * NEWS: Mention the new feature.
 
 2004-10-04  Eric Christopher  <[email protected]>
@@ -2887,7 +2891,7 @@
        (md_begin): Set flags for EABI v3.
        (arm_eabis): Add.
        (arm_long_opts): Add meabi.
-       * doc/as.texinf <ARM>: Document -meabi.
+       * doc/as.texinfo <ARM>: Document -meabi.
        * doc/c-arm.texi: Ditto.
 
 2004-03-22  Bob Wilson  <[email protected]>

diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index 6f0b71724101c84dde9ad93df9f620f353a5f792..7dab69756b26f7f2c36e046c983147b9f81050fb 100644 (file)
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -5485,12 +5485,7 @@ ppc_fix_adjustable (fix)
          && fix->fx_r_type != BFD_RELOC_VTABLE_INHERIT
          && fix->fx_r_type != BFD_RELOC_VTABLE_ENTRY
          && !(fix->fx_r_type >= BFD_RELOC_PPC_TLS
-              && fix->fx_r_type <= BFD_RELOC_PPC64_DTPREL16_HIGHESTA)
-         && (fix->fx_pcrel
-             || (fix->fx_subsy != NULL
-                 && (S_GET_SEGMENT (fix->fx_subsy)
-                     == S_GET_SEGMENT (fix->fx_addsy)))
-             || S_IS_LOCAL (fix->fx_addsy)));
+              && fix->fx_r_type <= BFD_RELOC_PPC64_DTPREL16_HIGHESTA));
 }
 #endif