2014-04-16 Steve Ellcey <sellcey@mips.com>

[deliverable/binutils-gdb.git] / ld / emultempl / elf-generic.em

diff --git a/ld/emultempl/elf-generic.em b/ld/emultempl/elf-generic.em
index dd0907ccf82c8bac9746281ed2416eb5870862f3..32c102dda4c8909a240ee1981767b857750f9259 100644 (file)
--- a/ld/emultempl/elf-generic.em
+++ b/ld/emultempl/elf-generic.em
@@ -1,11 +1,11 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright 2006 Free Software Foundation, Inc.
+#   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 #
-# This file is part of GLD, the Gnu Linker.
+# This file is part of the GNU Binutils.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -14,14 +14,15 @@
 # GNU General Public License for more details.
 #
 # 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.,
-# 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+# MA 02110-1301, USA.
 #
 
 # This file is sourced from elf32.em and from ELF targets that use
 # generic.em.
 #
-cat >>e${EMULATION_NAME}.c <<EOF
+fragment <<EOF
 
 static void
 gld${EMULATION_NAME}_map_segments (bfd_boolean need_layout)
@@ -30,37 +31,36 @@ gld${EMULATION_NAME}_map_segments (bfd_boolean need_layout)
 
   do
     {
-      if (need_layout)
-       {
-         lang_reset_memory_regions ();
-
-         /* Resize the sections.  */
-         lang_size_sections (NULL, TRUE);
-
-         /* Redo special stuff.  */
-         ldemul_after_allocation ();
-
-         /* Do the assignments again.  */
-         lang_do_assignments ();
-
-         need_layout = FALSE;
-       }
+      lang_relax_sections (need_layout);
+      need_layout = FALSE;
 
-      if (output_bfd->xvec->flavour == bfd_target_elf_flavour
+      if (link_info.output_bfd->xvec->flavour == bfd_target_elf_flavour
          && !link_info.relocatable)
        {
          bfd_size_type phdr_size;
 
-         phdr_size = elf_tdata (output_bfd)->program_header_size;
+         phdr_size = elf_program_header_size (link_info.output_bfd);
          /* If we don't have user supplied phdrs, throw away any
             previous linker generated program headers.  */
          if (lang_phdr_list == NULL)
-           elf_tdata (output_bfd)->segment_map = NULL;
-         if (!_bfd_elf_map_sections_to_segments (output_bfd, &link_info))
+           elf_seg_map (link_info.output_bfd) = NULL;
+         if (!_bfd_elf_map_sections_to_segments (link_info.output_bfd,
+                                                 &link_info))
            einfo ("%F%P: map sections to segments failed: %E\n");
 
-         if (phdr_size != elf_tdata (output_bfd)->program_header_size)
-           need_layout = TRUE;
+         if (phdr_size != elf_program_header_size (link_info.output_bfd))
+           {
+             if (tries > 6)
+               /* The first few times we allow any change to
+                  phdr_size .  */
+               need_layout = TRUE;
+             else if (phdr_size
+                      < elf_program_header_size (link_info.output_bfd))
+               /* After that we only allow the size to grow.  */
+               need_layout = TRUE;
+             else
+               elf_program_header_size (link_info.output_bfd) = phdr_size;
+           }
        }
     }
   while (need_layout && --tries);