*** empty log message ***

[deliverable/binutils-gdb.git] / bfd / coff-h8500.c

diff --git a/bfd/coff-h8500.c b/bfd/coff-h8500.c
index 3c5cf2295b23ad9160d25062abd5b13136db22c4..e9c878d820a09292d5c730c713f5a3a2382b6ef4 100644 (file)
--- a/bfd/coff-h8500.c
+++ b/bfd/coff-h8500.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Renesas H8/500 COFF binaries.
-   Copyright 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003
+   Copyright 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
    Contributed by Cygnus Support.
    Written by Steve Chamberlain, <sac@cygnus.com>.
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include "bfd.h"
 #include "sysdep.h"
@@ -245,9 +245,9 @@ extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr)
       {
        bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
                                                  input_section);
-       bfd_vma dot = link_order->offset
-         + *dst_ptr
-           + link_order->u.indirect.section->output_section->vma;
+       bfd_vma dot = (*dst_ptr
+                      + input_section->output_offset
+                      + input_section->output_section->vma);
        int gap = dst - dot - 1; /* -1 since were in the odd byte of the
                                    word and the pc's been incremented.  */
 
@@ -269,9 +269,9 @@ extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr)
       {
        bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
                                                  input_section);
-       bfd_vma dot = link_order->offset
-         + *dst_ptr
-           + link_order->u.indirect.section->output_section->vma;
+       bfd_vma dot = (*dst_ptr
+                      + input_section->output_offset
+                      + input_section->output_section->vma);
        int gap = dst - dot - 1; /* -1 since were in the odd byte of the
                                    word and the pc's been incremented.  */