ld/

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

diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 99fb8ab880e91078756bfcf366980c4aea5e9c58..28880084fa885b1b8d2a914c2761cf680f1f5da1 100644 (file)
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -865,6 +865,42 @@ gld${EMULATION_NAME}_after_open (void)
 {
   struct bfd_link_needed_list *needed, *l;
 
+  if (link_info.eh_frame_hdr
+      && ! link_info.traditional_format
+      && ! link_info.relocatable)
+    {
+      struct elf_link_hash_table *htab;
+
+      htab = elf_hash_table (&link_info);
+      if (is_elf_hash_table (htab))
+       {
+         bfd *abfd;
+         asection *s;
+
+         for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
+           {
+             s = bfd_get_section_by_name (abfd, ".eh_frame");
+             if (s && s->size > 8 && !bfd_is_abs_section (s->output_section))
+                break;
+           }
+         if (abfd)
+           {
+             const struct elf_backend_data *bed;
+
+             bed = get_elf_backend_data (abfd);
+             s = bfd_make_section_with_flags (abfd, ".eh_frame_hdr",
+                                              bed->dynamic_sec_flags
+                                              | SEC_READONLY);
+             if (s != NULL
+                && bfd_set_section_alignment (abfd, s, 2))
+               htab->eh_info.hdr_sec = s;
+             else
+               einfo ("%P: warning: Cannot create .eh_frame_hdr section,"
+                      " --eh-frame-hdr ignored.\n");
+           }
+       }
+    }
+
   /* We only need to worry about this when doing a final link.  */
   if (link_info.relocatable || !link_info.executable)
     return;
@@ -1180,10 +1216,8 @@ ${ELF_INTERPRETER_SET_DEFAULT}
       {
        asection *s;
        bfd_size_type sz;
-       bfd_size_type prefix_len;
        char *msg;
        bfd_boolean ret;
-       const char * gnu_warning_prefix = _("warning: ");
 
        if (is->just_syms_flag)
          continue;
@@ -1193,14 +1227,12 @@ ${ELF_INTERPRETER_SET_DEFAULT}
          continue;
 
        sz = s->size;
-       prefix_len = strlen (gnu_warning_prefix);
-       msg = xmalloc ((size_t) (prefix_len + sz + 1));
-       strcpy (msg, gnu_warning_prefix);
-       if (! bfd_get_section_contents (is->the_bfd, s, msg + prefix_len,
+       msg = xmalloc ((size_t) (sz + 1));
+       if (! bfd_get_section_contents (is->the_bfd, s, msg,
                                        (file_ptr) 0, sz))
          einfo ("%F%B: Can't read contents of section .gnu.warning: %E\n",
                 is->the_bfd);
-       msg[prefix_len + sz] = '\0';
+       msg[sz] = '\0';
        ret = link_info.callbacks->warning (&link_info, msg,
                                            (const char *) NULL,
                                            is->the_bfd, (asection *) NULL,
@@ -1208,12 +1240,19 @@ ${ELF_INTERPRETER_SET_DEFAULT}
        ASSERT (ret);
        free (msg);
 
-       /* Clobber the section size, so that we don't waste copying the
-          warning into the output file.  */
+       /* Clobber the section size, so that we don't waste space
+          copying the warning into the output file.  If we've already
+          sized the output section, adjust its size.  The adjustment
+          is on rawsize because targets that size sections early will
+          have called lang_reset_memory_regions after sizing.  */
+       if (s->output_section != NULL
+           && s->output_section->rawsize >= s->size)
+         s->output_section->rawsize -= s->size;
+
        s->size = 0;
 
-       /* Also set SEC_EXCLUDE, so that symbols defined in the warning
-          section don't get copied to the output.  */
+       /* Also set SEC_EXCLUDE, so that local symbols defined in the
+          warning section don't get copied to the output.  */
        s->flags |= SEC_EXCLUDE | SEC_KEEP;
       }
   }