aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-nios2.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1be9e53..a969c98 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-20 Chung-Lin Tang <cltang@codesourcery.com>
+
+ Backport from master
+ * elf32-nios2.c (elf_backend_default_execstack): Define as 0.
+
2014-11-24 Tejas Belagod <tejas.belagod@arm.com>
* elfnn-aarch64.c (elf_aarch64_compare_mapping): New.
diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c
index a6c6720..20d5e6b 100644
--- a/bfd/elf32-nios2.c
+++ b/bfd/elf32-nios2.c
@@ -4132,5 +4132,6 @@ const struct bfd_elf_special_section elf32_nios2_special_sections[] =
#define TARGET_BIG_NAME "elf32-bignios2"
#define elf_backend_got_header_size 12
+#define elf_backend_default_execstack 0
#include "elf32-target.h"