* som.c (som_set_reloc_info): Do not set any relocation info

	for SOM fixups which are never passed to BFD.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4ae2d7dbbf11a26021921010d0dd422ca4335f34..627e43c4cd8cedfd9f94501a79cd798e585df644 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 20 13:38:23 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+       * som.c (som_set_reloc_info): Do not set any relocation info
+       for SOM fixups which are never passed to BFD.
+
 Fri May 20 11:57:05 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
        * elf32-i386.c (elf_i386_size_dynamic_sections): Add DT_DEBUG to

diff --git a/bfd/som.c b/bfd/som.c
index 889e59201e3809b48e7a522e4dfe690c2165070b..0ae799107f0edbdbae15aa44cfa11a787d44c993 100644 (file)
--- a/bfd/som.c
+++ b/bfd/som.c
@@ -3953,8 +3953,10 @@ som_set_reloc_info (fixup, end, internal_relocs, section, symbols, just_count)
          fp = &som_fixup_formats[op];
        }
 
-      /* If we are not just counting, set some reasonable defaults.  */
-      if (! just_count)
+      /* If this fixup will be passed to BFD, set some reasonable defaults.  */
+      if (! just_count
+         && som_hppa_howto_table[op].type != R_NO_RELOCATION
+         && som_hppa_howto_table[op].type != R_DATA_OVERRIDE)
        {
          rptr->address = offset;
          rptr->howto = &som_hppa_howto_table[op];