bfd/

2007-09-17  H.J. Lu  <hongjiu.lu@intel.com>

	PR binutils/3281
	PR binutils/5037
	* elf-bfd.h (elf_obj_tdata): Remove relro.

	* elf.c (get_program_header_size): Check info->relro instead
	of elf_tdata (abfd)->relro.
	(_bfd_elf_map_sections_to_segments): Likewise.
	(assign_file_positions_for_load_sections): Don't set
	PT_GNU_RELRO segment alignment here.
	(assign_file_positions_for_non_load_sections): Properly set up
	PT_GNU_RELRO segment for copying executable/shared library.
	(rewrite_elf_program_header): Remove PT_GNU_RELRO segment.
	(copy_elf_program_header): Set p_size and p_size_valid fields for
	PT_GNU_RELRO segment.

include/elf/

2007-09-17  H.J. Lu  <hongjiu.lu@intel.com>

	PR binutils/3281
	PR binutils/5037
	* internal.h (elf_segment_map): Add p_size and p_size_valid.
	(ELF_IS_SECTION_IN_SEGMENT): Allow SHF_TLS sections in
	PT_GNU_RELRO segments.

ld/

2007-09-17  H.J. Lu  <hongjiu.lu@intel.com>

	PR binutils/3281
	PR binutils/5037
	* ldexp.h (ldexp_control): Add relro, relro_start_stat and
	relro_end_stat.

	* ldexp.c (fold_binary): Set expld.dataseg.relro to
	exp_dataseg_relro_start or exp_dataseg_relro_end when
	seeing DATA_SEGMENT_ALIGN or DATA_SEGMENT_RELRO_END,
	respectively.

	* ldlang.c (lang_size_sections_1): Properly set
	expld.dataseg.relro_start_stat and
	expld.dataseg.relro_end_stat.
	(find_relro_section_callback): New function.
	(lang_find_relro_sections_1): Likewise.
	(lang_find_relro_sections): Likewise.
	(lang_process): Call lang_find_relro_sections for
	non-relocatable link.

ld/testsuite/

2007-09-17  H.J. Lu  <hongjiu.lu@intel.com>

	PR binutils/3281
	PR binutils/5037
	* ld-elf/binutils.exp: Update "-z relro" tests to use relro1.s.
	Add "-z relro" tests with relro2.s.  Add "-z relro" tests with
	TLS for objcopy.

	* ld-elf/relro1.s: New file.
	* ld-elf/relro2.s: Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 84fab81..21a5dfc 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,20 @@
+2007-09-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR binutils/3281
+       PR binutils/5037
+       * elf-bfd.h (elf_obj_tdata): Remove relro.
+
+       * elf.c (get_program_header_size): Check info->relro instead
+       of elf_tdata (abfd)->relro.
+       (_bfd_elf_map_sections_to_segments): Likewise.
+       (assign_file_positions_for_load_sections): Don't set
+       PT_GNU_RELRO segment alignment here.
+       (assign_file_positions_for_non_load_sections): Properly set up
+       PT_GNU_RELRO segment for copying executable/shared library.
+       (rewrite_elf_program_header): Remove PT_GNU_RELRO segment.
+       (copy_elf_program_header): Set p_size and p_size_valid fields for
+       PT_GNU_RELRO segment. 
+
 2007-09-17  Nick Clifton  <nickc@redhat.com>
 
        * po/fi.po: New Finnish translation.

diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
index 08841be..d8d81df 100644 (file)
--- a/bfd/elf-bfd.h
+++ b/bfd/elf-bfd.h
@@ -1422,9 +1422,6 @@ struct elf_obj_tdata
   /* Segment flags for the PT_GNU_STACK segment.  */
   unsigned int stack_flags;
 
-  /* Should the PT_GNU_RELRO segment be emitted?  */
-  bfd_boolean relro;
-
   /* Symbol version definitions in external objects.  */
   Elf_Internal_Verdef *verdef;
 

diff --git a/bfd/elf.c b/bfd/elf.c
index a960e85..700d573 100644 (file)
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -3357,7 +3357,7 @@ get_program_header_size (bfd *abfd, struct bfd_link_info *info)
       /* We need a PT_DYNAMIC segment.  */
       ++segs;
 
-      if (elf_tdata (abfd)->relro)
+      if (info->relro)
        {
          /* We need a PT_GNU_RELRO segment only when there is a
             PT_DYNAMIC segment.  */
@@ -3887,7 +3887,7 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
          pm = &m->next;
        }
 
-      if (dynsec != NULL && elf_tdata (abfd)->relro)
+      if (dynsec != NULL && info->relro)
        {
          /* We make a PT_GNU_RELRO segment only when there is a
             PT_DYNAMIC segment.  */
@@ -4388,12 +4388,10 @@ assign_file_positions_for_load_sections (bfd *abfd,
                    p->p_memsz += this_hdr->sh_size;
                }
 
-             if (p->p_type == PT_GNU_RELRO)
-               p->p_align = 1;
-             else if (align > p->p_align
-                      && !m->p_align_valid
-                      && (p->p_type != PT_LOAD
-                          || (abfd->flags & D_PAGED) == 0))
+             if (align > p->p_align
+                 && !m->p_align_valid
+                 && (p->p_type != PT_LOAD
+                     || (abfd->flags & D_PAGED) == 0))
                p->p_align = align;
            }
 
@@ -4543,18 +4541,53 @@ assign_file_positions_for_non_load_sections (bfd *abfd,
       if (m->count != 0)
        {
          if (p->p_type != PT_LOAD
-             && (p->p_type != PT_NOTE || bfd_get_format (abfd) != bfd_core))
+             && (p->p_type != PT_NOTE
+                 || bfd_get_format (abfd) != bfd_core))
            {
              Elf_Internal_Shdr *hdr;
+             asection *sect;
+
              BFD_ASSERT (!m->includes_filehdr && !m->includes_phdrs);
 
-             hdr = &elf_section_data (m->sections[m->count - 1])->this_hdr;
-             p->p_filesz = (m->sections[m->count - 1]->filepos
-                            - m->sections[0]->filepos);
+             sect = m->sections[m->count - 1];
+             hdr = &elf_section_data (sect)->this_hdr;
+             p->p_filesz = sect->filepos - m->sections[0]->filepos;
              if (hdr->sh_type != SHT_NOBITS)
                p->p_filesz += hdr->sh_size;
 
-             p->p_offset = m->sections[0]->filepos;
+             if (p->p_type == PT_GNU_RELRO)
+               {
+                 /* When we get here, we are copying executable
+                    or shared library. But we need to use the same
+                    linker logic.  */
+                 Elf_Internal_Phdr *lp;
+
+                 for (lp = phdrs; lp < phdrs + count; ++lp)
+                   {
+                     if (lp->p_type == PT_LOAD
+                         && lp->p_paddr == p->p_paddr)
+                       break;
+                   }
+         
+                 if (lp < phdrs + count)
+                   {
+                     /* We should use p_size if it is valid since it
+                        may contain the first few bytes of the next
+                        SEC_ALLOC section.  */
+                     if (m->p_size_valid)
+                       p->p_filesz = m->p_size;
+                     else
+                       abort ();
+                     p->p_vaddr = lp->p_vaddr;
+                     p->p_offset = lp->p_offset;
+                     p->p_memsz = p->p_filesz;
+                     p->p_align = 1;
+                   }
+                 else
+                   abort ();
+               }
+             else
+               p->p_offset = m->sections[0]->filepos;
            }
        }
       else
@@ -5143,7 +5176,12 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd)
            }
 
       if (segment->p_type != PT_LOAD)
-       continue;
+       {
+         /* Remove PT_GNU_RELRO segment.  */
+         if (segment->p_type == PT_GNU_RELRO)
+           segment->p_type = PT_NULL;
+         continue;
+       }
 
       /* Determine if this segment overlaps any previous segments.  */
       for (j = 0, segment2 = elf_tdata (ibfd)->phdr; j < i; j++, segment2 ++)
@@ -5667,6 +5705,17 @@ copy_elf_program_header (bfd *ibfd, bfd *obfd)
       map->p_align_valid = 1;
       map->p_vaddr_offset = 0;
 
+      if (map->p_type == PT_GNU_RELRO
+         && segment->p_filesz == segment->p_memsz)
+       {
+         /* The PT_GNU_RELRO segment may contain the first a few
+            bytes in the .got.plt section even if the whole .got.plt
+            section isn't in the PT_GNU_RELRO segment.  We won't
+            change the size of the PT_GNU_RELRO segment.  */
+         map->p_size = segment->p_filesz;
+         map->p_size_valid = 1;
+       }
+
       /* Determine if this segment contains the ELF file header
         and if it contains the program headers themselves.  */
       map->includes_filehdr = (segment->p_offset == 0

diff --git a/bfd/elflink.c b/bfd/elflink.c
index 0f13faa..8b318ca 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -5327,7 +5327,6 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd,
     return TRUE;
 
   bed = get_elf_backend_data (output_bfd);
-  elf_tdata (output_bfd)->relro = info->relro;
   if (info->execstack)
     elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
   else if (info->noexecstack)

diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 939c371..dd354e8 100644 (file)
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR binutils/3281
+       PR binutils/5037
+       * internal.h (elf_segment_map): Add p_size and p_size_valid.
+       (ELF_IS_SECTION_IN_SEGMENT): Allow SHF_TLS sections in
+       PT_GNU_RELRO segments.
+
 2007-09-11  Nathan Sidwell  <nathan@codesourcery.com>
 
        * m68k.h (EF_M68K_CF_ISA_C_NODIV): New.

diff --git a/include/elf/internal.h b/include/elf/internal.h
index 1521711..f5380b8 100644 (file)
--- a/include/elf/internal.h
+++ b/include/elf/internal.h
@@ -239,6 +239,8 @@ struct elf_segment_map
   bfd_vma p_vaddr_offset;
   /* Program segment alignment.  */
   bfd_vma p_align;
+  /* Segment size in file and memory */
+  bfd_vma p_size;
   /* Whether the p_flags field is valid; if not, the flags are based
      on the section flags.  */
   unsigned int p_flags_valid : 1;
@@ -248,6 +250,9 @@ struct elf_segment_map
   /* Whether the p_align field is valid; if not, PT_LOAD segment
      alignment is based on the default maximum page size.  */
   unsigned int p_align_valid : 1;
+  /* Whether the p_size field is valid; if not, the size are based
+     on the section sizes.  */
+  unsigned int p_size_valid : 1;
   /* Whether this segment includes the file header.  */
   unsigned int includes_filehdr : 1;
   /* Whether this segment includes the program headers.  */
@@ -266,11 +271,12 @@ struct elf_segment_map
      || segment->p_type == PT_TLS) ? sec_hdr->sh_size : 0)
 
 /* Decide if the given sec_hdr is in the given segment.  PT_TLS segment
-   contains only SHF_TLS sections.  Only PT_LOAD and PT_TLS segments
-   can contain SHF_TLS sections.  */
+   contains only SHF_TLS sections.  Only PT_LOAD, PT_GNU_RELRO and
+   and PT_TLS segments can contain SHF_TLS sections.  */
 #define ELF_IS_SECTION_IN_SEGMENT(sec_hdr, segment)                    \
   (((((sec_hdr->sh_flags & SHF_TLS) != 0)                              \
      && (segment->p_type == PT_TLS                                     \
+        || segment->p_type == PT_GNU_RELRO                             \
         || segment->p_type == PT_LOAD))                                \
     || ((sec_hdr->sh_flags & SHF_TLS) == 0                             \
        && segment->p_type != PT_TLS))                                  \