From 480d9503263fa4e8f86ea6f8ee8cb373c8607e5b Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 9 Apr 2021 15:05:21 +0000
Subject:  No need for noexecstack, but the strip is too greedy

---
 Makefile  | 4 ++--
 configure | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index e47b327..a160e3b 100644
--- a/Makefile
+++ b/Makefile
@@ -70,10 +70,10 @@ tgz: distclean
 
 strip: $(ALL_LIBS)
 ifneq ($(strip $(STATIC_LIBS)),)
-	exec $(STRIP) -x -R .note -R .comment -R .note.GNU-stack $(STATIC_LIBS)
+	exec $(STRIP) -x -R .note -R .comment $(STATIC_LIBS)
 endif
 ifneq ($(strip $(SHARED_LIBS)),)
-	exec $(STRIP) -R .note -R .comment -R .note.GNU-stack $(SHARED_LIBS)
+	exec $(STRIP) -R .note -R .comment $(SHARED_LIBS)
 endif
 
 install: install-data install-sysdeps install-dynlib install-lib install-include
diff --git a/configure b/configure
index 7b6ab34..2804a2f 100755
--- a/configure
+++ b/configure
@@ -560,7 +560,6 @@ tryflag CFLAGS -fomit-frame-pointer
 tryflag CFLAGS_AUTO -fno-exceptions
 tryflag CFLAGS_AUTO -fno-unwind-tables
 tryflag CFLAGS_AUTO -fno-asynchronous-unwind-tables
-tryflag CFLAGS_AUTO -Wa,--noexecstack
 tryflag CPPFLAGS_AUTO -Werror=implicit-function-declaration
 tryflag CPPFLAGS_AUTO -Werror=implicit-int
 tryflag CPPFLAGS_AUTO -Werror=pointer-sign
@@ -569,6 +568,8 @@ tryflag CPPFLAGS_AUTO -Wno-unused-value
 tryflag CPPFLAGS_AUTO -Wno-parentheses
 tryflag CFLAGS_AUTO -ffunction-sections
 tryflag CFLAGS_AUTO -fdata-sections
+tryldflag LDFLAGS_SHARED -nostartfiles
+tryldflag LDFLAGS_AUTO -Wl,--as-needed
 tryldflag LDFLAGS_AUTO -Wl,--sort-section=alignment
 tryldflag LDFLAGS_AUTO -Wl,--sort-common
 if $shared ; then
-- 
cgit v1.2.3