aboutsummaryrefslogtreecommitdiff
path: root/libbacktrace
diff options
context:
space:
mode:
authorYvan Roux <yvan.roux@linaro.org>2016-06-15 10:42:05 +0200
committerYvan Roux <yvan.roux@linaro.org>2016-06-15 10:42:05 +0200
commit336d434c49ee9e0c0ea775026ca98f1906cf80e3 (patch)
tree2174a9491fbaab919df3d9092c23aac341d2220f /libbacktrace
parent4df3f0b0fea4f3fca1837070c27ec872f4500931 (diff)
Merge branches/gcc-6-branch rev 237469.
Change-Id: I4891542fc1d8fd3bb75e92a8805a8d069022b522
Diffstat (limited to 'libbacktrace')
-rw-r--r--libbacktrace/ChangeLog11
-rw-r--r--libbacktrace/elf.c3
2 files changed, 12 insertions, 2 deletions
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index ece9eac2c05..b4e0199a4b8 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__)).
+
2016-04-27 Release Manager
* GCC 6.1.0 released.
@@ -19,12 +25,13 @@
2015-12-18 Andris Pavenis <andris.pavenis@iki.fi>
- * configure.ac: Specify that DJGPP do not have mmap even when sys/mman.h exists
+ * configure.ac: Specify that DJGPP do not have mmap
+ even when sys/mman.h exists.
* configure: Regenerate
2015-12-09 John David Anglin <danglin@gcc.gnu.org>
- PR 68115/libfortran
+ PR libgfortran/68115
* configure.ac: Set libbacktrace_cv_sys_sync to no on hppa*-*-hpux*.
* configure: Regenerate.
* elf.c (backtrace_initialize): Cast __sync_bool_compare_and_swap call
diff --git a/libbacktrace/elf.c b/libbacktrace/elf.c
index f85ac65d99f..81ba3440ab7 100644
--- a/libbacktrace/elf.c
+++ b/libbacktrace/elf.c
@@ -866,6 +866,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)
{