Merge commit 'upstream/2.20'

[msp430-binutils.git] / ld / emultempl / genelf.em

diff --git a/ld/emultempl/genelf.em b/ld/emultempl/genelf.em
index e44bb9b9e107f053a8db58bea7ed8735a8f2b124..1a6c539b43be86d9f5c0b7113726e3cab298c83d 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 2006, 2007 Free Software Foundation, Inc.
+#   Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -29,12 +29,31 @@ source_em ${srcdir}/emultempl/elf-generic.em
 fragment <<EOF
 
 static void
-gld${EMULATION_NAME}_finish (void)
+gld${EMULATION_NAME}_after_open (void)
+{
+  bfd *ibfd;
+  asection *sec;
+  asymbol **syms;
+
+  if (link_info.relocatable)
+    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)
+       for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+         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];
+           }
+}
+
+static void
+gld${EMULATION_NAME}_after_allocation (void)
 {
   gld${EMULATION_NAME}_map_segments (FALSE);
-  finish_default ();
 }
 EOF
 # Put these extra routines in ld_${EMULATION_NAME}_emulation
 #
-LDEMUL_FINISH=gld${EMULATION_NAME}_finish
+LDEMUL_AFTER_OPEN=gld${EMULATION_NAME}_after_open
+LDEMUL_AFTER_ALLOCATION=gld${EMULATION_NAME}_after_allocation