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