1From 28ca7393c08cb54b87d11c1ca92821e48f54781b Mon Sep 17 00:00:00 2001 2From: Thomas Petazzoni <thomas.petazzoni@bootlin.com> 3Date: Mon, 15 Apr 2019 23:09:33 +0200 4Subject: [PATCH] Don't force -fstack-protector 5 6This allows the environment to decide whether SSP should be used or 7not, for example to support toolchains that don't have SSP support. 8 9Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> 10[Bernd: rebased for 21.2.3] 11Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 12--- 13 api/mfx_dispatch/linux/CMakeLists.txt | 2 +- 14 builder/FindPackages.cmake | 4 ++-- 15 2 files changed, 3 insertions(+), 3 deletions(-) 16 17diff --git a/api/mfx_dispatch/linux/CMakeLists.txt b/api/mfx_dispatch/linux/CMakeLists.txt 18index 15a4bd9a..4415f840 100644 19--- a/api/mfx_dispatch/linux/CMakeLists.txt 20+++ b/api/mfx_dispatch/linux/CMakeLists.txt 21@@ -101,7 +101,7 @@ target_link_libraries(mfx dl) 22 get_api_version(MFX_VERSION_MAJOR MFX_VERSION_MINOR) 23 24 set_target_properties( mfx PROPERTIES LINK_FLAGS 25- "-Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libmfx.map -fstack-protector") 26+ "-Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libmfx.map") 27 set_target_properties( mfx PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIB_DIR}/${CMAKE_BUILD_TYPE} FOLDER mfx ) 28 set_target_properties( mfx PROPERTIES VERSION ${MFX_VERSION_MAJOR}.${MFX_VERSION_MINOR}) 29 set_target_properties( mfx PROPERTIES SOVERSION ${MFX_VERSION_MAJOR}) 30diff --git a/builder/FindPackages.cmake b/builder/FindPackages.cmake 31index 7e36ae2d..5b8b9b9d 100644 32--- a/builder/FindPackages.cmake 33+++ b/builder/FindPackages.cmake 34@@ -83,7 +83,7 @@ function( configure_build_variant_linux target variant ) 35 return() # should not occur; just in case 36 endif() 37 set( link_flags_list "-Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack -Wl,--no-as-needed -ldl") 38- append_property( ${ARGV0} LINK_FLAGS "${link_flags_list} ${MFX_LDFLAGS} -fstack-protector" ) 39+ append_property( ${ARGV0} LINK_FLAGS "${link_flags_list} ${MFX_LDFLAGS}" ) 40 # message( STATUS "Libva located at: ${PKG_LIBVA_LIBRARY_DIRS}" ) 41 42 if( ARGV1 MATCHES hw AND Linux ) 43@@ -445,7 +445,7 @@ function(configure_dependencies target dependencies variant) 44 endforeach() 45 46 set(SCOPE_CFLAGS ${SCOPE_CFLAGS} PARENT_SCOPE) 47- set(SCOPE_LINKFLAGS "${SCOPE_LINKFLAGS} -Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack -fstack-protector" PARENT_SCOPE) 48+ set(SCOPE_LINKFLAGS "${SCOPE_LINKFLAGS} -Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack" PARENT_SCOPE) 49 set(SCOPE_LIBS ${SCOPE_LIBS} PARENT_SCOPE) 50 endfunction() 51 52-- 532.20.1 54 55