Skip to content

Commit 162791e

Browse files
committed
Added common objects from kernel Makefile.
1 parent 8743093 commit 162791e

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

cmake/utils.cmake

+3-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,9 @@ function(GenerateNamedObjects sources_in float_type_in)
130130

131131
list(APPEND obj_defines "ASMNAME=${FU}${obj_name};ASMFNAME=${FU}${obj_name}${BU};NAME=${obj_name}${BU};CNAME=${obj_name};CHAR_NAME=\"${obj_name}${BU}\";CHAR_CNAME=\"${obj_name}\"")
132132
list(APPEND obj_defines ${defines_in})
133-
list(APPEND obj_defines ${float_type_in})
133+
if (NOT ${float_type_in} STREQUAL "SINGLE")
134+
list(APPEND obj_defines ${float_type_in})
135+
endif ()
134136

135137
add_library(${obj_name} OBJECT ${source_file})
136138
set_target_properties(${obj_name} PROPERTIES COMPILE_DEFINITIONS "${obj_defines}")

kernel/CMakeLists.txt

+8
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ if (${ARCH} STREQUAL "x86")
77
GenerateNamedObjects("${KERNELDIR}/cpuid.S" "")
88
endif ()
99

10+
# TODO: Read from ${KERNELDIR}/KERNEL - some architectures use a different lsame
11+
set(LSAME_KERNEL lsame.S)
12+
set(SCABS_KERNEL cabs.S)
13+
set(DCABS_KERNEL cabs.S)
14+
GenerateNamedObjects("${KERNELDIR}/${LSAME_KERNEL}" "" "F_INTERFACE" "lsame")
15+
GenerateNamedObjects("${KERNELDIR}/${SCABS_KERNEL}" "SINGLE" "COMPLEX;F_INTERFACE" "cabs1")
16+
GenerateNamedObjects("${KERNELDIR}/${DCABS_KERNEL}" "DOUBLE" "COMPLEX;F_INTERFACE" "cabs1")
17+
1018

1119
# Makefile.L1
1220

0 commit comments

Comments
 (0)