daily update

[deliverable/binutils-gdb.git] / bfd / coffgen.c

diff --git a/bfd/coffgen.c b/bfd/coffgen.c
index d303beceb98023b1a18a86567aae533af2d3258b..bef7d7a384cdbcf256111a7ca948ea529a4577ed 100644 (file)
--- a/bfd/coffgen.c
+++ b/bfd/coffgen.c
@@ -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.  */
 
 /* Most of this hacked by  Steve Chamberlain, sac@cygnus.com.
    Split out of coffcode.h by Ian Taylor, ian@cygnus.com.  */
@@ -1895,28 +1895,14 @@ coff_print_symbol (bfd *abfd,
          else
            val = combined->u.syment.n_value - (unsigned long) root;
 
-#ifndef XCOFF64
-         fprintf (file,
-                  "(sec %2d)(fl 0x%02x)(ty %3x)(scl %3d) (nx %d) 0x%08lx %s",
+         fprintf (file, "(sec %2d)(fl 0x%02x)(ty %3x)(scl %3d) (nx %d) 0x",
                   combined->u.syment.n_scnum,
                   combined->u.syment.n_flags,
                   combined->u.syment.n_type,
                   combined->u.syment.n_sclass,
-                  combined->u.syment.n_numaux,
-                  (unsigned long) val,
-                  symbol->name);
-#else
-         /* Print out the wide, 64 bit, symbol value.  */
-         fprintf (file,
-                  "(sec %2d)(fl 0x%02x)(ty %3x)(scl %3d) (nx %d) 0x%016llx %s",
-                  combined->u.syment.n_scnum,
-                  combined->u.syment.n_flags,
-                  combined->u.syment.n_type,
-                  combined->u.syment.n_sclass,
-                  combined->u.syment.n_numaux,
-                  val,
-                  symbol->name);
-#endif
+                  combined->u.syment.n_numaux);
+         fprintf_vma (file, val);
+         fprintf (file, " %s", symbol->name);
 
          for (aux = 0; aux < combined->u.syment.n_numaux; aux++)
            {
@@ -1995,10 +1981,8 @@ coff_print_symbol (bfd *abfd,
              l++;
              while (l->line_number)
                {
-                 fprintf (file, "\n%4d : 0x%lx",
-                          l->line_number,
-                          ((unsigned long)
-                           (l->u.offset + symbol->section->vma)));
+                 fprintf (file, "\n%4d : ", l->line_number);
+                 fprintf_vma (file, l->u.offset + symbol->section->vma);
                  l++;
                }
            }
@@ -2239,12 +2223,26 @@ coff_find_nearest_line (bfd *abfd,
   return TRUE;
 }
 
+bfd_boolean
+coff_find_inliner_info (bfd *abfd,
+                       const char **filename_ptr,
+                       const char **functionname_ptr,
+                       unsigned int *line_ptr)
+{
+  bfd_boolean found;
+
+  found = _bfd_dwarf2_find_inliner_info (abfd, filename_ptr,
+                                        functionname_ptr, line_ptr,
+                                        &coff_data(abfd)->dwarf2_find_line_info);
+  return (found);
+}
+
 int
-coff_sizeof_headers (bfd *abfd, bfd_boolean reloc)
+coff_sizeof_headers (bfd *abfd, struct bfd_link_info *info)
 {
   size_t size;
 
-  if (! reloc)
+  if (!info->relocatable)
     size = bfd_coff_filhsz (abfd) + bfd_coff_aoutsz (abfd);
   else
     size = bfd_coff_filhsz (abfd);