Match shell_prompt # in batch-preserve-term-settings.exp

[external/binutils.git] / ld / ldwrite.c

diff --git a/ld/ldwrite.c b/ld/ldwrite.c
index aad0850..05103be 100644 (file)
--- a/ld/ldwrite.c
+++ b/ld/ldwrite.c
@@ -1,7 +1,5 @@
 /* ldwrite.c -- write out the linked file
-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2002,
-   2003, 2004, 2005, 2006, 2007, 2008, 2010, 2012
-   Free Software Foundation, Inc.
+   Copyright (C) 1991-2016 Free Software Foundation, Inc.
    Written by Steve Chamberlain sac@cygnus.com
 
    This file is part of the GNU Binutils.
@@ -490,13 +488,13 @@ split_sections (bfd *abfd, struct bfd_link_info *info)
                  || info->strip == strip_some)
                thislines = sec->lineno_count;
 
-             if (info->relocatable)
+             if (bfd_link_relocatable (info))
                thisrelocs = sec->reloc_count;
 
              thissize = sec->size;
 
            }
-         else if (info->relocatable
+         else if (bfd_link_relocatable (info)
                   && (p->type == bfd_section_reloc_link_order
                       || p->type == bfd_symbol_reloc_link_order))
            thisrelocs++;
@@ -574,6 +572,7 @@ ldwrite (void)
   /* Reset error indicator, which can typically something like invalid
      format from opening up the .o files.  */
   bfd_set_error (bfd_error_no_error);
+  lang_clear_os_map ();
   lang_for_each_statement (build_link_order);
 
   if (config.split_by_reloc != (unsigned) -1