ld: Don't xfail ld-elf/warn[12] on 64-bit Solaris/SPARC

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

diff --git a/ld/emultempl/elf-generic.em b/ld/emultempl/elf-generic.em
index 2c850f1141b357ffb81f23471183f55db303109a..7e0923b20a6a65bdea3947a9b7fbd0136286d9d3 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, 2009 Free Software Foundation, Inc.
+#   Copyright (C) 2006-2020 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -19,53 +19,13 @@
 # MA 02110-1301, USA.
 #
 
-# This file is sourced from elf32.em and from ELF targets that use
+# This file is sourced from elf.em and from ELF targets that use
 # generic.em.
 #
 fragment <<EOF
 
-static void
-gld${EMULATION_NAME}_map_segments (bfd_boolean need_layout)
-{
-  int tries = 10;
-
-  do
-    {
-      lang_relax_sections (need_layout);
-      need_layout = FALSE;
-
-      if (link_info.output_bfd->xvec->flavour == bfd_target_elf_flavour
-         && !link_info.relocatable)
-       {
-         bfd_size_type phdr_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_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_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);
-
-  if (tries == 0)
-    einfo (_("%P%F: looping in map_segments"));
-}
 EOF
+# Put these extra routines in ld${EMULATION_NAME}_emulation
+#
+LDEMUL_EMIT_CTF_EARLY=ldelf_emit_ctf_early
+LDEMUL_EXAMINE_STRTAB_FOR_CTF=ldelf_examine_strtab_for_ctf