From: Uros Bizjak <ubizjak@gmail.com>
Date: Wed, 18 May 2016 16:00:43 +0000 (+0200)
Subject: re PR target/71161 (Lots of ASAN and libgo runtime FAILs after r236090)
X-Git-Tag: releases/gcc-4.9.4~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d595e4be1ebaf5e67a57263d90c7c14a872434d;p=thirdparty%2Fgcc.git

re PR target/71161 (Lots of ASAN and libgo runtime FAILs after r236090)

	PR target/71161
	* elf.c (phdr_callback) [__i386__]: Add
	__attribute__((__force_align_arg_pointer__)).

From-SVN: r236412
---

diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index 0a0fa7abbfda..836426af9cc7 100644
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,9 @@
+2016-05-18  Uros Bizjak  <ubizjak@gmail.com>
+
+	PR target/71161
+	* elf.c (phdr_callback) [__i386__]: Add
+	__attribute__((__force_align_arg_pointer__)).
+
 2015-06-26  Release Manager
 
 	* GCC 4.9.3 released.
diff --git a/libbacktrace/elf.c b/libbacktrace/elf.c
index e63aaf5dbdfe..4c4e7cd0bb49 100644
--- a/libbacktrace/elf.c
+++ b/libbacktrace/elf.c
@@ -867,6 +867,9 @@ struct phdr_data
    libraries.  */
 
 static int
+#ifdef __i386__
+__attribute__ ((__force_align_arg_pointer__))
+#endif
 phdr_callback (struct dl_phdr_info *info, size_t size ATTRIBUTE_UNUSED,
 	       void *pdata)
 {