0001-Drop-hardening-related-flags.patch 3.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263
  1. From 8916c8480eb3483c2ffb41ad8961cd0c2b0fb1c4 Mon Sep 17 00:00:00 2001
  2. From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  3. Date: Mon, 15 Apr 2019 22:48:21 +0200
  4. Subject: [PATCH] Drop hardening-related flags
  5. These will be set by Buildroot depending on toolchain capabilities and
  6. global Buildroot options.
  7. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  8. ---
  9. cmrtlib/linux/CMakeLists.txt | 8 ++++----
  10. media_driver/cmake/linux/media_compile_flags_linux.cmake | 1 -
  11. media_driver/media_top_cmake.cmake | 2 +-
  12. 3 files changed, 5 insertions(+), 6 deletions(-)
  13. diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt
  14. index 44ce4f08..b462fbea 100644
  15. --- a/cmrtlib/linux/CMakeLists.txt
  16. +++ b/cmrtlib/linux/CMakeLists.txt
  17. @@ -26,11 +26,11 @@ set(LIBRARY_OUTPUT_PATH ${MDF_OPTION__OUTPUT_DIR})
  18. # Set up compile options that will be used for the Linux build
  19. if(CMAKE_COMPILER_IS_GNUCC)
  20. - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -fstack-protector-all -Werror")
  21. - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
  22. + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -Werror")
  23. + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing ")
  24. set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0")
  25. - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -fstack-protector-all -Werror")
  26. - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
  27. + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -Werror")
  28. + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing")
  29. set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0")
  30. set(GCC_SECURE_LINK_FLAGS "-z relro -z now")
  31. diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake
  32. index 9e85fdb2..c45ce11b 100755
  33. --- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
  34. +++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
  35. @@ -64,7 +64,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON
  36. # Other common flags
  37. -fmessage-length=0
  38. -fvisibility=hidden
  39. - -fstack-protector
  40. -fdata-sections
  41. -ffunction-sections
  42. -Wl,--gc-sections
  43. diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.cmake
  44. index 3491db1e..b30fa04a 100755
  45. --- a/media_driver/media_top_cmake.cmake
  46. +++ b/media_driver/media_top_cmake.cmake
  47. @@ -88,7 +88,7 @@ if(MEDIA_BUILD_FATAL_WARNINGS)
  48. set_target_properties(${LIB_NAME_OBJ} PROPERTIES COMPILE_FLAGS "-Werror")
  49. endif()
  50. -set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -z relro -z now -fstack-protector -fPIC")
  51. +set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -fPIC")
  52. set_target_properties(${LIB_NAME} PROPERTIES PREFIX "")
  53. set_target_properties(${LIB_NAME_STATIC} PROPERTIES PREFIX "")
  54. --
  55. 2.20.1