From: Hans-Peter Nilsson <hp@axis.com>
Date: Thu, 26 May 2022 17:48:25 +0000 (+0200)
Subject: cris: bfd: Correct default to no execstack
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=81cd0a49c9e5f28c0fec391e449ea3272077c432;p=binutils-gdb.git

cris: bfd: Correct default to no execstack

In the now-historical CRIS glibc port, the default stack permission
was no-exec as in "#define DEFAULT_STACK_PERMS (PF_R|PF_W)", and the
gcc port only emits the executable-stack marker when needed; when
emitting code needing it.  In other words, the binutils setting
mismatches.  It doesn't matter much, except being confusing and
defaulting to "off" is more sane.

ld:

	* testsuite/ld-elf/elf.exp (target_defaults_to_execstack): Switch to 0
	for cris*-*-*.

bfd:
	* elf32-cris.c (elf_backend_default_execstack): Define to 0.

Change-Id: I52f37598f119b19111c7a6546c00a627fca0f396
---

diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index 00b5f7745e8..653d77f1ea8 100644
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -4112,6 +4112,8 @@ elf_cris_got_elt_size (bfd *abfd ATTRIBUTE_UNUSED,
 #define elf_backend_dtrel_excludes_plt	1
 #define elf_backend_want_dynrelro	1
 
+#define elf_backend_default_execstack	0
+
 /* Later, we my want to optimize RELA entries into REL entries for dynamic
    linking and libraries (if it's a win of any significance).  Until then,
    take the easy route.  */
diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp
index 621d4e121d7..abc35f80778 100644
--- a/ld/testsuite/ld-elf/elf.exp
+++ b/ld/testsuite/ld-elf/elf.exp
@@ -183,6 +183,7 @@ if { [check_gc_sections_available] && ![istarget "v850-*-*"] } {
 proc target_defaults_to_execstack {} {
     if {   [istarget "aarch64*-*-*"]
 	|| [istarget "arc*-*-*"]
+	|| [istarget "cris*-*-*"]
 	|| [istarget "ia64*-*-*"]
 	|| [istarget "nios2*-*-*"]
 	|| [istarget "powerpc64*-*-*"]