PATCH: Reindent assign_file_positions_for_non_load_sections

[H.J. Lu]

On Mon, Jun 11, 2012 at 09:44:51AM -0700, H.J. Lu wrote:
> Hi,
> 
> I checked in this patch to reindent _bfd_elf_map_sections_to_segments.
> 

Another one.

H.J.
---
2012-06-11  H.J. Lu  <hongjiu.lu@intel.com>

	* elf.c (assign_file_positions_for_non_load_sections): Reindent.

diff --git a/bfd/elf.c b/bfd/elf.c
index d97da9f..6de314b 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -4949,14 +4949,15 @@ assign_file_positions_for_non_load_sections (bfd *abfd,
 	      else
 		abort ();
 	      p->p_memsz = p->p_filesz;
-          /* Preserve the alignment and flags if they are valid. The gold
-             linker generates RW/4 for the PT_GNU_RELRO section. It is better
-             for objcopy/strip to honor these attributes otherwise gdb will
-             choke when using separate debug files. */
-          if (!m->p_align_valid)
-            p->p_align = 1;
-          if (!m->p_flags_valid)
-            p->p_flags = (lp->p_flags & ~PF_W);
+	      /* Preserve the alignment and flags if they are valid. The
+	         gold linker generates RW/4 for the PT_GNU_RELRO section.
+		 It is better for objcopy/strip to honor these attributes
+		 otherwise gdb will choke when using separate debug files.
+	       */
+	      if (!m->p_align_valid)
+		p->p_align = 1;
+	      if (!m->p_flags_valid)
+		p->p_flags = (lp->p_flags & ~PF_W);
 	    }
 	  else
 	    {
diff --git a/patches/ChangeLog b/patches/ChangeLog
index 2e62b52..3660f41 100644
--- a/patches/ChangeLog
+++ b/patches/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-10  H.J. Lu  <hjl.tools@gmail.com>
+
+	* binutils-pr14215.patch: New.
+	* binutils-pr14207.patch: Likewise.
+	* README: Apply them.
+
 2012-06-09  H.J. Lu  <hjl.tools@gmail.com>
 
 	* binutils-sb.patch: Removed.
diff --git a/patches/README b/patches/README
index 667e473..b83a6f5 100644
--- a/patches/README
+++ b/patches/README
@@ -23,6 +23,8 @@ patches="
 	bfd-64k-2.patch
 	binutils-lto-mixed-18.patch
 	binutils-pr12639-2.patch
+	binutils-pr14215.patch
+	binutils-pr14207.patch
 "
 
 if [ -n "$clean" ]