From: H.J. Lu <hjl.tools@gmail.com>
Date: Tue, 12 Jul 2016 22:33:47 +0000 (-0700)
Subject: Align x86-64 .got/.got.plt sections to 8 bytes
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=37567a2cdd8823c5700ec83b757179083446bf07;p=deliverable%2Fbinutils-gdb.git

Align x86-64 .got/.got.plt sections to 8 bytes

Align x86-64 .got and .got.plt sections to their entry size.

	* elf64-x86-64.c (elf_x86_64_create_dynamic_sections): Align
	.got/.got.plt sections to 8 bytes.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7898512b94..7f64146359 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_create_dynamic_sections): Align
+	.got/.got.plt sections to 8 bytes.
+
 2016-07-12  Nick Clifton  <nickc@redhat.com>
 
 	* binary.c (binary_set_section_contents): Second grammar fix.
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index f9202085b3..c8bbed8bc0 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -1162,6 +1162,17 @@ elf_x86_64_create_dynamic_sections (bfd *dynobj,
 	  || !bfd_set_section_alignment (dynobj, htab->plt_eh_frame, 3))
 	return FALSE;
     }
+
+  /* Align .got section to its entry size.  */
+  if (htab->elf.sgot != NULL
+      && !bfd_set_section_alignment (dynobj, htab->elf.sgot, 3))
+    return FALSE;
+
+  /* Align .got.plt section to its entry size.  */
+  if (htab->elf.sgotplt != NULL
+      && !bfd_set_section_alignment (dynobj, htab->elf.sgotplt, 3))
+    return FALSE;
+
   return TRUE;
 }