merge from gcc

[deliverable/binutils-gdb.git] / gas / listing.c

diff --git a/gas/listing.c b/gas/listing.c
index aaf6bf7165b991d63e448428e41ef929f279dd38..61ef6f55e40f94acc29a8d38abcf6aa6cba8ade0 100644 (file)
--- a/gas/listing.c
+++ b/gas/listing.c
@@ -1,6 +1,6 @@
 /* listing.c - maintain assembly listings
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003
+   2001, 2002, 2003, 2005
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -17,8 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GAS; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 /* Contributed by Steve Chamberlain <sac@cygnus.com>
 
@@ -749,11 +749,10 @@ list_symbol_table (void)
       if (SEG_NORMAL (S_GET_SEGMENT (ptr))
          || S_GET_SEGMENT (ptr) == absolute_section)
        {
-#ifdef BFD_ASSEMBLER
          /* Don't report section symbols.  They are not interesting.  */
          if (symbol_section_p (ptr))
            continue;
-#endif
+
          if (S_GET_NAME (ptr))
            {
              char buf[30], fmt[8];
@@ -1086,9 +1085,7 @@ listing_print (char *name)
        using_stdout = 0;
       else
        {
-#ifdef BFD_ASSEMBLER
-      bfd_set_error (bfd_error_system_call);
-#endif
+         bfd_set_error (bfd_error_system_call);
          as_perror (_("can't open list file: %s"), name);
          list_file = stdout;
          using_stdout = 1;
@@ -1108,9 +1105,7 @@ listing_print (char *name)
     {
       if (fclose (list_file) == EOF)
        {
-#ifdef BFD_ASSEMBLER
          bfd_set_error (bfd_error_system_call);
-#endif
          as_perror (_("error closing list file: %s"), name);
        }
     }