klibc - Jul 2020 - [klibc:master] Revert " Kbuild: Tell gas we don't want executable stacks"

Commit-ID:  312b3d0a38ff2e43becd47cf1f4a930bc0c4b8e6
Gitweb:    
http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=312b3d0a38ff2e43becd47cf1f4a930bc0c4b8e6
Author:     Ben Hutchings <ben at decadent.org.uk>
AuthorDate: Wed, 29 Apr 2020 22:24:33 +0100
Committer:  Ben Hutchings <ben at decadent.org.uk>
CommitDate: Sat, 25 Jul 2020 17:33:29 +0100

Revert "[klibc] Kbuild: Tell gas we don't want executable stacks"

This reverts commit 9d8d648e604026b32cad00a84ed6c29cbd157641, which
broke signal handing on some architectures.

On m68k and parisc, signal return depends on a trampoline that the
kernel writes on the stack.  On alpha, s390, and sparc (32-bit), we
can avoid this by providing our own function as sa_restorer, but we
currently don't.

Signed-off-by: Ben Hutchings <ben at decadent.org.uk>

---
 scripts/Kbuild.klibc | 2 +-
 usr/klibc/Kbuild     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc
index afc9a546..b7e99b56 100644
--- a/scripts/Kbuild.klibc
+++ b/scripts/Kbuild.klibc
@@ -125,7 +125,7 @@ KLIBCDEFS        += -D__KLIBC__=$(KLIBCMAJOR)          \
 KLIBCCPPFLAGS    += $(KLIBCDEFS)
 KLIBCCFLAGS      += $(KLIBCCPPFLAGS) $(KLIBCREQFLAGS) $(KLIBCARCHREQFLAGS)  \
                     $(KLIBCOPTFLAGS) $(KLIBCWARNFLAGS)
-KLIBCAFLAGS      += -D__ASSEMBLY__ -Wa,--noexecstack $(KLIBCCFLAGS)
+KLIBCAFLAGS      += -D__ASSEMBLY__ $(KLIBCCFLAGS)
 KLIBCSTRIPFLAGS  += --strip-all -R .comment -R .note
 
 KLIBCLIBGCC_DEF  := $(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-libgcc)
diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild
index 24bad07d..bec9cdb4 100644
--- a/usr/klibc/Kbuild
+++ b/usr/klibc/Kbuild
@@ -185,7 +185,6 @@ quiet_cmd_interp = BUILD   $@
       cmd_interp = $(KLIBCCC) $(klibccflags) -D__ASSEMBLY__     \
                              -DLIBDIR=\"$(SHLIBDIR)\"         \
 			     -DSOHASH=\"$(SOLIBHASH)\" \
-                             -Wa,--noexecstack \
 			     -c -o $@ $<
 
 $(INTERP_O): $(obj)/interp.S $(SOLIB).hash