From 051dd0f523b639beb0f24c1b5798f7311f32f7ee Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Wed, 12 Jan 2022 15:52:37 +0900 Subject: [PATCH] Apply ASLR compile options Change-Id: I182c1f6132305b1d7f96a31ae244cfe7e575b46a Signed-off-by: Hyotaek Shim --- CMakeLists.txt | 2 +- test/orientation_test/CMakeLists.txt | 28 +++++++--------------------- test/stress_test/CMakeLists.txt | 7 +++++-- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 958043b..7a56b76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ FOREACH(flag ${${PROJECT_NAME}_CFLAGS}) ENDFOREACH(flag) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fPIC -Wall -Werror -g -fdump-rtl-expand") -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -std=c++0x") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -fPIC -std=c++0x") SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}") diff --git a/test/orientation_test/CMakeLists.txt b/test/orientation_test/CMakeLists.txt index 0ed1401..5cb5f15 100644 --- a/test/orientation_test/CMakeLists.txt +++ b/test/orientation_test/CMakeLists.txt @@ -9,28 +9,14 @@ PKG_CHECK_MODULES(pkgs REQUIRED ${PKG_MODULES}) INCLUDE_DIRECTORIES(${pkgs_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include) +FOREACH(flag ${REQUIRED_PKGS_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") +ENDFOREACH(flag) + +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIE") +SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") + FILE(GLOB SRCS *.cpp *.h) ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${PKGS_LDFLAGS} capi-system-sensor) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) - -#CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -#PROJECT(sensor-stresstests C) -# -#SET(PKG_MODULES -# glib-2.0) -# -#INCLUDE(FindPkgConfig) -#PKG_CHECK_MODULES(PKGS REQUIRED ${PKG_MODULES}) -# -# -#FOREACH(flag ${PKGS_CFLAGS}) -# SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}") -#ENDFOREACH(flag) -# -## Installing files -#FILE(GLOB_RECURSE SRCS main.c) -#ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) -#SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE C) -#TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${PKGS_LDFLAGS} capi-system-sensor) -#INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/test/stress_test/CMakeLists.txt b/test/stress_test/CMakeLists.txt index ba82a30..7c26911 100644 --- a/test/stress_test/CMakeLists.txt +++ b/test/stress_test/CMakeLists.txt @@ -10,10 +10,13 @@ PKG_CHECK_MODULES(PKGS REQUIRED ${PKG_MODULES}) INCLUDE_DIRECTORIES(${PKGS_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) -FOREACH(flag ${PKGS_CFLAGS}) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}") +FOREACH(flag ${REQUIRED_PKGS_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIE") +SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") + # Installing files FILE(GLOB_RECURSE SRCS main.c) ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) -- 2.7.4