forked from Imagelibrary/binutils-gdb
bfd/
* elf.c (_bfd_elf_map_sections_to_segments): Don't put executable sections into the same segment with other read only sections if --sep-code. * elf32-bfin.c (elf32_bfin_code_in_l1): New variable. (elf32_bfin_data_in_l1): New variable. (elf32_bfin_final_write_processing): New. (elf32_bfin_special_sections[]): New. (elf_backend_final_write_processing): Define. (elf_backend_special_sections): Define. binutils/ * readelf.c (get_machine_flags): Deal with Blackfin specific flags. include/ * bfdlink.h (struct bfd_link_info): Add sep_code member variable. * elf/bfin.h (EF_BFIN_CODE_IN_L1): Define. (EF_BFIN_DATA_IN_L1): Define. ld/ * Makefile.am (eelf32bfin.c): Depend on bfin.em. (eelf32bfinfd.c): Likewise. * Makefile.in: Regenerate. * gen-doc.texi: Set Blackfin. * ld.texinfo: Document --sep-code and Blackfin specific options. * ldmain.c (main): Initialize link_info.sep_code. * lexsup.c (enum option_values): Add OPTION_SEP_CODE. (ld_options[]): Add --sep-code. (parse_args): Deal with --sep-code. * emulparams/bfin.sh (EXTRA_EM_FILE): Define. * emulparams/elf32bfinfd.sh (OTHER_SECTIONS): Define. * emultempl/bfin.em: New file.
This commit is contained in:
17
bfd/elf.c
17
bfd/elf.c
@@ -3605,6 +3605,7 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
|
||||
asection **hdrpp;
|
||||
bfd_boolean phdr_in_segment = TRUE;
|
||||
bfd_boolean writable;
|
||||
bfd_boolean executable;
|
||||
int tls_count = 0;
|
||||
asection *first_tls = NULL;
|
||||
asection *dynsec, *eh_frame_hdr;
|
||||
@@ -3676,6 +3677,7 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
|
||||
phdr_index = 0;
|
||||
maxpagesize = bed->maxpagesize;
|
||||
writable = FALSE;
|
||||
executable = FALSE;
|
||||
dynsec = bfd_get_section_by_name (abfd, ".dynamic");
|
||||
if (dynsec != NULL
|
||||
&& (dynsec->flags & SEC_LOAD) == 0)
|
||||
@@ -3757,6 +3759,14 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
|
||||
ends precisely on a page boundary. */
|
||||
new_segment = TRUE;
|
||||
}
|
||||
else if (info->sep_code
|
||||
&& ((! executable && (hdr->flags & SEC_CODE) != 0)
|
||||
|| (executable && (hdr->flags & SEC_CODE) == 0)))
|
||||
{
|
||||
/* We don't want to put a executable section in a non-executable
|
||||
segment. */
|
||||
new_segment = TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Otherwise, we can use the same segment. */
|
||||
@@ -3771,6 +3781,8 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
|
||||
{
|
||||
if ((hdr->flags & SEC_READONLY) == 0)
|
||||
writable = TRUE;
|
||||
if ((hdr->flags & SEC_CODE) != 0)
|
||||
executable = TRUE;
|
||||
last_hdr = hdr;
|
||||
/* .tbss sections effectively have zero size. */
|
||||
if ((hdr->flags & (SEC_THREAD_LOCAL | SEC_LOAD))
|
||||
@@ -3796,6 +3808,11 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
|
||||
else
|
||||
writable = FALSE;
|
||||
|
||||
if ((hdr->flags & SEC_CODE) != 0)
|
||||
executable = TRUE;
|
||||
else
|
||||
executable = FALSE;
|
||||
|
||||
last_hdr = hdr;
|
||||
/* .tbss sections effectively have zero size. */
|
||||
if ((hdr->flags & (SEC_THREAD_LOCAL | SEC_LOAD)) != SEC_THREAD_LOCAL)
|
||||
|
||||
Reference in New Issue
Block a user