* binutils-all/objcopy.exp: Always treat objcopy_test as XFAIL on cygwin.

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

diff --git a/binutils/bucomm.c b/binutils/bucomm.c
index 508790ffa3c3069537b46faa960148810191edf9..9bbdafb9061b6ac159802710d41047af6966c5d4 100644 (file)
--- a/binutils/bucomm.c
+++ b/binutils/bucomm.c
@@ -1,6 +1,6 @@
 /* bucomm.c -- Bin Utils COMmon code.
    Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001, 2002,
-   2003, 2006, 2007
+   2003, 2006, 2007, 2008, 2009
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -88,7 +88,7 @@ bfd_nonfatal_message (const char *filename,
   if (bfd)
     {
       if (!filename)
-       filename = bfd_get_filename (bfd);
+       filename = bfd_get_archive_filename (bfd);
       if (section)
        section_name = bfd_get_section_name (bfd, section);
     }
@@ -577,7 +577,7 @@ get_file_size (const char * file_name)
 /* Return the filename in a static buffer.  */
 
 const char *
-bfd_get_archive_filename (bfd *abfd)
+bfd_get_archive_filename (const bfd *abfd)
 {
   static size_t curr = 0;
   static char *buf;