26 lines
973 B
Diff
26 lines
973 B
Diff
--- a/omr/cmake/modules/platform/toolcfg/gnu.cmake
|
|
+++ b/omr/cmake/modules/platform/toolcfg/gnu.cmake
|
|
@@ -69,6 +69,11 @@ if(OMR_ARCH_X86)
|
|
endif()
|
|
endif()
|
|
|
|
+if(OMR_OS_LINUX)
|
|
+ list(APPEND OMR_PLATFORM_EXE_LINKER_OPTIONS "-Wl,-z,noexecstack")
|
|
+ list(APPEND OMR_PLATFORM_SHARED_LINKER_OPTIONS "-Wl,-z,noexecstack")
|
|
+endif()
|
|
+
|
|
if(OMR_HOST_ARCH STREQUAL "s390")
|
|
list(APPEND OMR_PLATFORM_COMPILE_OPTIONS -march=z9-109)
|
|
endif()
|
|
--- a/openj9/runtime/compiler/CMakeLists.txt
|
|
+++ b/openj9/runtime/compiler/CMakeLists.txt
|
|
@@ -403,7 +403,7 @@ set_source_files_properties(
|
|
|
|
if(OMR_OS_LINUX)
|
|
set_property(TARGET j9jit APPEND_STRING PROPERTY
|
|
- LINK_FLAGS " -Wl,-z,noexecstack -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/build/scripts/j9jit.linux.exp")
|
|
+ LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/build/scripts/j9jit.linux.exp")
|
|
target_link_libraries(j9jit PRIVATE m)
|
|
elseif(OMR_OS_WINDOWS)
|
|
target_sources(j9jit PRIVATE build/scripts/j9jit.def)
|