Skip to content

Commit 82fd1f4

Browse files
committed
added objcopy support
1 parent 60388a1 commit 82fd1f4

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

RTEMSConfig.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ function(rtems_general_config TARGET_NAME RTEMS_PREFIX RTEMS_BSP_PAIR)
6262
set(CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER} PARENT_SCOPE)
6363
set(CMAKE_ASM_COMPILER ${CMAKE_ASM_COMPILER} PARENT_SCOPE)
6464
set(CMAKE_LINKER ${CMAKE_LINKER} PARENT_SCOPE)
65-
message(STATUS ${RTEMS_OBJCOPY})
6665
set(RTEMS_OBJCOPY ${RTEMS_OBJCOPY} PARENT_SCOPE)
6766

6867
# I don't know what this is used for yet, but it might become handy

RTEMSGeneric.cmake

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,15 @@ if(NOT EXISTS "${RTEMS_LINKER}")
186186
"${RTEMS_BIN_PATH}/${RTEMS_ARCH_VERSION_NAME}-ld")
187187
endif()
188188

189-
message(STATUS "Checking done")
189+
message(STATUS "Checking for RTEMS objcopy..")
190+
set(RTEMS_OBJCOPY "${RTEMS_BIN_PATH}/${RTEMS_ARCH_VERSION_NAME}-objcopy")
191+
if(NOT EXISTS "${RTEMS_OBJCOPY}")
192+
message(WARNING
193+
"RTEMS ld linker not found at "
194+
"${RTEMS_BIN_PATH}/${RTEMS_ARCH_VERSION_NAME}-objcopy")
195+
endif()
196+
197+
message(STATUS "Checking done.")
190198

191199
############################################
192200
# Info output
@@ -206,6 +214,7 @@ message(STATUS "RTEMS gcc compiler: ${RTEMS_GCC}")
206214
message(STATUS "RTEMS g++ compiler: ${RTEMS_GXX}")
207215
message(STATUS "RTEMS assembler: ${RTEMS_ASM}")
208216
message(STATUS "RTEMS linker: ${RTEMS_LINKER}")
217+
message(STATUS "RTEMS objcopy: ${RTEMS_OBJCOPY}")
209218

210219
if(${RTEMS_ARCH_NAME} STREQUAL "arm")
211220
set(CMAKE_SYSTEM_PROCESSOR arm PARENT_SCOPE)
@@ -219,7 +228,7 @@ set(CMAKE_C_COMPILER ${RTEMS_GCC} PARENT_SCOPE)
219228
set(CMAKE_CXX_COMPILER ${RTEMS_GXX} PARENT_SCOPE)
220229
set(CMAKE_ASM_COMPILER ${RTEMS_ASM} PARENT_SCOPE)
221230
set(CMAKE_LINKER ${RTEMS_LINKER} PARENT_SCOPE)
222-
set(RTEMS_OBJCOPY ${RTEMS_GCC}-objcopy PARENT_SCOPE)
231+
set(RTEMS_OBJCOPY ${RTEMS_OBJCOPY} PARENT_SCOPE)
223232

224233
# Variables set in the cache so they can be used everywhere.
225234
set(RTEMS_ARCH_NAME ${RTEMS_ARCH_NAME} CACHE FILEPATH "Architecture name")

0 commit comments

Comments
 (0)