Separate GCC/NASM flags & definitions

Similar change was done for the unittests in b178e62.

Author: coderarjob

cmake/compile_assemble_link.cmake

@@ -2,6 +2,7 @@
 # compile_lib (NAME name
 #              SOURCES <source> [<source> ...]
 #              [FLAGS <flag> ...]
+#              [DEFINITIONS <compiler macros> ...]
 #              [INCLUDE_DIRECTORIES <paths> ...]
 #              [STATIC_LIB])
 #
@@ -237,6 +238,7 @@ endfunction()
 # test (NAME name
 #       [DEPENDENT_FOR target]
 #       [SOURCES <source> [<source> ...]
+#       [DEFINITIONS <compiler macros> ...]
 #       [INCLUDE_DIRECTORIES <paths> ..])
 #
 # Produces test executable from the source files. Binary files so produced are placed in
@@ -287,13 +289,14 @@ endfunction()
 # assemble_and_copy_bin (NAME name
 #                        SOURCES <source> [<source> ...]
 #                        [FLAGS <assembler flag> ...]
+#                        [DEFINITIONS <assembler macros> ...]
 #                        [INCLUDE_DIRECTORIES <paths> ..])
 #
 # Compiles a assembly files using NASM then copies each object files to MOS_BIN_DIR.
 # ==================================================================================================
 function(assemble_and_copy_bin)
     set(oneValueArgs NAME)
-    set(multiValueArgs SOURCES FLAGS INCLUDE_DIRECTORIES)
+    set(multiValueArgs SOURCES FLAGS INCLUDE_DIRECTORIES DEFINITIONS)
     set(options)
     cmake_parse_arguments(PARSE_ARGV 0 ASSEMBLE "${options}" "${oneValueArgs}" "${multiValueArgs}")
 
@@ -312,6 +315,7 @@ function(assemble_and_copy_bin)
         NAME ${INTERMEDIATE_BIN_NAME}
         SOURCES ${ASSEMBLE_SOURCES}
         FLAGS ${ASSEMBLE_FLAGS}
+        DEFINITIONS ${ASSEMBLE_DEFINITIONS}
         INCLUDE_DIRECTORIES ${ASSEMBLE_INCLUDE_DIRECTORIES}
         )
     copy_object_file(

cmake/mosflags.cmake

@@ -12,25 +12,23 @@ if(CMAKE_CROSSCOMPILING)
         list(APPEND MOS_KERNEL_NASM_ELF_MODE_FLAGS -g)
 
         list(APPEND MOS_USER_GCC_FLAGS -g)
-        list(APPEND MOS_USER_NASM_ELF_MODE_FLAGS -g)
     endif()
 
     If (MOS_GRAPHICS_ENABLED)
-        list(APPEND MOS_KERNEL_GCC_FLAGS -DGRAPHICS_MODE_ENABLED)
-        list(APPEND MOS_KERNEL_NASM_ELF_MODE_FLAGS -DGRAPHICS_MODE_ENABLED)
-        list(APPEND MOS_KERNEL_NASM_BIN_MODE_FLAGS -DGRAPHICS_MODE_ENABLED)
-
-        list(APPEND MOS_USER_GCC_FLAGS -DGRAPHICS_MODE_ENABLED)
-        list(APPEND MOS_USER_NASM_ELF_MODE_FLAGS -DGRAPHICS_MODE_ENABLED)
-        list(APPEND MOS_USER_NASM_BIN_MODE_FLAGS -DGRAPHICS_MODE_ENABLED)
+        list(APPEND MOS_KERNEL_GCC_DEFINITIONS
+            GRAPHICS_MODE_ENABLED
+            GRAPHICS_BPP=${MOS_GRAPHICS_BPP}
+        )
 
-        list(APPEND MOS_KERNEL_GCC_FLAGS -DGRAPHICS_BPP=${MOS_GRAPHICS_BPP})
-        list(APPEND MOS_KERNEL_NASM_BIN_MODE_FLAGS -DGRAPHICS_BPP=${MOS_GRAPHICS_BPP})
-        list(APPEND MOS_KERNEL_NASM_ELF_MODE_FLAGS -DGRAPHICS_BPP=${MOS_GRAPHICS_BPP})
+        list(APPEND MOS_KERNEL_NASM_DEFINITIONS
+            GRAPHICS_MODE_ENABLED
+            GRAPHICS_BPP=${MOS_GRAPHICS_BPP}
+        )
 
-        list(APPEND MOS_USER_GCC_FLAGS -DGRAPHICS_BPP=${MOS_GRAPHICS_BPP})
-        list(APPEND MOS_USER_NASM_BIN_MODE_FLAGS -DGRAPHICS_BPP=${MOS_GRAPHICS_BPP})
-        list(APPEND MOS_USER_NASM_ELF_MODE_FLAGS -DGRAPHICS_BPP=${MOS_GRAPHICS_BPP})
+        list(APPEND MOS_USER_GCC_DEFINITIONS
+            GRAPHICS_MODE_ENABLED
+            GRAPHICS_BPP=${MOS_GRAPHICS_BPP}
+        )
     endif()
 
 else()

cmake/x86/kernelflags.cmake

@@ -25,26 +25,31 @@ set(MOS_KERNEL_GCC_FLAGS
     -fno-unit-at-a-time
     -fno-omit-frame-pointer
     -fno-inline-functions-called-once
-    -D${MOS_BUILD_MODE}
-    -DMARCH=${MARCH}
-    -DARCH=${ARCH}
-    -DKERNEL
     )
 
+set(MOS_KERNEL_GCC_DEFINITIONS
+    ${MOS_BUILD_MODE}
+    MARCH=${MARCH}
+    ARCH=${ARCH}
+    KERNEL
+)
+
 if (MOS_PORT_E9_ENABLED)
-    list(APPEND MOS_KERNEL_GCC_FLAGS -DPORT_E9_ENABLED)
+    list(APPEND MOS_KERNEL_GCC_DEFINITIONS PORT_E9_ENABLED)
 endif()
 
+set(MOS_KERNEL_NASM_DEFINITIONS
+    KERNEL
+)
+
 set(MOS_KERNEL_NASM_BIN_MODE_FLAGS
     -O0
     -f bin
-    -DKERNEL
     )
 
 set(MOS_KERNEL_NASM_ELF_MODE_FLAGS
     -O0
     -f elf
-    -DKERNEL
    )
 
 set(MOS_KERNEL_ASM_INCLUDE_DIRS

cmake/x86/userflags.cmake

@@ -17,20 +17,13 @@ set(MOS_USER_GCC_FLAGS
     -fno-omit-frame-pointer
     -fno-inline-functions-called-once
     -fno-inline-small-functions
-    -D${MOS_BUILD_MODE}
-    -DMARCH=${MARCH}
-    -DARCH=${ARCH}
     )
 
-set(MOS_USER_NASM_BIN_MODE_FLAGS
-    -O0
-    -f bin
-    )
-
-set(MOS_USER_NASM_ELF_MODE_FLAGS
-    -O0
-    -f elf
-    )
+set(MOS_USER_GCC_DEFINITIONS
+    ${MOS_BUILD_MODE}
+    MARCH=${MARCH}
+    ARCH=${ARCH}
+)
 
 set(MOS_USER_GCC_INCLUDE_DIRS
     ${PROJECT_SOURCE_DIR}/include/applib

src/apps/CMakeLists.txt

@@ -5,6 +5,7 @@ compile_lib(
     NAME proc1
     SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/proc1.c
     FLAGS ${MOS_USER_GCC_FLAGS}
+    DEFINITIONS ${MOS_USER_GCC_DEFINITIONS}
     INCLUDE_DIRECTORIES ${MOS_USER_GCC_INCLUDE_DIRS}
     )
 
@@ -24,6 +25,7 @@ compile_lib(
     NAME mpdemo
     SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/mpdemo.c
     FLAGS ${MOS_USER_GCC_FLAGS}
+    DEFINITIONS ${MOS_USER_GCC_DEFINITIONS}
     INCLUDE_DIRECTORIES ${MOS_USER_GCC_INCLUDE_DIRS}
     )
 
@@ -43,6 +45,7 @@ compile_lib(
     NAME gui0
     SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/gui0.c
     FLAGS ${MOS_USER_GCC_FLAGS}
+    DEFINITIONS ${MOS_USER_GCC_DEFINITIONS}
     INCLUDE_DIRECTORIES ${MOS_USER_GCC_INCLUDE_DIRS}
     )
 

src/apps/applib/CMakeLists.txt

@@ -11,6 +11,7 @@ compile_lib(
     NAME crta
     SOURCES ${APPS_CRT_SOURCES}
     FLAGS ${MOS_KERNEL_GCC_FLAGS}
+    DEFINITIONS ${MOS_KERNEL_GCC_DEFINITIONS}
     INCLUDE_DIRECTORIES ${MOS_KERNEL_GCC_INCLUDE_DIRS}
     )
 # ------------------------------------------------------------------------
@@ -32,6 +33,7 @@ compile_lib(
     NAME app
     SOURCES ${APPLIB_SOURCES}
     FLAGS ${MOS_KERNEL_GCC_FLAGS}
+    DEFINITIONS ${MOS_KERNEL_GCC_DEFINITIONS}
     INCLUDE_DIRECTORIES ${MOS_KERNEL_GCC_INCLUDE_DIRS}
     STATIC_LIB
     )

src/bootloader/x86/CMakeLists.txt

@@ -2,6 +2,7 @@ assemble_and_copy_bin(
     NAME boot0.flt
     SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boot0/boot.s
     FLAGS ${MOS_KERNEL_NASM_BIN_MODE_FLAGS}
+    DEFINITIONS ${MOS_KERNEL_GCC_DEFINITIONS}
     INCLUDE_DIRECTORIES
         ${CMAKE_CURRENT_SOURCE_DIR}/boot0
         ${MOS_KERNEL_ASM_INCLUDE_DIRS}
@@ -11,6 +12,7 @@ assemble_and_copy_bin(
     NAME boot1.flt
     SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boot1/boot1.s
     FLAGS ${MOS_KERNEL_NASM_BIN_MODE_FLAGS}
+    DEFINITIONS ${MOS_KERNEL_GCC_DEFINITIONS}
     INCLUDE_DIRECTORIES
         ${CMAKE_CURRENT_SOURCE_DIR}/boot1
         ${MOS_KERNEL_ASM_INCLUDE_DIRS}

src/common/CMakeLists.txt

@@ -6,5 +6,6 @@ compile_lib(
     NAME common
     SOURCES ${COMMON_SOURCES}
     FLAGS ${MOS_KERNEL_GCC_FLAGS}
+    DEFINITIONS ${MOS_KERNEL_GCC_DEFINITIONS}
     INCLUDE_DIRECTORIES ${MOS_KERNEL_GCC_INCLUDE_DIRS}
     )

src/kernel/CMakeLists.txt

@@ -25,5 +25,6 @@ compile_lib(
     NAME kernel
     SOURCES ${KERNEL_SOURCES}
     FLAGS ${MOS_KERNEL_GCC_FLAGS}
+    DEFINITIONS ${MOS_KERNEL_GCC_DEFINITIONS}
     INCLUDE_DIRECTORIES ${MOS_KERNEL_GCC_INCLUDE_DIRS}
     )

src/kernel/drivers/x86/pc/CMakeLists.txt

@@ -11,5 +11,6 @@ compile_lib(
     NAME kernel_drivers
     SOURCES ${DRIVER_SOUCES}
     FLAGS ${MOS_KERNEL_GCC_FLAGS}
+    DEFINITIONS ${MOS_KERNEL_GCC_DEFINITIONS}
     INCLUDE_DIRECTORIES ${MOS_KERNEL_GCC_INCLUDE_DIRS}
     )