From: Marc <marc@groundctl.com>
Date: Fri, 9 Nov 2018 11:13:50 +0000 (+0000)
Subject: Allow for compilers that do not produce aligned .rdat sections in PE format files.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=73af69e74974eaa155eec89867e3ccc77ab39f6d;p=binutils-gdb.git

Allow for compilers that do not produce aligned .rdat sections in PE format files.

	PR 23872
	* scripttempl/pep.sc (pe.sc): Ensure rdata_runtime_pseudo_relocs
	are aligned.
	* scripttempl/pep.sc (pep.sc): Likewise.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0346ebbf13c..840983b41d6 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2018-11-09  Marc  <marc@groundctl.com>
+
+	PR 23872
+	* scripttempl/pep.sc (pe.sc): Ensure rdata_runtime_pseudo_relocs
+	are aligned.
+	* scripttempl/pep.sc (pep.sc): Likewise.
+
 2018-11-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* testsuite/config/default.exp (ELFEDIT): New.
diff --git a/ld/scripttempl/pe.sc b/ld/scripttempl/pe.sc
index 8fdeaff60ee..2968f8ec2d0 100644
--- a/ld/scripttempl/pe.sc
+++ b/ld/scripttempl/pe.sc
@@ -161,6 +161,7 @@ SECTIONS
   .rdata ${RELOCATING+BLOCK(__section_alignment__)} :
   {
     ${R_RDATA}
+    . = ALIGN(4);
     ${RELOCATING+__rt_psrelocs_start = .;}
     ${RELOCATING+KEEP(*(.rdata_runtime_pseudo_reloc))}
     ${RELOCATING+__rt_psrelocs_end = .;}
diff --git a/ld/scripttempl/pep.sc b/ld/scripttempl/pep.sc
index a7157dcdcc2..cdef041183e 100644
--- a/ld/scripttempl/pep.sc
+++ b/ld/scripttempl/pep.sc
@@ -161,6 +161,7 @@ SECTIONS
   .rdata ${RELOCATING+BLOCK(__section_alignment__)} :
   {
     ${R_RDATA}
+    . = ALIGN(4);
     ${RELOCATING+__rt_psrelocs_start = .;}
     ${RELOCATING+KEEP(*(.rdata_runtime_pseudo_reloc))}
     ${RELOCATING+__rt_psrelocs_end = .;}