From: Doug Kwan <dougkwan@google.com>
Date: Tue, 8 May 2012 17:18:21 +0000 (+0000)
Subject: 2012-05-08  Ben Cheng  <bccheng@google.com>
X-Git-Tag: sid-snapshot-20120601~290
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d16d28e5c20aacc9637f589558c118d6fe1a17c;p=thirdparty%2Fbinutils-gdb.git

2012-05-08  Ben Cheng  <bccheng@google.com>

	* bfd/elf.c: Preserve the original p_align and p_flags if they are
	valid.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f695aef0d4a..4c49cf9b59d 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-08  Ben Cheng  <bccheng@google.com>
+
+	* bfd/elf.c: Preserve the original p_align and p_flags if they are
+	valid.
+
 2012-05-07  Alan Modra  <amodra@gmail.com>
 
 	* elf64-ia64-vms.c (elf64_ia64_relocate_section): Update
diff --git a/bfd/elf.c b/bfd/elf.c
index d040d147000..9481c0e1d56 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -4931,8 +4931,14 @@ assign_file_positions_for_non_load_sections (bfd *abfd,
 	      else
 		abort ();
 	      p->p_memsz = p->p_filesz;
-	      p->p_align = 1;
-	      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
 	    {