Browse Source

Added common objects from kernel Makefile.

tags/v0.2.15^2
Hank Anderson 11 years ago
parent
commit
162791e30e
2 changed files with 11 additions and 1 deletions
  1. +3
    -1
      cmake/utils.cmake
  2. +8
    -0
      kernel/CMakeLists.txt

+ 3
- 1
cmake/utils.cmake View File

@@ -130,7 +130,9 @@ function(GenerateNamedObjects sources_in float_type_in)

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}\"")
list(APPEND obj_defines ${defines_in})
list(APPEND obj_defines ${float_type_in})
if (NOT ${float_type_in} STREQUAL "SINGLE")
list(APPEND obj_defines ${float_type_in})
endif ()

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


+ 8
- 0
kernel/CMakeLists.txt View File

@@ -7,6 +7,14 @@ if (${ARCH} STREQUAL "x86")
GenerateNamedObjects("${KERNELDIR}/cpuid.S" "")
endif ()

# TODO: Read from ${KERNELDIR}/KERNEL - some architectures use a different lsame
set(LSAME_KERNEL lsame.S)
set(SCABS_KERNEL cabs.S)
set(DCABS_KERNEL cabs.S)
GenerateNamedObjects("${KERNELDIR}/${LSAME_KERNEL}" "" "F_INTERFACE" "lsame")
GenerateNamedObjects("${KERNELDIR}/${SCABS_KERNEL}" "SINGLE" "COMPLEX;F_INTERFACE" "cabs1")
GenerateNamedObjects("${KERNELDIR}/${DCABS_KERNEL}" "DOUBLE" "COMPLEX;F_INTERFACE" "cabs1")


# Makefile.L1



Loading…
Cancel
Save