This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[1/2 PATCH][ARM] Change noread to purecode
- From: "Andre Vieira (lists)" <Andre dot SimoesDiasVieira at arm dot com>
- To: binutils at sourceware dot org
- Date: Thu, 30 Jun 2016 15:25:39 +0100
- Subject: [1/2 PATCH][ARM] Change noread to purecode
- Authentication-results: sourceware.org; auth=none
- References: <57752B58 dot 8030008 at arm dot com>
This patch changes the old noread attribute into the new purecode attribute.
bfd/ChangeLog
2016-06-30 Andre Vieria <andre.simoesdiasvieira@arm.com>
* bfd-in2.h (SEC_ELF_NOREAD): Rename to ...
(SEC_ELF_PURECODE): ... this.
* elf32-arm.c (elf32_arm_post_process_headers): Rename
SEC_ELF_NOREAD
to SEC_ELF_NOREAD.
(elf32_arm_fake_sections): Likewise.
(elf_32_arm_section_flags): Likewise.
(elf_32_arm_lookup_section_flags): Likewise.
* section.c (SEC_ELF_NOREAD): Rename to ...
(SEC_ELF_PURECODE): ... this.
binutils/ChangeLog
2016-06-30 Andre Vieria <andre.simoesdiasvieira@arm.com>
* objdump.c (dump_section_header): Rename SEC_ELF_NOREAD
to SEC_ELF_NOREAD.
* readelf.c (get_elf_section_flags): Rename ARM_NOREAD to
ARM_PURECODE and SHF_ARM_NOREAD to SHF_ARM_PURECODE.
(process_section_headers): Rename noread to purecode.
* section.c (SEC_ELF_NOREAD): Rename to ...
(SEC_ELF_PURECODE): ... this.
ChangeLog
2016-06-30 Andre Vieria <andre.simoesdiasvieira@arm.com>
* include/elf/arm.h (SHF_ARM_NOREAD): Rename to ...
(SHF_ARM_PURECODE): ... this.
ld/ChangeLog
2016-06-30 Andre Vieria <andre.simoesdiasvieira@arm.com>
* testsuite/ld-arm/arm_noread.ld: Renamed to ...
testsuite/ld-arm/arm_purecode.ld: ... this, and replaced
all noread's by purecode.
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 30513c4c3f39f7829ad0ea0e87f21b374994ddb0..3f2d93b03cd477222914058b88dd49a23268fb87 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1428,8 +1428,8 @@ typedef struct bfd_section
when memory read flag isn't set. */
#define SEC_COFF_NOREAD 0x40000000
- /* Indicate that section has the no read flag set. */
-#define SEC_ELF_NOREAD 0x80000000
+ /* Indicate that section has the purecode flag set. */
+#define SEC_ELF_PURECODE 0x80000000
/* End of section flags. */
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 3d4a458fe46b2f2e0674ff31d95fa57dab51999c..d7cff9bd85e0b9693b3ce9134184938a24b6b941 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -15794,7 +15794,7 @@ elf32_arm_post_process_headers (bfd * abfd, struct bfd_link_info * link_info ATT
}
/* Scan segment to set p_flags attribute if it contains only sections with
- SHF_ARM_NOREAD flag. */
+ SHF_ARM_PURECODE flag. */
for (m = elf_seg_map (abfd); m != NULL; m = m->next)
{
unsigned int j;
@@ -15803,7 +15803,7 @@ elf32_arm_post_process_headers (bfd * abfd, struct bfd_link_info * link_info ATT
continue;
for (j = 0; j < m->count; j++)
{
- if (!(elf_section_flags (m->sections[j]) & SHF_ARM_NOREAD))
+ if (!(elf_section_flags (m->sections[j]) & SHF_ARM_PURECODE))
break;
}
if (j == m->count)
@@ -15866,8 +15866,8 @@ elf32_arm_fake_sections (bfd * abfd, Elf_Internal_Shdr * hdr, asection * sec)
hdr->sh_flags |= SHF_LINK_ORDER;
}
- if (sec->flags & SEC_ELF_NOREAD)
- hdr->sh_flags |= SHF_ARM_NOREAD;
+ if (sec->flags & SEC_ELF_PURECODE)
+ hdr->sh_flags |= SHF_ARM_PURECODE;
return TRUE;
}
@@ -18153,16 +18153,16 @@ elf32_arm_get_synthetic_symtab (bfd *abfd,
static bfd_boolean
elf32_arm_section_flags (flagword *flags, const Elf_Internal_Shdr * hdr)
{
- if (hdr->sh_flags & SHF_ARM_NOREAD)
- *flags |= SEC_ELF_NOREAD;
+ if (hdr->sh_flags & SHF_ARM_PURECODE)
+ *flags |= SEC_ELF_PURECODE;
return TRUE;
}
static flagword
elf32_arm_lookup_section_flags (char *flag_name)
{
- if (!strcmp (flag_name, "SHF_ARM_NOREAD"))
- return SHF_ARM_NOREAD;
+ if (!strcmp (flag_name, "SHF_ARM_PURECODE"))
+ return SHF_ARM_PURECODE;
return SEC_NO_FLAGS;
}
diff --git a/bfd/section.c b/bfd/section.c
index f0a66b247e967f1275496b05b1b0f1142d4f1aa1..70cb267910a07c34435689f7f0a361637627efd1 100644
--- a/bfd/section.c
+++ b/bfd/section.c
@@ -361,8 +361,8 @@ CODE_FRAGMENT
. when memory read flag isn't set. *}
.#define SEC_COFF_NOREAD 0x40000000
.
-. {* Indicate that section has the no read flag set. *}
-.#define SEC_ELF_NOREAD 0x80000000
+. {* Indicate that section has the purecode flag set. *}
+.#define SEC_ELF_PURECODE 0x80000000
.
. {* End of section flags. *}
.
diff --git a/binutils/objdump.c b/binutils/objdump.c
index bf9c5923f17bfe2a6e1a36b8cd36c7a66eb97fc1..29d2276f6c27b9a9bfb157c587676872da8d964d 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -493,12 +493,7 @@ dump_section_header (bfd *abfd, asection *section,
PF (SEC_COFF_NOREAD, "NOREAD");
}
else if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
- {
- /* Note - sections can have both the READONLY and NOREAD attributes
- set. In this case the NOREAD takes precedence, but we report both
- since the user may need to know that both bits are set. */
- PF (SEC_ELF_NOREAD, "NOREAD");
- }
+ PF (SEC_ELF_PURECODE, "PURECODE");
PF (SEC_THREAD_LOCAL, "THREAD_LOCAL");
PF (SEC_GROUP, "GROUP");
if (bfd_get_arch (abfd) == bfd_arch_mep)
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 274ddd17266aef6e4ad1f67af8a13a21500ff2af..4c7ad4c99c3e0e6dd1fa4849a3fceb1c53367211 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -5399,7 +5399,7 @@ get_elf_section_flags (bfd_vma sh_flags)
/* 20 */ { STRING_COMMA_LEN ("COMPRESSED") },
/* ARM specific. */
/* 21 */ { STRING_COMMA_LEN ("ENTRYSECT") },
- /* 22 */ { STRING_COMMA_LEN ("ARM_NOREAD") },
+ /* 22 */ { STRING_COMMA_LEN ("ARM_PURECODE") },
/* 23 */ { STRING_COMMA_LEN ("COMDEF") }
};
@@ -5475,7 +5475,7 @@ get_elf_section_flags (bfd_vma sh_flags)
switch (flag)
{
case SHF_ENTRYSECT: sindex = 21; break;
- case SHF_ARM_NOREAD: sindex = 22; break;
+ case SHF_ARM_PURECODE: sindex = 22; break;
case SHF_COMDEF: sindex = 23; break;
default: break;
}
@@ -5534,7 +5534,7 @@ get_elf_section_flags (bfd_vma sh_flags)
&& flag == SHF_X86_64_LARGE)
*p = 'l';
else if (elf_header.e_machine == EM_ARM
- && flag == SHF_ARM_NOREAD)
+ && flag == SHF_ARM_PURECODE)
*p = 'y';
else if (flag & SHF_MASKOS)
{
@@ -6118,7 +6118,7 @@ process_section_headers (FILE * file)
|| elf_header.e_machine == EM_K1OM)
printf (_("l (large), "));
else if (elf_header.e_machine == EM_ARM)
- printf (_("y (noread), "));
+ printf (_("y (purecode), "));
printf ("p (processor specific)\n");
}
diff --git a/include/elf/arm.h b/include/elf/arm.h
index bafc03c52ee686671e847eff272ab5cc8a79398c..27ce6b88ce5110e737573458af887b92ea4c1ffc 100644
--- a/include/elf/arm.h
+++ b/include/elf/arm.h
@@ -82,7 +82,7 @@
/* ARM-specific values for sh_flags. */
#define SHF_ENTRYSECT 0x10000000 /* Section contains an entry point. */
-#define SHF_ARM_NOREAD 0x20000000 /* Section contains code that can be place on no read memory area. */
+#define SHF_ARM_PURECODE 0x20000000 /* Section contains only code and no data. */
#define SHF_COMDEF 0x80000000 /* Section may be multiply defined in the input to a link step. */
/* ARM-specific program header flags. */
diff --git a/ld/testsuite/ld-arm/arm_noread.ld b/ld/testsuite/ld-arm/arm_purecode.ld
similarity index 77%
rename from ld/testsuite/ld-arm/arm_noread.ld
rename to ld/testsuite/ld-arm/arm_purecode.ld
index 3ff17bc834bc0b41de3884081f4a4de879908850..195aca1be93374774c4b5d406e28865c35735a7c 100644
--- a/ld/testsuite/ld-arm/arm_noread.ld
+++ b/ld/testsuite/ld-arm/arm_purecode.ld
@@ -4,16 +4,16 @@ ENTRY(_start)
MEMORY
{
read_memory (rx) : ORIGIN = 0x00008000, LENGTH = 4M
- noread_memory (!rx) : ORIGIN = 0x00800000, LENGTH = 4M
+ purecode_memory (!rx) : ORIGIN = 0x00800000, LENGTH = 4M
}
SECTIONS
{
/* Read-only sections, merged into text segment: */
PROVIDE (__executable_start = 0x8000); . = 0x8000;
- .text.noread :
+ .text.purecode :
{
- INPUT_SECTION_FLAGS (SHF_ARM_NOREAD) *(.text*)
- } > noread_memory
+ INPUT_SECTION_FLAGS (SHF_ARM_PURECODE) *(.text*)
+ } > purecode_memory
.text :
{
*(.before)