Skip to content

Commit 1ce5013

Browse files
Merge pull request #1113 from malaterre:noexecstack-cleanup
PiperOrigin-RevId: 502821409
2 parents 4623110 + 2b95ac1 commit 1ce5013

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

CMakeLists.txt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -306,21 +306,6 @@ if(UNIX AND NOT APPLE)
306306
LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/hwy/hwy.version")
307307
endif()
308308

309-
if (CMAKE_SYSTEM_PROCESSOR MATCHES "unknown")
310-
# uname -p is broken on this system. Try uname -m
311-
EXECUTE_PROCESS( COMMAND uname -m
312-
OUTPUT_STRIP_TRAILING_WHITESPACE
313-
ERROR_QUIET
314-
OUTPUT_VARIABLE HWY_ARCH)
315-
else (CMAKE_SYSTEM_PROCESSOR MATCHES "unknown")
316-
set(HWY_ARCH ${CMAKE_SYSTEM_PROCESSOR})
317-
endif (CMAKE_SYSTEM_PROCESSOR MATCHES "unknown")
318-
message(STATUS "Architecture: " ${HWY_ARCH})
319-
if (HWY_ARCH MATCHES "mips")
320-
target_link_options(hwy PUBLIC "LINKER:-z,noexecstack")
321-
endif (HWY_ARCH MATCHES "mips")
322-
323-
324309
if (HWY_ENABLE_CONTRIB)
325310
add_library(hwy_contrib ${HWY_LIBRARY_TYPE} ${HWY_CONTRIB_SOURCES})
326311
target_link_libraries(hwy_contrib hwy)

0 commit comments

Comments
 (0)