From: Roland McGrath <mcgrathr@google.com>
Date: Fri, 1 Nov 2013 21:37:46 +0000 (-0700)
Subject: *-*-nacl* layout: Drop requirement that some section have SEC_HAS_CONTENTS set.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=86e0565d9c985fa0ba46c85dbe6e77bcaf62dd33;p=binutils-gdb.git

*-*-nacl* layout: Drop requirement that some section have SEC_HAS_CONTENTS set.

bfd/
	* elf-nacl.c (segment_eligible_for_headers): Drop requirement that
	some section have SEC_HAS_CONTENTS set.  It's not set for
	.note.gnu.build-id, and a segment of only read-only SHT_NOBITS
	sections is implausible and not really supportable anyway.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ae0a0243281..4299ae1c736 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2013-11-01  Roland McGrath  <mcgrathr@google.com>
+
+	* elf-nacl.c (segment_eligible_for_headers): Drop requirement that
+	some section have SEC_HAS_CONTENTS set.  It's not set for
+	.note.gnu.build-id, and a segment of only read-only SHT_NOBITS
+	sections is implausible and not really supportable anyway.
+
 2013-10-30  Alan Modra  <amodra@gmail.com>
 
 	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Use new DT_PPC_OPT
diff --git a/bfd/elf-nacl.c b/bfd/elf-nacl.c
index 5ec11616c42..c46b4cba3b9 100644
--- a/bfd/elf-nacl.c
+++ b/bfd/elf-nacl.c
@@ -44,14 +44,13 @@ segment_executable (struct elf_segment_map *seg)
 }
 
 /* Determine if this segment is eligible to receive the file and program
-   headers.  It must be read-only, non-executable, and have contents.
+   headers.  It must be read-only and non-executable.
    Its first section must start far enough past the page boundary to
    allow space for the headers.  */
 static bfd_boolean
 segment_eligible_for_headers (struct elf_segment_map *seg,
 			      bfd_vma minpagesize, bfd_vma sizeof_headers)
 {
-  bfd_boolean any_contents = FALSE;
   unsigned int i;
   if (seg->count == 0 || seg->sections[0]->lma % minpagesize < sizeof_headers)
     return FALSE;
@@ -59,10 +58,8 @@ segment_eligible_for_headers (struct elf_segment_map *seg,
     {
       if ((seg->sections[i]->flags & (SEC_CODE|SEC_READONLY)) != SEC_READONLY)
 	return FALSE;
-      if (seg->sections[i]->flags & SEC_HAS_CONTENTS)
-	any_contents = TRUE;
     }
-  return any_contents;
+  return TRUE;
 }