[x86] Resolve non-PIC undefweak symbols in executable

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

diff --git a/ld/emultempl/elf-generic.em b/ld/emultempl/elf-generic.em
index d286bb837c69982d658665a5c6733cd541c751f8..7529ad6ac822a61021ebf6f04f3d28cde89dfb62 100644 (file)
--- a/ld/emultempl/elf-generic.em
+++ b/ld/emultempl/elf-generic.em
@@ -1,5 +1,5 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2006-2016 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -31,50 +31,35 @@ 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 (link_info.output_bfd->xvec->flavour == bfd_target_elf_flavour
-         && !link_info.relocatable)
+         && !bfd_link_relocatable (&link_info))
        {
          bfd_size_type phdr_size;
 
-         phdr_size = elf_tdata (link_info.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 (link_info.output_bfd)->segment_map = NULL;
+           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 (link_info.output_bfd)->program_header_size)
+         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_tdata (link_info.output_bfd)->program_header_size)
+                      < elf_program_header_size (link_info.output_bfd))
                /* After that we only allow the size to grow.  */
                need_layout = TRUE;
              else
-               elf_tdata (link_info.output_bfd)->program_header_size
-                 = phdr_size;
+               elf_program_header_size (link_info.output_bfd) = phdr_size;
            }
        }
     }