Skip to content

Commit e224b9c

Browse files
authored
Merge pull request #21837 from pshipton/execstack
Set noexecstack when linking with uma
2 parents 31351f4 + 1919945 commit e224b9c

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

runtime/compiler/build/toolcfg/gnu/common.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,7 @@ endif
518518
ifeq ($(OS),linux)
519519
SOLINK_EXTRA_ARGS+=-Wl,-soname=libj9jit29.so
520520
SOLINK_EXTRA_ARGS+=-Wl,--version-script=$(SOLINK_VERSION_SCRIPT)
521+
SOLINK_EXTRA_ARGS+=-Wl,-z,noexecstack
521522
endif
522523

523524
SOLINK_FLAGS+=$(SOLINK_FLAGS_EXTRA)

runtime/makelib/targets.mk.linux.inc.ftl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ endif
404404
UMA_DLL_LINK_FLAGS += -Wl,-Map=$(UMA_TARGET_NAME).map
405405
UMA_DLL_LINK_FLAGS += -Wl,--version-script,$(UMA_TARGET_NAME).exp
406406
UMA_DLL_LINK_FLAGS += -Wl,-soname=$(UMA_DLLFILENAME)
407+
UMA_DLL_LINK_FLAGS += -Wl,-z,noexecstack
407408
UMA_DLL_LINK_FLAGS += -Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN -Xlinker --disable-new-dtags
408409

409410
UMA_DLL_LINK_POSTFLAGS += -Xlinker --start-group

0 commit comments

Comments
 (0)