Explicitly mark the stack as non-executable for Solaris

binaries (Valgrind launcher and tools).
Follow-up for r15692. n-i-bz

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15696

diff --git a/Makefile.tool.am b/Makefile.tool.am
index d7198825ec7467e5bbb330939d6853d92d5d413f..5af3023d92e5b8d7c3e63104f3b95e9be1c775ed 100644 (file)
--- a/Makefile.tool.am
+++ b/Makefile.tool.am
@@ -37,7 +37,8 @@ TOOL_LDFLAGS_COMMON_LINUX = \
 TOOL_LDFLAGS_COMMON_DARWIN = \
        -nodefaultlibs -nostartfiles -Wl,-u,__start -Wl,-e,__start
 TOOL_LDFLAGS_COMMON_SOLARIS = \
-       -static -nodefaultlibs -nostartfiles -u _start
+       -static -nodefaultlibs -nostartfiles -u _start \
+       -Wl,-M,/usr/lib/ld/map.noexstk
 
 TOOL_LDFLAGS_X86_LINUX = \
        $(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M32@

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 7f25f489df61d0e7d3620c6ce0bf103c1e96649a..d29f9549e4dccd56ab45787eeb814c2d66f41da1 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -66,6 +66,9 @@ if VGCONF_PLATVARIANT_IS_ANDROID
 valgrind_CFLAGS += -static
 valgrind_LDFLAGS   += -Wl,-z,noexecstack
 endif
+if VGCONF_OS_IS_SOLARIS
+valgrind_LDFLAGS   += -Wl,-M,/usr/lib/ld/map.noexstk
+endif
 
 
 vgdb_SOURCES = vgdb.c