Skip to content

Commit 097de80

Browse files
committed
Port to cmsdk v2.0
1 parent 086ec84 commit 097de80

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

arm.cmake

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ set(BOOT_DEPENDENCIES
104104
newlib_libm
105105
compiler_rt)
106106

107-
set(COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:CXX>:-Wno-register>)
108107
set(COMPILE_DEFINITIONS_PRIVATE
109108
__PROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
110109
__PROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR}
@@ -142,7 +141,10 @@ target_include_directories(${INTERFACE_RELEASE_TARGET}
142141
target_compile_definitions(${INTERFACE_RELEASE_TARGET}
143142
INTERFACE __StratifyOS__ CMSDK_BUILD_GIT_HASH=${CMSDK_GIT_HASH})
144143
target_compile_options(${INTERFACE_RELEASE_TARGET}
145-
INTERFACE -Os ${COMPILE_OPTIONS} -mthumb -ffunction-sections -fdata-sections ${BUILD_FLOAT_OPTIONS})
144+
INTERFACE -Os
145+
$<$<COMPILE_LANGUAGE:CXX>:-Wno-register -fno-exceptions -fno-threadsafe-statics>
146+
-mthumb -ffunction-sections -fdata-sections
147+
${BUILD_FLOAT_OPTIONS})
146148
cmsdk2_copy_target(
147149
SOURCE ${INTERFACE_RELEASE_TARGET}
148150
DESTINATION ${INTERFACE_DEBUG_TARGET})
@@ -261,7 +263,6 @@ if(BUILD_LINK_TRANSPORT OR BUILD_ALL)
261263
target_sources(${LINK_TRANSPORT_RELEASE_TARGET} PRIVATE ${LINK_TRANSPORT_SOURCELIST})
262264
target_include_directories(${LINK_TRANSPORT_RELEASE_TARGET} PRIVATE ${LINK_TRANSPORT_INCLUDE_DIRECTORIES})
263265
target_compile_definitions(${LINK_TRANSPORT_RELEASE_TARGET} PRIVATE ${COMPILE_DEFINITIONS_PRIVATE})
264-
target_compile_options(${LINK_TRANSPORT_RELEASE_TARGET} PUBLIC -Os ${COMPILE_OPTIONS})
265266
set_property(TARGET ${LINK_TRANSPORT_RELEASE_TARGET} PROPERTY INTERPROCEDURAL_OPTIMIZATION FALSE)
266267

267268
cmsdk2_copy_target(
@@ -292,7 +293,6 @@ if(BUILD_DEVICE OR BUILD_ALL)
292293
target_sources(${DEVICE_RELEASE_TARGET} PRIVATE ${DEVICE_SOURCELIST})
293294
target_include_directories(${DEVICE_RELEASE_TARGET} PRIVATE ${DEVICE_INCLUDE_DIRECTORIES})
294295
target_compile_definitions(${DEVICE_RELEASE_TARGET} PRIVATE ${COMPILE_DEFINITIONS_PRIVATE})
295-
target_compile_options(${DEVICE_RELEASE_TARGET} PUBLIC -Os ${COMPILE_OPTIONS})
296296
set_property(TARGET ${DEVICE_RELEASE_TARGET} PROPERTY INTERPROCEDURAL_OPTIMIZATION FALSE)
297297

298298
cmsdk2_copy_target(
@@ -323,7 +323,6 @@ if(BUILD_USBD OR BUILD_ALL)
323323
target_sources(${USBD_RELEASE_TARGET} PRIVATE ${USBD_SOURCELIST})
324324
target_include_directories(${USBD_RELEASE_TARGET} PRIVATE ${USBD_INCLUDE_DIRECTORIES})
325325
target_compile_definitions(${USBD_RELEASE_TARGET} PRIVATE ${COMPILE_DEFINITIONS_PRIVATE})
326-
target_compile_options(${USBD_RELEASE_TARGET} PUBLIC -Os ${COMPILE_OPTIONS})
327326
set_property(TARGET ${USBD_RELEASE_TARGET} PROPERTY INTERPROCEDURAL_OPTIMIZATION FALSE)
328327

329328
cmsdk2_copy_target(
@@ -357,7 +356,7 @@ if(BUILD_MCU OR BUILD_ALL)
357356
PUBLIC ${SYS_INCLUDE_INTERFACE_DIRECTORIES}
358357
PRIVATE ${AUTH_INCLUDE_DIRECTORIES})
359358
target_compile_definitions(${AUTH_RELEASE_TARGET} PRIVATE ${COMPILE_DEFINITIONS_PRIVATE})
360-
target_compile_options(${AUTH_RELEASE_TARGET} PUBLIC -Os ${COMPILE_OPTIONS} PRIVATE -mpure-code)
359+
target_compile_options(${AUTH_RELEASE_TARGET} PUBLIC PRIVATE -mpure-code)
361360
set_property(TARGET ${AUTH_RELEASE_TARGET} PROPERTY INTERPROCEDURAL_OPTIMIZATION FALSE)
362361

363362
cmsdk2_copy_target(
@@ -391,7 +390,6 @@ if(BUILD_SYS OR BUILD_ALL)
391390
PUBLIC ${SYS_INCLUDE_INTERFACE_DIRECTORIES}
392391
PRIVATE ${SYS_INCLUDE_DIRECTORIES})
393392
target_compile_definitions(${SYS_RELEASE_TARGET} PRIVATE ${COMPILE_DEFINITIONS_PRIVATE})
394-
target_compile_options(${SYS_RELEASE_TARGET} PUBLIC -Os ${COMPILE_OPTIONS})
395393
set_property(TARGET ${SYS_RELEASE_TARGET} PROPERTY INTERPROCEDURAL_OPTIMIZATION FALSE)
396394

397395
cmsdk2_copy_target(

0 commit comments

Comments
 (0)