aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog4
-rw-r--r--gas/config/obj-elf.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0478ffe..3e3df65 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-30 Alan Modra <amodra@bigpond.net.au>
+
+ * config/obj-elf.c (obj_elf_change_section): Allow "x" for .note*.
+
2003-07-29 Alan Modra <amodra@bigpond.net.au>
* config/tc-sh.c (tc_gen_reloc): Test for R_SH_IND12W only when ELF.
diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c
index 7a2ad34..ec63baa 100644
--- a/gas/config/obj-elf.c
+++ b/gas/config/obj-elf.c
@@ -675,8 +675,9 @@ obj_elf_change_section (name, type, attr, entsize, group_name, linkonce, push)
/* As a GNU extension, we permit a .note section to be
allocatable. If the linker sees an allocateable .note
section, it will create a PT_NOTE segment in the output
- file. */
- if (strcmp (name, ".note") != 0 || attr != SHF_ALLOC)
+ file. We also allow "x" for .note.GNU-stack. */
+ if (!(def_type == SHT_NOTE
+ && (attr == SHF_ALLOC || attr == SHF_EXECINSTR)))
as_warn (_("setting incorrect section attributes for %s"),
name);
}