riscv
/
binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bfd/ 

2007-08-16  H.J. Lu  <hongjiu.lu@intel.com>

	* elf.c (get_segment_type): Change PT_GNU_STACK to PT_GNU_ATTR.
	(bfd_section_from_phdr): Likewise.
	(get_program_header_size): Likewise. Add a PT_GNU_ATTR segment
	if there is an attribute section.
	(_bfd_elf_map_sections_to_segments): Likewise.
	(IS_SECTION_IN_INPUT_SEGMENT): Likewise.

binutils/

2007-08-16  H.J. Lu  <hongjiu.lu@intel.com>

	* readelf.c (get_segment_type): Change PT_GNU_STACK to
	PT_GNU_ATTR.

include/elf/

2007-08-16  H.J. Lu  <hongjiu.lu@intel.com>

	* common.h (PT_GNU_STACK): Renamed to ...
	(PT_GNU_ATTR): This.
	(PT_GNU_STACK): New.  Make an alias of PT_GNU_ATTR.
gdb_6_7-branch
H.J. Lu 19 years ago
parent
1192f4a2b3
commit
94b11780ad
6 changed files with 89 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      bfd/ChangeLog
  2. 98
      bfd/elf.c
  3. 5
      binutils/ChangeLog
  4. 2
      binutils/readelf.c
  5. 6
      include/elf/ChangeLog
  6. 3
      include/elf/common.h

9
bfd/ChangeLog
View File

@ -1,3 +1,12 @@
2007-08-16 H.J. Lu <hongjiu.lu@intel.com>
* elf.c (get_segment_type): Change PT_GNU_STACK to PT_GNU_ATTR.
(bfd_section_from_phdr): Likewise.
(get_program_header_size): Likewise. Add a PT_GNU_ATTR segment
if there is an attribute section.
(_bfd_elf_map_sections_to_segments): Likewise.
(IS_SECTION_IN_INPUT_SEGMENT): Likewise.
2007-08-14 H.J. Lu <hongjiu.lu@intel.com>
PR ld/4918

98
bfd/elf.c
View File

@ -1083,7 +1083,7 @@ get_segment_type (unsigned int p_type)
case PT_PHDR: pt = "PHDR"; break;
case PT_TLS: pt = "TLS"; break;
case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break;
case PT_GNU_STACK: pt = "STACK"; break;
case PT_GNU_ATTR: pt = "ATTR"; break;
case PT_GNU_RELRO: pt = "RELRO"; break;
default: pt = NULL; break;
}
@ -2355,8 +2355,8 @@ bfd_section_from_phdr (bfd *abfd, Elf_Internal_Phdr *hdr, int index)
return _bfd_elf_make_section_from_phdr (abfd, hdr, index,
"eh_frame_hdr");
case PT_GNU_STACK:
return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "stack");
case PT_GNU_ATTR:
return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "attr");
case PT_GNU_RELRO:
return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "relro");
@ -3300,7 +3300,8 @@ get_program_header_size (bfd *abfd, struct bfd_link_info *info)
{
size_t segs;
asection *s;
const struct elf_backend_data *bed;
asection *attr = NULL;
const struct elf_backend_data *bed = get_elf_backend_data (abfd);
/* Assume we will need exactly two PT_LOAD segments: one for text
and one for data. */
@ -3335,14 +3336,26 @@ get_program_header_size (bfd *abfd, struct bfd_link_info *info)
++segs;
}
if (elf_tdata (abfd)->stack_flags)
{
/* We need a PT_GNU_STACK segment. */
++segs;
}
for (s = abfd->sections; s != NULL; s = s->next)
{
if (elf_section_type (s) == bed->obj_attrs_section_type)
{
BFD_ASSERT (attr == NULL);
attr = s;
/* elf_tdata (abfd)->stack_flags is checked for the
PT_GNU_ATTR segment. If there is an attribute
section, we make sure that stack_flags isn't zero so
that the PT_GNU_ATTR segment will be created. */
if (! elf_tdata (abfd)->stack_flags)
{
if (bed->default_execstack)
elf_tdata (abfd)->stack_flags = PF_R | PF_W | PF_X;
else
elf_tdata (abfd)->stack_flags = PF_R | PF_W;
}
}
if ((s->flags & SEC_LOAD) != 0
&& CONST_STRNEQ (s->name, ".note"))
{
@ -3364,6 +3377,12 @@ get_program_header_size (bfd *abfd, struct bfd_link_info *info)
}
}
if (elf_tdata (abfd)->stack_flags)
{
/* We need a PT_GNU_ATTR segment. */
++segs;
}
for (s = abfd->sections; s != NULL; s = s->next)
{
if (s->flags & SEC_THREAD_LOCAL)
@ -3375,7 +3394,6 @@ get_program_header_size (bfd *abfd, struct bfd_link_info *info)
}
/* Let the backend count up any program headers it might need. */
bed = get_elf_backend_data (abfd);
if (bed->elf_backend_additional_program_headers)
{
int a;
@ -3520,6 +3538,7 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
asection *first_tls = NULL;
asection *dynsec, *eh_frame_hdr;
bfd_size_type amt;
asection *attr = NULL;
/* Select the allocated sections, and sort them. */
@ -3530,6 +3549,12 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
i = 0;
for (s = abfd->sections; s != NULL; s = s->next)
{
if (elf_section_type (s) == bed->obj_attrs_section_type)
{
BFD_ASSERT (attr == NULL);
attr = s;
}
if ((s->flags & SEC_ALLOC) != 0)
{
sections[i] = s;
@ -3843,10 +3868,17 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
if (m == NULL)
goto error_return;
m->next = NULL;
m->p_type = PT_GNU_STACK;
m->p_type = PT_GNU_ATTR;
m->p_flags = elf_tdata (abfd)->stack_flags;
m->p_flags_valid = 1;
if (attr)
{
/* Add the attribute section if needed. */
m->count = 1;
m->sections[0] = attr;
}
*pm = m;
pm = &m->next;
}
@ -5033,31 +5065,33 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd)
2. It is an allocated segment,
3. There is an output section associated with it,
4. The section has not already been allocated to a previous segment.
5. PT_GNU_STACK segments do not include any sections.
5. PT_GNU_ATTR only contains attribute section.
6. PT_TLS segment includes only SHF_TLS sections.
7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments.
8. PT_DYNAMIC should not contain empty sections at the beginning
(with the possible exception of .dynamic). */
#define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed) \
((((segment->p_paddr \
? IS_CONTAINED_BY_LMA (section, segment, segment->p_paddr) \
: IS_CONTAINED_BY_VMA (section, segment)) \
&& (section->flags & SEC_ALLOC) != 0) \
|| IS_COREFILE_NOTE (segment, section)) \
&& segment->p_type != PT_GNU_STACK \
&& (segment->p_type != PT_TLS \
|| (section->flags & SEC_THREAD_LOCAL)) \
&& (segment->p_type == PT_LOAD \
|| segment->p_type == PT_TLS \
|| (section->flags & SEC_THREAD_LOCAL) == 0) \
&& (segment->p_type != PT_DYNAMIC \
|| SECTION_SIZE (section, segment) > 0 \
|| (segment->p_paddr \
? segment->p_paddr != section->lma \
: segment->p_vaddr != section->vma) \
|| (strcmp (bfd_get_section_name (ibfd, section), ".dynamic") \
== 0)) \
&& ! section->segment_mark)
((segment->p_type == PT_GNU_ATTR \
&& elf_section_type (section) == bed->obj_attrs_section_type) \
|| ((((segment->p_paddr \
? IS_CONTAINED_BY_LMA (section, segment, segment->p_paddr) \
: IS_CONTAINED_BY_VMA (section, segment)) \
&& (section->flags & SEC_ALLOC) != 0) \
|| IS_COREFILE_NOTE (segment, section)) \
&& segment->p_type != PT_GNU_ATTR \
&& (segment->p_type != PT_TLS \
|| (section->flags & SEC_THREAD_LOCAL)) \
&& (segment->p_type == PT_LOAD \
|| segment->p_type == PT_TLS \
|| (section->flags & SEC_THREAD_LOCAL) == 0) \
&& (segment->p_type != PT_DYNAMIC \
|| SECTION_SIZE (section, segment) > 0 \
|| (segment->p_paddr \
? segment->p_paddr != section->lma \
: segment->p_vaddr != section->vma) \
|| (strcmp (bfd_get_section_name (ibfd, section), \
".dynamic") == 0)) \
&& ! section->segment_mark))
/* If the output section of a section in the input segment is NULL,
it is removed from the corresponding output segment. */

5
binutils/ChangeLog
View File

@ -1,3 +1,8 @@
2007-08-16 H.J. Lu <hongjiu.lu@intel.com>
* readelf.c (get_segment_type): Change PT_GNU_STACK to
PT_GNU_ATTR.
2007-08-12 Daniel Jacobowitz <dan@codesourcery.com>
* NEWS: Add a marker for the 2.18 features.

2
binutils/readelf.c
View File

@ -2467,7 +2467,7 @@ get_segment_type (unsigned long p_type)
case PT_GNU_EH_FRAME:
return "GNU_EH_FRAME";
case PT_GNU_STACK: return "GNU_STACK";
case PT_GNU_ATTR: return "GNU_ATTR";
case PT_GNU_RELRO: return "GNU_RELRO";
default:

6
include/elf/ChangeLog
View File

@ -1,3 +1,9 @@
2007-08-16 H.J. Lu <hongjiu.lu@intel.com>
* common.h (PT_GNU_STACK): Renamed to ...
(PT_GNU_ATTR): This.
(PT_GNU_STACK): New. Make an alias of PT_GNU_ATTR.
2007-07-09 Roland McGrath <roland@redhat.com>
* common.h (NT_GNU_HWCAP, NT_GNU_BUILD_ID): New macros.

3
include/elf/common.h
View File

@ -307,7 +307,8 @@
#define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550) /* Frame unwind information */
#define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME /* Solaris uses the same value */
#define PT_GNU_STACK (PT_LOOS + 0x474e551) /* Stack flags */
#define PT_GNU_ATTR (PT_LOOS + 0x474e551) /* Attribute info */
#define PT_GNU_STACK PT_GNU_ATTR /* Stack flags */
#define PT_GNU_RELRO (PT_LOOS + 0x474e552) /* Read-only after relocation */
/* Program segment permissions, in program header p_flags field. */

Write Preview
Loading…
Cancel
Save