Avoid ubsan bug complaining about &p->field

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

diff --git a/ld/emultempl/genelf.em b/ld/emultempl/genelf.em
index 5c5e1cbf4f44ac0bb75ba7a572363ccc12a34350..9c5898d31fcd2596db5f8f439c0d6febf06cdfc2 100644 (file)
--- a/ld/emultempl/genelf.em
+++ b/ld/emultempl/genelf.em
@@ -1,5 +1,5 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+#   Copyright (C) 2006-2019 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -23,6 +23,7 @@
 #
 fragment <<EOF
 #include "elf-bfd.h"
+#include "ldelfgen.h"
 
 EOF
 source_em ${srcdir}/emultempl/elf-generic.em
@@ -37,7 +38,7 @@ gld${EMULATION_NAME}_after_open (void)
 
   after_open_default ();
 
-  if (link_info.relocatable)
+  if (bfd_link_relocatable (&link_info))
     for (ibfd = link_info.input_bfds; ibfd != NULL; ibfd = ibfd->link.next)
       if ((syms = bfd_get_outsymbols (ibfd)) != NULL
          && bfd_get_flavour (ibfd) == bfd_target_elf_flavour)
@@ -45,23 +46,25 @@ gld${EMULATION_NAME}_after_open (void)
          if ((sec->flags & (SEC_GROUP | SEC_LINKER_CREATED)) == SEC_GROUP)
            {
              struct bfd_elf_section_data *sec_data = elf_section_data (sec);
-             elf_group_id (sec) = syms[sec_data->this_hdr.sh_info - 1];
+             struct bfd_symbol *sym = syms[sec_data->this_hdr.sh_info - 1];
+             elf_group_id (sec) = sym;
+             sym->flags |= BSF_KEEP;
            }
 }
 
 static void
 gld${EMULATION_NAME}_before_allocation (void)
 {
-  if (link_info.relocatable
+  if (bfd_link_relocatable (&link_info)
       && !_bfd_elf_size_group_sections (&link_info))
-    einfo ("%X%P: can not size group sections: %E\n");
+    einfo (_("%X%P: can not size group sections: %E\n"));
   before_allocation_default ();
 }
 
 static void
 gld${EMULATION_NAME}_after_allocation (void)
 {
-  gld${EMULATION_NAME}_map_segments (FALSE);
+  ldelf_map_segments (FALSE);
 }
 EOF
 # Put these extra routines in ld_${EMULATION_NAME}_emulation