From 8c6845782707f98080fa789050c9d70afadb1842 Mon Sep 17 00:00:00 2001 From: Jie Zhang Date: Fri, 11 Jul 2008 19:24:39 +0000 Subject: [PATCH] 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. --- bfd/ChangeLog | 12 +++++++ bfd/elf.c | 17 ++++++++++ bfd/elf32-bfin.c | 27 +++++++++++++++ binutils/ChangeLog | 5 +++ binutils/readelf.c | 15 +++++++++ include/ChangeLog | 7 ++++ include/bfdlink.h | 3 ++ include/elf/bfin.h | 3 ++ ld/ChangeLog | 16 +++++++++ ld/Makefile.am | 4 +-- ld/Makefile.in | 4 +-- ld/emulparams/bfin.sh | 1 + ld/emulparams/elf32bfinfd.sh | 21 ++++++++++++ ld/emultempl/bfin.em | 64 ++++++++++++++++++++++++++++++++++++ ld/gen-doc.texi | 1 + ld/ld.texinfo | 36 ++++++++++++++++++++ ld/ldmain.c | 1 + ld/lexsup.c | 6 ++++ 18 files changed, 239 insertions(+), 4 deletions(-) create mode 100644 ld/emultempl/bfin.em diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f838cbf5c75..c37f13e0d52 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,15 @@ +2008-07-12 Jie Zhang + + * 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. + 2008-07-11 Andreas Schwab * dwarf2.c (read_section): Take pointer to bfd_size_type instead diff --git a/bfd/elf.c b/bfd/elf.c index d65c78d963a..f066c7ca58c 100644 --- a/bfd/elf.c +++ b/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) diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c index f83abd28acc..480feb2d30e 100644 --- a/bfd/elf32-bfin.c +++ b/bfd/elf32-bfin.c @@ -1119,6 +1119,22 @@ bfin_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED, return (reloc_howto_type *) NULL; } +/* Set by ld emulation if --code-in-l1. */ +bfd_boolean elf32_bfin_code_in_l1 = 0; + +/* Set by ld emulation if --data-in-l1. */ +bfd_boolean elf32_bfin_data_in_l1 = 0; + +static void +elf32_bfin_final_write_processing (bfd *abfd, + bfd_boolean linker ATTRIBUTE_UNUSED) +{ + if (elf32_bfin_code_in_l1) + elf_elfheader (abfd)->e_flags |= EF_BFIN_CODE_IN_L1; + if (elf32_bfin_data_in_l1) + elf_elfheader (abfd)->e_flags |= EF_BFIN_DATA_IN_L1; +} + /* Return TRUE if the name is a local label. bfin local labels begin with L$. */ static bfd_boolean @@ -5572,6 +5588,14 @@ error_return: free (internal_relocs); return FALSE; } + +struct bfd_elf_special_section const elf32_bfin_special_sections[] = +{ + { ".l1.text", 8, -2, SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR }, + { ".l1.data", 8, -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE }, + { NULL, 0, 0, 0, 0 } +}; + #define TARGET_LITTLE_SYM bfd_elf32_bfin_vec #define TARGET_LITTLE_NAME "elf32-bfin" @@ -5618,8 +5642,11 @@ error_return: elf32_bfin_set_private_flags #define bfd_elf32_bfd_print_private_bfd_data \ elf32_bfin_print_private_bfd_data +#define elf_backend_final_write_processing \ + elf32_bfin_final_write_processing #define elf_backend_reloc_type_class elf32_bfin_reloc_type_class #define elf_backend_can_gc_sections 1 +#define elf_backend_special_sections elf32_bfin_special_sections #define elf_backend_can_refcount 1 #define elf_backend_want_got_plt 0 #define elf_backend_plt_readonly 1 diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 8491b0765e4..e0f1d8c12aa 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2008-07-12 Jie Zhang + + * readelf.c (get_machine_flags): Deal with Blackfin specific + flags. + 2008-07-09 Craig Silverstein * config.in: Add HAVE_ZLIB_H diff --git a/binutils/readelf.c b/binutils/readelf.c index 8a38db747af..789287f3785 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -2140,6 +2140,21 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) decode_ARM_machine_flags (e_flags, buf); break; + case EM_BLACKFIN: + if (e_flags & EF_BFIN_PIC) + strcat (buf, ", PIC"); + + if (e_flags & EF_BFIN_FDPIC) + strcat (buf, ", FDPIC"); + + if (e_flags & EF_BFIN_CODE_IN_L1) + strcat (buf, ", code in L1"); + + if (e_flags & EF_BFIN_DATA_IN_L1) + strcat (buf, ", data in L1"); + + break; + case EM_CYGNUS_FRV: switch (e_flags & EF_FRV_CPU_MASK) { diff --git a/include/ChangeLog b/include/ChangeLog index 6a433eafb58..1cc6fc5f7ac 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,10 @@ +2008-07-12 Jie Zhang + + * 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. + 2008-07-07 Stan Shebs * dis-asm.h (struct disassemble_info): Add endian_code field. diff --git a/include/bfdlink.h b/include/bfdlink.h index e6833102839..d22519a1d11 100644 --- a/include/bfdlink.h +++ b/include/bfdlink.h @@ -346,6 +346,9 @@ struct bfd_link_info /* Non-NULL if .note.gnu.build-id section should be created. */ char *emit_note_gnu_build_id; + /* TRUE if putting code into separate segment. */ + unsigned int sep_code: 1; + /* What to do with unresolved symbols in an object file. When producing executables the default is GENERATE_ERROR. When producing shared libraries the default is IGNORE. The diff --git a/include/elf/bfin.h b/include/elf/bfin.h index 3c07cd166c8..523db9b53a3 100644 --- a/include/elf/bfin.h +++ b/include/elf/bfin.h @@ -88,5 +88,8 @@ END_RELOC_NUMBERS (R_max) #define EF_BFIN_PIC 0x00000001 /* -fpic */ #define EF_BFIN_FDPIC 0x00000002 /* -mfdpic */ +#define EF_BFIN_CODE_IN_L1 0x00000010 /* --code-in-l1 */ +#define EF_BFIN_DATA_IN_L1 0x00000020 /* --data-in-l1 */ + #define EF_BFIN_PIC_FLAGS (EF_BFIN_PIC | EF_BFIN_FDPIC) #endif /* _ELF_BFIN_H */ diff --git a/ld/ChangeLog b/ld/ChangeLog index 8e6d62a3b5e..91bae6728e0 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,19 @@ +2008-07-12 Jie Zhang + + * 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. + 2008-07-09 Danny Smith *pe-dll.c (autofilter_symbolprefixlist): Excude all symbols diff --git a/ld/Makefile.am b/ld/Makefile.am index 80c53d85954..fe8edf09732 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -653,11 +653,11 @@ edelta68.c: $(srcdir)/emulparams/delta68.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/delta68.sc ${GEN_DEPENDS} ${GENSCRIPTS} delta68 "$(tdir_delta68)" eelf32bfin.c: $(srcdir)/emulparams/bfin.sh \ - $(ELF_DEPS) \ + $(ELF_DEPS) $(srcdir)/emultempl/bfin.em \ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32bfin "$(tdir_elf32bfin)" bfin eelf32bfinfd.c: $(srcdir)/emulparams/elf32bfinfd.sh $(srcdir)/emulparams/bfin.sh \ - $(ELF_DEPS) \ + $(ELF_DEPS) $(srcdir)/emultempl/bfin.em \ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32bfinfd "$(tdir_elf32bfinfd)" elf32bfinfd eelf32_dlx.c: $(srcdir)/emulparams/elf32_dlx.sh \ diff --git a/ld/Makefile.in b/ld/Makefile.in index 94e5d68ec14..06b48469117 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -1482,11 +1482,11 @@ edelta68.c: $(srcdir)/emulparams/delta68.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/delta68.sc ${GEN_DEPENDS} ${GENSCRIPTS} delta68 "$(tdir_delta68)" eelf32bfin.c: $(srcdir)/emulparams/bfin.sh \ - $(ELF_DEPS) \ + $(ELF_DEPS) $(srcdir)/emultempl/bfin.em \ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32bfin "$(tdir_elf32bfin)" bfin eelf32bfinfd.c: $(srcdir)/emulparams/elf32bfinfd.sh $(srcdir)/emulparams/bfin.sh \ - $(ELF_DEPS) \ + $(ELF_DEPS) $(srcdir)/emultempl/bfin.em \ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32bfinfd "$(tdir_elf32bfinfd)" elf32bfinfd eelf32_dlx.c: $(srcdir)/emulparams/elf32_dlx.sh \ diff --git a/ld/emulparams/bfin.sh b/ld/emulparams/bfin.sh index 1c764e8f9af..f33baf56059 100755 --- a/ld/emulparams/bfin.sh +++ b/ld/emulparams/bfin.sh @@ -10,3 +10,4 @@ TEMPLATE_NAME=elf32 GENERATE_SHLIB_SCRIPT=yes EMBEDDED=yes USER_LABEL_PREFIX=_ +EXTRA_EM_FILE=bfin diff --git a/ld/emulparams/elf32bfinfd.sh b/ld/emulparams/elf32bfinfd.sh index 19ec748b7fb..588a53f9b24 100644 --- a/ld/emulparams/elf32bfinfd.sh +++ b/ld/emulparams/elf32bfinfd.sh @@ -14,3 +14,24 @@ OTHER_READONLY_SECTIONS=" ${RELOCATING+__ROFIXUP_END__ = .;} } " +# 0xff700000, 0xff800000, 0xff900000 and 0xffa00000 are also used in +# Dynamic linker and linux kernel. They need to be keep synchronized. +OTHER_SECTIONS=" + .l1.data 0xff700000 : + { + *(.l1.data) + } + .l1.data.A 0xff800000 : + { + *(.l1.data.A) + } + .l1.data.B 0xff900000 : + { + *(.l1.data.B) + } + .l1.text 0xffa00000 : + { + *(.l1.text) + } +" +EXTRA_EM_FILE=bfin diff --git a/ld/emultempl/bfin.em b/ld/emultempl/bfin.em new file mode 100644 index 00000000000..326537d1601 --- /dev/null +++ b/ld/emultempl/bfin.em @@ -0,0 +1,64 @@ +# This shell script emits a C file. -*- C -*- +# Copyright 2006 Free Software Foundation, Inc. +# +# This file is part of GLD, the Gnu Linker. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. +# + +# This file is sourced from elf32.em, and defines extra bfin-elf +# specific routines. +# +cat >>e${EMULATION_NAME}.c <