commit 2245cc50640cda3d695525a2fdd935f227615af1
author Pirama Arumuga Nainar <pirama@google.com> Mon Oct 08 15:19:23 2018 -0700
committer Pirama Arumuga Nainar <pirama@google.com> Tue Oct 09 00:56:49 2018 +0000
tree e9e5e445d2e08c1c1881792da08581b41e3c285f
parent 44492f8e438f8ce42a254699ba8496eb76075e00

Align __CTOR_LIST__ to 4 bytes for windows x86

Bug: http://b/117439724

Without specifying alignment, if __CTOR_LIST__ is not aligned to 4
bytes, we end up with garbage after the -1.  This causes access
violations in __do_global_ctors.

The 64-bit version aligns it to 8 bytes (ld/scrpittempl/pep.sc).

Test: With this fix, AOSP Windows tools built with Clang + MinGW +
libc++ no longer crash.

Change-Id: I76be11a265cdcf272d740fa8715024f1f6df3e1b

binutils-2.27/ld/scripttempl/pe.sc

diff --git a/binutils-2.27/ld/scripttempl/pe.sc b/binutils-2.27/ld/scripttempl/pe.sc
index 59e4e89..299c4ad 100644
--- a/binutils-2.27/ld/scripttempl/pe.sc
+++ b/binutils-2.27/ld/scripttempl/pe.sc
@@ -92,6 +92,7 @@
     ${RELOCATING+ *(.gnu.linkonce.t.*)}
     *(.glue_7t)
     *(.glue_7)
+    ${CONSTRUCTING+. = ALIGN(4);}
     ${CONSTRUCTING+ ___CTOR_LIST__ = .; __CTOR_LIST__ = . ;
 			LONG (-1);*(.ctors); *(.ctor); *(SORT(.ctors.*));  LONG (0); }
     ${CONSTRUCTING+ ___DTOR_LIST__ = .; __DTOR_LIST__ = . ;