* amd64fbsd-nat.c: Include <sys/types.h, <machine/pcb.h> and

[deliverable/binutils-gdb.git] / gdb / dsrec.c

diff --git a/gdb/dsrec.c b/gdb/dsrec.c
index 4f111bb810ba42d72085ec9e7fae10f8018c229c..2ca91fe5e2119fa902fbf4392b82ec39ebf09a20 100644 (file)
--- a/gdb/dsrec.c
+++ b/gdb/dsrec.c
@@ -1,5 +1,5 @@
 /* S-record download support for GDB, the GNU debugger.
-   Copyright 1995, 1996, 1997, 1999, 2000, 2001
+   Copyright 1995, 1996, 1997, 1999, 2000, 2001, 2003, 2004
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -24,6 +24,7 @@
 #include "srec.h"
 #include <time.h>
 #include "gdb_assert.h"
+#include "gdb_string.h"
 
 extern void report_transfer_performance (unsigned long, time_t, time_t);
 
@@ -92,7 +93,7 @@ load_srec (struct serial *desc, const char *file, bfd_vma load_offset,
       {
        int numbytes;
        bfd_vma addr = bfd_get_section_vma (abfd, s) + load_offset;
-       bfd_size_type size = bfd_get_section_size_before_reloc (s);
+       bfd_size_type size = bfd_get_section_size (s);
        char *section_name = (char *) bfd_get_section_name (abfd, s);
        /* Both GDB and BFD have mechanisms for printing addresses.
            In the below, GDB's is used so that the address is
@@ -123,8 +124,9 @@ load_srec (struct serial *desc, const char *file, bfd_vma load_offset,
            do
              {
                serial_write (desc, srec, reclen);
-               if (ui_load_progress_hook)
-                 if (ui_load_progress_hook (section_name, (unsigned long) i))
+               if (deprecated_ui_load_progress_hook)
+                 if (deprecated_ui_load_progress_hook (section_name,
+                                                       (unsigned long) i))
                    error ("Canceled the download");
              }
            while (waitack != NULL && !waitack ());
@@ -136,8 +138,9 @@ load_srec (struct serial *desc, const char *file, bfd_vma load_offset,
              }
          }                     /* Per-packet (or S-record) loop */
 
-       if (ui_load_progress_hook)
-         if (ui_load_progress_hook (section_name, (unsigned long) i))
+       if (deprecated_ui_load_progress_hook)
+         if (deprecated_ui_load_progress_hook (section_name,
+                                               (unsigned long) i))
            error ("Canceled the download");
        putchar_unfiltered ('\n');
       }
@@ -260,7 +263,7 @@ make_srec (char *srec, CORE_ADDR targ_addr, bfd *abfd, asection *sect,
   if (sect && abfd)
     {
       payload_size = (*maxrecsize - (1 + 1 + 2 + addr_size * 2 + 2)) / 2;
-      payload_size = min (payload_size, sect->_raw_size - sectoff);
+      payload_size = min (payload_size, bfd_get_section_size (sect) - sectoff);
 
       bfd_get_section_contents (abfd, sect, binbuf, sectoff, payload_size);
     }